Merge remote-tracking branch 'origin/master'

cl

2024-09-06 91b54fc007c9e82087738048d3b767c9645a6aec

Merge remote-tracking branch 'origin/master'

 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java

@@ -528,17 +528,19 @@
    @Override
    public AjaxResult updateTighteningFormula(BsFormulaChildInfo bsFormulaChildInfo) {
        Boolean b = true;
        BsFormulaChildInfo getMaterTwo = new BsFormulaChildInfo();
        getMaterTwo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
        getMaterTwo.setOperationType("2");
        List<BsFormulaChildInfo> operationType = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(getMaterTwo);
        List<String> collect = operationType.stream().map(BsFormulaChildInfo::getResults).collect(Collectors.toList());
        for (String s : collect) {
            if(s.equals("")){
                return AjaxResult.error("扫码未完成，禁止拧紧操作！");
        if(!"OP100".equals(bsFormulaChildInfo.getLocationCode())){
            BsFormulaChildInfo getMaterTwo = new BsFormulaChildInfo();
            getMaterTwo.setProductCode(bsFormulaChildInfo.getProductCode());
            getMaterTwo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
            getMaterTwo.setOperationType("2");
            List<BsFormulaChildInfo> operationType = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(getMaterTwo);
            List<String> collect = operationType.stream().map(BsFormulaChildInfo::getResults).collect(Collectors.toList());
            for (String s : collect) {
                if(s.equals("")){
                    return AjaxResult.error("扫码未完成，禁止拧紧操作！");
                }
            }
        }

        //添加拧紧参数-参数采集表
        DaParamCollection daParamCollection = new DaParamCollection();
        daParamCollection.setParamCode(bsFormulaChildInfo.getParamCode());

 jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java

@@ -91,7 +91,7 @@

        //主线人工工位
        Constants.OP040_OP160.add(Constants.OP040);
        //Constants.OP040_OP160.add(Constants.OP060);
        Constants.OP040_OP160.add(Constants.OP080);
        Constants.OP040_OP160.add(Constants.OP070);
        Constants.OP040_OP160.add(Constants.OP100);
        Constants.OP040_OP160.add(Constants.OP120_2);

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

@@ -289,7 +289,7 @@
  name: "stationTerminal",
  data() {
    return {
      text: 'P9900166410#T2342325325235235\n#V993983#SSW002.005#HHW001.001#NMCU#',
      text: 'P9900200461#T2408170000004 #V993983#SSW001.001#HHW001.001#NMCU',
      materialCode: '', // 物料编码
      carCode: '',
      showInput: false,
@@ -424,24 +424,6 @@

      }
    },
    // getWorkOrders(){
    //   if(this.headContent.sfcCode === '' || this.headContent.sfcCode === null){
    //     //接收工单
    //     const param = {
    //       lineCode: this.headContent.processesCode
    //     }
    //     mozuReceivingWorkOrders(param).then(response => {
    //       this.headContent.sfcCode = response.msg;
    //       this.queryParams.productNum = response.msg;
    //       this.getList()
    //       this.cakeLamp.scanFinish = 1
    //       this.cakeLamp.startWork = 1
    //       this.cakeLamp.InPlace = 1
    //     });
    //   }else {
    //     this.$message.error("已经有工单了，不能接收！");
    //   }
    // },
    serialLink() {
      this.open1 = true
    },
@@ -538,16 +520,18 @@
    async getList() {
      await listProductionOrde(this.queryParams).then(response => {
        let rowsData = response.rows[0];
        console.log(rowsData)
        this.workpieceInformation.workOrderNo = rowsData.workOrderNo;
        this.workpieceInformation.productCode = rowsData.productCode;
        this.workpieceInformation.materialCode = rowsData.materialCode;
        this.workpieceInformation.planQty = rowsData.planQty;
        this.headContent.cardCode = rowsData.trolleyYard;
        if(rowsData){
          this.workpieceInformation.workOrderNo = rowsData.workOrderNo;
          this.workpieceInformation.productCode = rowsData.productCode;
          this.workpieceInformation.materialCode = rowsData.materialCode;
          this.workpieceInformation.planQty = rowsData.planQty;
          this.headContent.cardCode = rowsData.trolleyYard;
          this.getListFormulaChild()
          this.workpieceInformation.inboundTime = this.getCurrentTime()
        }else {
          this.$message.error('系统没有此工单，请重新扫码！');
        }
      });
      this.getListFormulaChild()
      this.workpieceInformation.inboundTime = this.getCurrentTime()

    },

    initializedData(){
@@ -564,7 +548,7 @@
          this.cakeLamp.InPlace = 1
          // this.test1()
          // this.test2()
          this.text = 'P9900166410#T'+this.headContent.sfcCode+'\n#V993983#SSW002.005#HHW001.001#NMCU#'
          this.text = 'P9900200461#T'+this.headContent.sfcCode+' #V993983#SSW001.001#HHW001.001#NMCU'
        }
      });
    },
@@ -595,7 +579,7 @@
          let qrCode = new QRCode('canvasWrapper1',{
            width: 83,
            height: 83,
            text: 'P9900166410#T'+ this.headContent.sfcCode +'#V993983#SSW002.005#HHW001.001#NMCU#',
            text: 'P9900200461#T'+this.headContent.sfcCode+' #V993983#SSW001.001#HHW001.001#NMCU',
            colorDark: '#000',
            colorLight: '#fff'
          })
@@ -608,7 +592,7 @@
          let qrCode = new QRCode('canvasWrapper2',{
            width: 83,
            height: 83,
            text: 'P9900166410#T'+ this.headContent.sfcCode +'#V993983#SSW002.005#HHW001.001#NMCU#',
            text: 'P9900200461#T'+this.headContent.sfcCode+' #V993983#SSW001.001#HHW001.001#NMCU',
            colorDark: '#000',
            colorLight: '#fff'
          })