-bug修改

admin

2024-08-01 002c0ac4c04ea51dd3fd96def3c1f62c8bade624

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

@@ -308,10 +308,10 @@
import {listStationConf,getIpv4} from "@/api/main/sc/stationConf";
import {
  clearWorkpieceRelease,
  fistSetpNumber,
  listFormulaChild,
  fistSetpNumber, inPlaceInspection,
  listFormulaChild, manualNgOffline,
  noPageListFormulaChild,
  releaseCheck,
  releaseCheck, unfinishedProcess,
  updateResults,
  updateTighteningFormula,
  workpieceRelease
@@ -332,7 +332,7 @@
  addParamCollection,
  addTighteningParameters,
  saveCampaignTimeParameters,
  replaceAssemblyCode, checkRecordDataDone,
  replaceAssemblyCode, checkRecordDataDone, enterWeighing,
} from "@/api/main/da/paramCollection/paramCollection";

export default {
@@ -350,6 +350,8 @@
        pageSize: 10,
        productCode: null,
        processesCode: null,
        artificialNgFlag: null,
        sfcBarcode: null,
      },
      // 配方配置子信息表格数据
      formulaChildList: [],
@@ -392,8 +394,8 @@
      content: '',
      activeName: 'first',
      // url: "ws://192.168.2.248:8080/websocket/message/",
      url: "ws://10.103.210.248:8080/websocket/message/",
      // 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,
@@ -533,7 +535,10 @@
      // this.formulaChildList = []
      this.formulaChildParams.productCode = this.workpieceInformation.productCode
      this.formulaChildParams.processesCode = this.headContent.processesCode
      console.log(this.formulaChildParams)
      if(this.formulaChildParams.artificialNgFlag !== null){
        this.formulaChildParams.sfcBarcode = this.headContent.sfcCode
      }
      console.log("getListFormulaChild"+this.formulaChildParams.artificialNgFlag)
      noPageListFormulaChild(this.formulaChildParams).then(response => {
        this.formulaChildList = response.rows;
        if (this.formulaChildList.length >0){
@@ -573,6 +578,8 @@
      this.headContent.sfcCode = '';
      this.headContent.yzSfcCode = '';
      this.headContent.cardCode = '';
      this.formulaChildParams.artificialNgFlag = null
      this.formulaChildParams.sfcBarcode = null
    },
    changeMenu(tab, event) {
      console.log(tab, event);
@@ -609,12 +616,14 @@
        this.workpieceInformation.productModel = rowsData.productModel;
        this.workpieceInformation.productName = rowsData.productName;
        this.headContent.cardCode = rowsData.trolleyYard;
        this.formulaChildParams.artificialNgFlag = rowsData.artificialNgFlag;
      });
      this.getListFormulaChild()
      // this.addOverStationCollection()
      this.workpieceInformation.inboundTime = this.getCurrentTime()
      const param = {
        processesCode: this.headContent.processesCode,
        productCode: this.workpieceInformation.productCode
      }
      fistSetpNumber(param).then(response => {
        console.log("fistSetpNumber------"+response.msg)
@@ -680,14 +689,11 @@
        }
        this.headContent.processesName = rows.processesName
        this.headContent.processesCode = rows.processesCode
        if(this.headContent.processesCode === 'OP240'){
          this.onLineBinDing = true
        }
        if(this.headContent.processesCode === 'OP260'){
          // this.showInput = true
        }

        console.log('设置工位编码' + this.headContent.processesCode)
        inPlaceInspection({processesCode: this.headContent.processesCode}).then(response => {
          console.log(response)
          this.cakeLamp.InPlace = response.data
        });

      });
      this.conCom()
@@ -702,13 +708,22 @@
      this.ws.onmessage = function (event) {
        if (event.data === "IN") {
          self.cakeLamp.InPlace = 1;
          console.log(self.headContent.processesCode);
          // const param = {
          //   processesCode: self.headContent.processesCode,
          // }
          // fistSetpNumber(param).then(response => {});
        } else if (event.data === "IN0") {
          self.cakeLamp.InPlace = 0;
        } else if (event.data === "NG") {
          //给plc发下线信号
          //清除数据
          self.$confirm('拧紧三次NG，请确认下线！！！', '消息', {
            confirmButtonText: '确定',
            cancelButtonText: '取消',
            showCancelButton: false,
            type: 'warning'
          }).then(() => {
            self.ngFunction();
            this.$message({
              type: 'success',
              message: '确认成功!'
            });
          });

        } else if (event.data === "OUT") {
          self.cakeLamp.release = 1;
        } else if (event.data === "END") {
@@ -716,12 +731,14 @@
          const formulaChildIndex = self.formulaChildList.length-1

          if(self.headContent.sfcCode=== ''||self.headContent.sfcCode=== null){
            unfinishedProcess({processesCode: self.headContent.processesCode,recordDataDone: 26}).then(response => {});
            self.$message('总成码为空，请扫码！')
            return;
          }

          if(self.formulaChildList[formulaChildIndex].results !== 'OK'){
            self.$message('未做完工序禁止放行');
            unfinishedProcess({processesCode: self.headContent.processesCode,recordDataDone: 25}).then(response => {});
            return;
          }

@@ -734,72 +751,16 @@
            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 => {});
          //   // });
          // if(param.locationCode === 'POP430'){
          //   let enterWeighingparam = {
          //     sfcCode: param.productBarcode,
          //   }
          //   enterWeighing(enterWeighingparam).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
          //     });
          //   }
          // });
          console.log("进入最终方法")
          self.endSaveData(param)
        } else if (event.data.includes("[")) {
          let formulaChilds = "";
          self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
@@ -830,12 +791,15 @@
            spareField2: formulaChilds.spareField2,
            spareField3: formulaChilds.spareField3,
            spareField4: formulaChilds.spareField4,
            stepSort: formulaChilds.stepSort
            stepSort: formulaChilds.stepSort,
            ngTimes: formulaChilds.ngTimes,
          }
          if(formulaChilds.paramCode === null||formulaChilds.paramCode ===''){
            self.$message('未找到参数码，请检查参数码是否正确');
            return;
          }
          self.formulaChildParams.artificialNgFlag = null
          console.log("self.formulaChildParams.artificialNgFlag"+self.formulaChildParams.artificialNgFlag)
          if(self.headContent.sfcCode!==null||self.headContent.sfcCode!==''){
            updateTighteningFormula(param).then(response => {
              //addTighteningParameters(param).then(response => {});
@@ -856,6 +820,17 @@
      });
    },

    ngFunction(){
      const param = {
        locationCode: this.headContent.processesCode,
        sfcBarcode: this.headContent.sfcCode,
        productCode: this.workpieceInformation.productCode,
      }
      manualNgOffline(param).then(response => {});
      clearWorkpieceRelease(param).then(releaseCheck =>{});
      this.endClear()
    },

    //接受数据的回调
    callBack(value) {
      if (this.form1.isShowHistory) this.form1.desc = this.readLi().join("");
@@ -869,7 +844,7 @@
          //   this.headContent.yzSfcCode = scanValue
          //   this.bindYzSfc();
          // }else
          if(scanValue.includes("0RSP1TE") && this.headContent.processesCode === 'POP240'){
          if(scanValue.includes("0RSP1TE") && this.headContent.processesCode === 'POP230'){
            this.headContent.cardCode = scanValue
            this.bindcardCode(scanValue);
            this.serialPortMethod(scanValue)
@@ -879,7 +854,7 @@
            this.serialPortMethod(scanValue)
          }
        } else {
          if(this.headContent.processesCode === 'POP240'){
          if(this.headContent.processesCode === 'POP230'){
            this.headContent.sfcCode = scanValue;
            this.queryParams.productNum = scanValue;
            this.getList()