绑定小车码，预装总成码，手动工位扫码，拧紧逻辑优化

admin

2024-07-01 768498719683f85e5ed19c73eb3d14cdbf420df4

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

@@ -34,18 +34,21 @@
           <el-descriptions-item label="工单编号">
               <span>{{workpieceInformation.workOrderNo}}</span>
           </el-descriptions-item>
           <el-descriptions-item label="产品编号">
           <el-descriptions-item label="产品型号">
             <span>{{workpieceInformation.productCode}}</span>
           </el-descriptions-item>
           <el-descriptions-item label="产品型号">
             <span>{{workpieceInformation.productModel}}</span>
           <el-descriptions-item label="小车码">
             <span>{{headContent.cardCode}}</span>
           </el-descriptions-item>
           <el-descriptions-item label="产品名称">
             <span>{{workpieceInformation.productName}}</span>
           </el-descriptions-item>
<!--           <el-descriptions-item label="节拍">-->
<!--             <span>{{workpieceInformation.beat}}</span>-->
<!--           <el-descriptions-item label="产品型号">-->
<!--             <span>{{workpieceInformation.productModel}}</span>-->
<!--           </el-descriptions-item>-->
<!--           <el-descriptions-item label="产品名称">-->
<!--             <span>{{workpieceInformation.productName}}</span>-->
<!--           </el-descriptions-item>-->
           <el-descriptions-item label="开始时间">
             <span>{{workpieceInformation.inboundTime}}</span>
           </el-descriptions-item>
         </el-descriptions>
         <el-divider></el-divider>
         <el-row>
@@ -93,10 +96,10 @@
<!--           <el-button @click="bindYzSfc" type="primary">绑定</el-button>-->
<!--         </el-row>-->

         <el-row v-show="onLineBinDing" style="margin-top: 20px">
           <el-col></el-col>
           <span style="width: 130px;" class="head-font">小车码 : {{headContent.cardCode}}</span>
         </el-row>
<!--         <el-row v-show="onLineBinDing" style="margin-top: 20px">-->
<!--           <el-col></el-col>-->
<!--           <span style="width: 130px;" class="head-font">小车码 : {{headContent.cardCode}}</span>-->
<!--         </el-row>-->
<!--         <el-row v-show="onLineBinDing" style="margin-top: 20px">-->
<!--           <el-button @click="bindcardCode" type="primary">绑定</el-button>-->
<!--         </el-row>-->
@@ -111,18 +114,21 @@
             <el-table height="500" :cell-style="rowStyle" :data="formulaChildList">
<!--               <el-table-column label="排序" width="60" align="center" type="index">-->
<!--               </el-table-column>-->
               <el-table-column label="拧紧步号" align="center" prop="stepSort">
               <el-table-column label="拧紧步号" width="80" align="center" prop="stepSort">
               </el-table-column>
<!--               <el-table-column label="操作内容" :show-overflow-tooltip='true' align="center" prop="operationSteps">-->
               <el-table-column label="操作内容" align="center" prop="operationSteps">
               </el-table-column>
               <el-table-column label="产品编号" align="center" prop="productCode">
<!--               <el-table-column label="上限" width="60" align="center" prop="spareField3">-->
<!--               </el-table-column>-->
<!--               <el-table-column label="下限" width="60" align="center" prop="spareField4">-->
<!--               </el-table-column>-->
               <el-table-column label="产品编号" width="80" align="center" prop="productCode">
               </el-table-column>
               <el-table-column label="物料编码" align="center" prop="materialCode">
               <el-table-column label="物料编码" width="110" align="center" prop="materialCode">
               </el-table-column>
               <el-table-column label="采集值" align="center" prop="collectData">
               </el-table-column>
               <el-table-column label="结果" align="center" prop="results">
               <el-table-column label="结果" width="60" align="center" prop="results">
               </el-table-column>

             </el-table>
@@ -361,7 +367,7 @@
        productCode: null,
        productModel: null,
        productName: null,
        beat: null,
        inboundTime: null,
      },
      // 查询参数
      queryParams: {
@@ -385,7 +391,8 @@
      },
      content: '',
      activeName: 'first',
      url: "ws://192.168.2.76:8080/websocket/message/",
      url: "ws://10.103.210.248:8080/websocket/message/",
      // url: "ws://192.168.2.76:8080/websocket/message/",
      message: "",
      text_content: "",
      ws: null,
@@ -415,6 +422,7 @@
      passingStationForm: {},
      originalArray: [],
      yzSfcFlag: 1,
      endYz: false,
    }
  },
  beforeDestroy() {
@@ -451,11 +459,11 @@
    },
  },
  methods: {
    bindcardCode(){
      this.$message('绑定成功！');
    bindcardCode(scanValue){
      // this.$message('绑定成功！');
      let param = {
        productNum: this.headContent.sfcCode,
        trolleyYard: this.headContent.cardCode,
        trolleyYard: scanValue,
      }
      trolleyYardBinDing(param).then(response => {
      });
@@ -505,6 +513,8 @@
        console.log(response)
        if(response.msg === "3"){
          this.cakeLamp.release= 1 //允许放行
        }else if(response.msg === "2"){
          this.$message.error('扫码重复请重新扫码！');
        }
        this.getListFormulaChild()
      });
@@ -558,6 +568,7 @@
      this.workpieceInformation.workOrderNo = null;
      this.workpieceInformation.productModel = null;
      this.workpieceInformation.productName = null;
      this.workpieceInformation.inboundTime = null;
      this.headContent.sfcCode = '';
      this.headContent.yzSfcCode = '';
      this.headContent.cardCode = '';
@@ -596,12 +607,11 @@
        this.workpieceInformation.productCode = rowsData.productCode;
        this.workpieceInformation.productModel = rowsData.productModel;
        this.workpieceInformation.productName = rowsData.productName;
        // this.timer = setInterval(() => {
        //   this.workpieceInformation.beat++;
        // }, 1000);
        this.headContent.cardCode = rowsData.trolleyYard;
      });
      this.getListFormulaChild()
      this.addOverStationCollection()
      // this.addOverStationCollection()
      this.workpieceInformation.inboundTime = this.getCurrentTime()
      const param = {
        processesCode: this.headContent.processesCode,
      }
@@ -610,6 +620,19 @@
      });
    },

    getCurrentTime() {
      const now = new Date();
      const year = now.getFullYear();
      const month = this.padTimeUnit(now.getMonth() + 1); // 月份是从0开始的
      const day = this.padTimeUnit(now.getDate());
      const hours = this.padTimeUnit(now.getHours());
      const minutes = this.padTimeUnit(now.getMinutes());
      const seconds = this.padTimeUnit(now.getSeconds());
      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
    },
    padTimeUnit(value) {
      return value.toString().padStart(2, '0');
    },
    addBaseData(){
      addBasicParameters(this.passingStationForm).then(response => {});
    },
@@ -660,7 +683,7 @@
          this.onLineBinDing = true
        }
        if(this.headContent.processesCode === 'OP260'){
          this.showInput = true
          // this.showInput = true
        }

        console.log('设置工位编码' + this.headContent.processesCode)
@@ -688,60 +711,106 @@
        } else if (event.data === "OUT") {
          self.cakeLamp.release = 1;
        } else if (event.data === "END") {
          const param = {
            workOrderNo: self.workpieceInformation.workOrderNo,
            productCode: self.workpieceInformation.productCode,
            locationCode: self.headContent.processesCode,
            productBarcode: self.headContent.sfcCode,
          }

          const formulaChildIndex = self.formulaChildList.length-1

          const orderParam = {
            productNum: self.headContent.sfcCode,
          }

          if(self.headContent.sfcCode=== ''||self.headContent.sfcCode=== null){
            self.$message('总成码为空，请检查！')
            return
            self.$message('总成码为空，请扫码！')
            return;
          }

          checkCarCode(orderParam).then(response => {
            console.log(response.data)
            if(response.data === 1){
              if(self.headContent.processesCode === "OP260"){
                checkYzSfcCode(orderParam).then(response => {
                  if(response.data === 1){
                    saveCampaignTimeParameters(param).then(response => {
                      checkRecordDataDone(param).then(response => {
                        if(response.msg === "21"){
                          self.cakeLamp.release = 1;
                          self.endClear()
                          workpieceRelease(param).then(response => {});
                        }else {
                          self.$message('未做完工序禁止放行');
                        }
                      });
                    });
                  }else {
                    self.$message('请先绑定预装总成');
                  }
                });
              }else {
                saveCampaignTimeParameters(param).then(response => {
                  checkRecordDataDone(param).then(response => {
                    if(response.msg === "21"){
                      self.cakeLamp.release = 1;
                      self.endClear()
                      workpieceRelease(param).then(response => {});
                    }else {
                      self.$message('未做完工序禁止放行');
                    }
                  });
                });
              }
            }else {
              self.$message('未绑定小车码禁止放行');
            }
          });
          // if(self.headContent.cardCode === null || self.headContent.cardCode === ''){
          //   self.$alert('<strong style="color: red;font-size: 30px">未扫描小车码禁止放行</strong>', '提示', {
          //     dangerouslyUseHTMLString: true
          //   });
          //   return;
          // }

          if(self.formulaChildList[formulaChildIndex].results !== 'OK'){
            self.$message('未做完工序禁止放行');
            return;
          }


          const param = {
            workOrderNo: self.workpieceInformation.workOrderNo,
            productCode: self.workpieceInformation.productCode,
            locationCode: self.headContent.processesCode,
            productBarcode: self.headContent.sfcCode,
            inboundTime: self.workpieceInformation.inboundTime,
            formulaChildEntity: self.formulaChildList[formulaChildIndex]
          }

          console.log("进入最终方法")
          self.endSaveData(param)


          // if(self.headContent.processesCode === "OP260"){
          //   checkYzSfcCode(orderParam).then(response => {
          //     if(response.data === 0){
          //       self.$message('未绑定总成码禁止放行');
          //       return;
          //     }else {
          //       self.endSaveData(param)
          //       // saveCampaignTimeParameters(param).then(response => {
          //       //   self.cakeLamp.release = 1;
          //       //   self.endClear()
          //       //   workpieceRelease(param).then(response => {});});
          //     }
          //   })
          // }else {
          //   self.endSaveData(param)
          //   // saveCampaignTimeParameters(param).then(response => {
          //   //   self.cakeLamp.release = 1;
          //   //   self.endClear()
          //   //   workpieceRelease(param).then(response => {});
          //   // });
          // }

          // checkCarCode(orderParam).then(response => {
          //   console.log(response.data)
          //   if(response.data === 1){
          //     if(self.headContent.processesCode === "OP260"){
          //       checkYzSfcCode(orderParam).then(response => {
          //         if(response.data === 1){
          //           saveCampaignTimeParameters(param).then(response => {
          //             checkRecordDataDone(param).then(response => {
          //               if(response.msg === "21"){
          //                 self.cakeLamp.release = 1;
          //                 self.endClear()
          //                 workpieceRelease(param).then(response => {});
          //               }else {
          //                 self.$message('未做完工序禁止放行');
          //               }
          //             });
          //           });
          //         }else {
          //           self.$message('请先绑定预装总成');
          //         }
          //       });
          //     }else {
          //       saveCampaignTimeParameters(param).then(response => {
          //         checkRecordDataDone(param).then(response => {
          //           if(response.msg === "21"){
          //             self.cakeLamp.release = 1;
          //             self.endClear()
          //             workpieceRelease(param).then(response => {});
          //           }else {
          //             self.$message('未做完工序禁止放行');
          //           }
          //         });
          //       });
          //     }
          //   }else {
          //     self.$alert('<strong style="color: red;font-size: 30px">未扫描小车码禁止放行</strong>', '提示', {
          //       dangerouslyUseHTMLString: true
          //     });
          //   }
          // });
        } else if (event.data.includes("[")) {
          let formulaChilds = "";
          self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
@@ -750,26 +819,37 @@
          for (let i = 0; i < self.formulaChildList.length; i++) {
            let formulaChild = self.formulaChildList[i];
            let results = formulaChild.results;

            if (results === '' || results === null || results === 'NG') {
              formulaChilds = formulaChild;
              break;
            }
          }
           if(formulaChilds === ""){
             self.$message.error('本工位已工作完成！');
             return;
           }
          const param = {
            id: formulaChilds.id,
            tightenTheArray: event.data,
            paramCode: formulaChilds.paramCode,
            workOrderNo: self.workpieceInformation.workOrderNo,
            productCode: self.workpieceInformation.productCode,
            locationCode: self.headContent.processesCode,
            productBarcode: self.headContent.sfcCode,
            spareField1: formulaChilds.spareField1,
            spareField2: formulaChilds.spareField2,
            spareField3: formulaChilds.spareField3,
            spareField4: formulaChilds.spareField4,
            stepSort: formulaChilds.stepSort
          }
          if(formulaChilds.paramCode === null||formulaChilds.paramCode ===''){
            self.$message('未找到参数码，请检查参数码是否正确');
            return;
          }
          if(self.headContent.sfcCode!==null||self.headContent.sfcCode!==''){
            addTighteningParameters(param).then(response => {});
            updateTighteningFormula(param).then(response => {
              //addTighteningParameters(param).then(response => {});
              self.getListFormulaChild()
            }).catch(error =>{
              self.getListFormulaChild()
@@ -779,7 +859,13 @@
      };
    },


    endSaveData(param){
      saveCampaignTimeParameters(param).then(response => {
      this.cakeLamp.release = 1;
      this.endClear()
      workpieceRelease(param).then(response => {});
      });
    },

    //接受数据的回调
    callBack(value) {
@@ -787,15 +873,17 @@
      else {
        const scanValue = this.myserialport.hex2atostr(value).replace(/[\r\n]/g, '');
        console.log("串口收到数据-------------------"+scanValue)

        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'){
          // 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();
            this.bindcardCode(scanValue);
            this.serialPortMethod(scanValue)
          }else {
            this.$message('工位终端扫描物料编码'+scanValue);
            console.log(scanValue)