-100-1 bug修复

admin

2024-07-05 50c5856086b9302fb8a8ecfe3db7e32a35c2ccff

-100-1 bug修复

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java

@@ -51,10 +51,9 @@
    @GetMapping("/initializedData")
    public AjaxResult initializedData(BsFormulaChildInfo bsFormulaChildInfo)
    {
        String productNum = "0RSPB001139E3AE5B0000035";
        String productNum = "";
        try {

            String str = "PACK."+bsFormulaChildInfo.getProcessesCode()+".MStepNumber";
            String str = "MOZU1."+bsFormulaChildInfo.getProcessesCode()+".MES_ModuleCode";
            Object productNumObject = miloService.readFromOpcUa(str).getValue();
            if(ObjectUtil.isNotNull(productNumObject)){
                productNum = productNumObject.toString();

 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java

@@ -302,7 +302,7 @@
                boolean save = daPassingStationCollectionService.save(daPassingStationCollection);

                //添加基础参数
                this.manualWorkstationsAddBasicParameters(daParamCollection);
//                this.manualWorkstationsAddBasicParameters(daParamCollection);

                //半自动工位，先将自动数据保存到数据库
                this.saveParameters(daParamCollection);

 jcdm-main/src/main/java/com/jcdm/main/da/testDeviceInterfaceTemp/domain/DaTestDeviceInterfaceTemp.java

@@ -1,9 +1,12 @@
package com.jcdm.main.da.testDeviceInterfaceTemp.domain;

import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.jcdm.common.annotation.Excel;
import com.jcdm.common.core.domain.BaseEntity;

import java.util.Date;

/**
 * 测试设备接口数据备份对象 da_test_device_interface_temp
@@ -66,6 +69,9 @@
    @Excel(name = "创建用户")
    private String createUser;

    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /** 更改用户 */
    @Excel(name = "更改用户")
    private String updateUser;
@@ -86,7 +92,17 @@
    @Excel(name = "预留字段4")
    private String spareField4;

    public void setId(Long id) 
    @Override
    public Date getCreateTime() {
        return createTime;
    }

    @Override
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }

    public void setId(Long id)
    {
        this.id = id;
    }

 jcdm-ui/src/views/main/kb/stationTerminal/index.vue

@@ -627,14 +627,7 @@
        this.headContent.cardCode = rowsData.trolleyYard;
      });
      this.getListFormulaChild()
      // this.addOverStationCollection()
      this.workpieceInformation.inboundTime = this.getCurrentTime()
      const param = {
        processesCode: this.headContent.processesCode,
      }
      fistSetpNumber(param).then(response => {
        console.log("fistSetpNumber------"+response.msg)
      });
    },

    initializedData(){
@@ -827,6 +820,8 @@
          self.getList()
          self.cakeLamp.scanFinish = 1
          self.cakeLamp.startWork = 1
          this.cakeLamp.InPlace = 1

        }
      };
    },
@@ -848,10 +843,6 @@
        console.log("sfc=--"+this.headContent.sfcCode+"--")
        if(this.headContent.sfcCode !== '' && this.headContent.sfcCode !== null
          && this.headContent.sfcCode !== undefined){
          // if(scanValue.includes("P9900173252")){
          //   this.headContent.yzSfcCode = scanValue
          //   this.bindYzSfc();
          // }else
          if(scanValue.includes("0RSP1TE") && this.headContent.processesCode === 'OP240'){
            this.headContent.cardCode = scanValue
            this.bindcardCode(scanValue);
@@ -862,30 +853,32 @@
            this.serialPortMethod(scanValue)
          }
        } else {
          if(this.headContent.processesCode === 'OP240'){
          // if(this.headContent.processesCode === 'OP240'){
            this.headContent.sfcCode = scanValue;
            this.queryParams.productNum = scanValue;
            this.getList()
            this.cakeLamp.scanFinish = 1
            this.cakeLamp.startWork = 1
          }else {
            let param = {
              trolleyYard: scanValue
            }
            findBytrolleyYardGetOne(param).then(response => {
              if(response.msg !== '2'){
                this.headContent.sfcCode = response.msg;
                this.queryParams.productNum = response.msg;
                this.$message('扫码识别产品序列号'+scanValue);
                this.getList()
                this.cakeLamp.scanFinish = 1
                this.cakeLamp.startWork = 1
              }else {
                this.$message('没有序列号'+scanValue);
                return
              }
            });
          }
            this.cakeLamp.InPlace = 1
          // }else {
          //   let param = {
          //     trolleyYard: scanValue
          //   }
          //   findBytrolleyYardGetOne(param).then(response => {
          //     if(response.msg !== '2'){
          //       this.headContent.sfcCode = response.msg;
          //       this.queryParams.productNum = response.msg;
          //       this.$message('扫码识别产品序列号'+scanValue);
          //       this.getList()
          //       this.cakeLamp.scanFinish = 1
          //       this.cakeLamp.startWork = 1
          //       this.cakeLamp.InPlace = 1
          //     }else {
          //       this.$message('没有序列号'+scanValue);
          //       return
          //     }
          //   });
          // }

        }