-

admin

2024-05-07 a75d86bc0d41018edf2e25b9740bc0be6978b735

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

@@ -85,24 +85,21 @@
           </el-col>

         </el-row>
<!--         <el-row style="margin-top: 20px">-->
<!--           <el-col :span="12">-->
<!--             <el-input v-model="serialPortContent" style="width: 150px;" placeholder="请输入内容"></el-input>-->

<!--           </el-col>-->
<!--           <el-col :span="12">-->
<!--             <el-button @click="serialPortMethod" type="primary">串口获取数据</el-button>-->

<!--           </el-col>-->
<!--         </el-row>-->
         <el-row v-show="showInput" style="margin-top: 20px">
           <el-col></el-col>
             <span style="width: 130px;" class="head-font">预装总成号 : {{headContent.yzSfcCode}}</span>
         </el-row>
         <el-row v-show="showInput" style="margin-top: 20px">
<!--             <el-button @click="Release" type="primary">绑定</el-button>-->
           <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-button @click="bindcardCode" type="primary">绑定</el-button>
         </el-row>
       </el-card>

@@ -118,6 +115,8 @@
               <el-table-column label="操作内容" :show-overflow-tooltip='true' align="center" prop="operationSteps">
               </el-table-column>
               <el-table-column label="产品编号" align="center" prop="productCode">
               </el-table-column>
               <el-table-column label="物料编码" align="center" prop="materialCode">
               </el-table-column>
               <el-table-column label="采集值" align="center" prop="collectData">
               </el-table-column>
@@ -308,7 +307,12 @@
} from "@/api/main/bs/formulaChild/formulaChild";
import MySerialPort from "@/utils/MySerialPort";
import USBDevice from "@/utils/usb.json";
import {listProductionOrde} from "@/api/main/om/productionOrde/productionOrde";
import {
  findBytrolleyYardGetOne,
  listProductionOrde,
  receivingWorkOrders,
  trolleyYardBinDing
} from "@/api/main/om/productionOrde/productionOrde";
import {addPassingStationCollection} from "@/api/main/da/passingStationCollection/passingStationCollection";
import {
  addBasicParameters,
@@ -322,7 +326,10 @@
  name: "stationTerminal",
  data() {
    return {
      showInput: true,
      carCode: '',
      showInput: false,
      onLineBinDing: false,

      serialPortContent: '',
      // 查询参数
      formulaChildParams: {
@@ -340,6 +347,7 @@
        processesName: '贴标机-贴码',
        sfcCode: '',
        yzSfcCode: '',
        cardCode: '',
      },
      workpieceInformation: {
        workOrderNo: null,
@@ -370,7 +378,7 @@
      },
      content: '',
      activeName: 'first',
      url: "ws://192.168.1.103:8080/websocket/message/",
      url: "ws://192.168.2.76:8080/websocket/message/",
      message: "",
      text_content: "",
      ws: null,
@@ -435,6 +443,16 @@
    },
  },
  methods: {
    bindcardCode(){
      this.$message('可以绑定！');
      let param = {
        productNum: this.headContent.sfcCode,
        trolleyYard: this.headContent.cardCode,
      }
      trolleyYardBinDing(param).then(response => {
      });

    },
    serialLink() {
      this.open1 = true
    },
@@ -460,38 +478,8 @@
        this.$message('mei连接了！');

      }

      // //判断是否可以释放
      // let formulaChildParams = {
      //   productCode: this.workpieceInformation.productCode,
      //   processesCode: this.headContent.processesCode
      // }
      // releaseCheck(formulaChildParams).then(response => {
      //   if(response.data === 0){
      //     //改变状态
      //     workpieceRelease(formulaChildParams).then(response => {
      //     });
      //     this.$message('放行成功！');
      //     this.formulaChildList = []
      //     this.getListFormulaChild()
      //     // this.resetting()
      //   }else {
      //     this.$message('步骤未完成不许放行！');
      //   }
      // });
    },
    serialPortMethod(value){
      // let formulaChilds = "";
      // this.formulaChildList.forEach((formulaChild) => {
      //   let operationType = formulaChild.operationType;
      //   let results = formulaChild.results;
      //   let materialCode = formulaChild.materialCode;
      //   if(operationType === '2' && value.includes(materialCode) && (results === "" || results === null || results === 'NG')){
      //     formulaChilds = formulaChild;
      //     return; // 使用return代替break
      //   }
      // });
      // console.log(formulaChilds)
      let formulaChildParams = {
        scanBarcode: value,
        sfcBarcode: this.headContent.sfcCode,
@@ -533,11 +521,11 @@
      this.cakeLamp.release= 0 //允许放行

      this.formulaChildList = []
      this.headContent.sfcCode = null
      this.workpieceInformation.productCode = null;
      this.workpieceInformation.workOrderNo = null;
      this.workpieceInformation.productModel = null;
      this.workpieceInformation.productName = null;
      this.headContent.sfcCode = '';
    },
    changeMenu(tab, event) {
      console.log(tab, event);
@@ -615,8 +603,14 @@
        }
        this.headContent.processesName = rows.processesName
        this.headContent.processesCode = rows.processesCode
        console.log('设置工位编码' + this.headContent.processesCode)
        if(this.headContent.processesCode === 'OP240'){
          this.onLineBinDing = true
        }
        if(this.headContent.processesCode === 'OP250-1' || this.headContent.processesCode === 'OP250-2' || this.headContent.processesCode === 'OP250-3'){
          this.showInput = true
        }

        console.log('设置工位编码' + this.headContent.processesCode)
      });
      this.conCom()
      console.log('websocket连接工位为' + this.headContent.processesCode)
@@ -687,15 +681,30 @@
        if(this.headContent.sfcCode !== ''){
          if(scanValue.includes("SS")){
            this.headContent.yzSfcCode = scanValue
          }else if(scanValue.includes("CC")){
            this.headContent.cardCode = scanValue
          }else {
            this.$message('扫描物料编码'+scanValue);
            console.log(scanValue)
            this.serialPortMethod(scanValue)
          }
        } else {
          if(this.headContent.processesCode === 'OP240'){
            this.headContent.sfcCode = scanValue;
            this.queryParams.productNum = scanValue;
          }else {
            let param = {
              trolleyYard: scanValue
            }
            findBytrolleyYardGetOne(param).then(response => {
              this.headContent.sfcCode = response.msg;
              this.queryParams.productNum = response.msg;

            });
          }
          this.$message('扫码识别产品序列号'+scanValue);
          this.headContent.sfcCode = scanValue;
          this.queryParams.productNum = scanValue;
          // this.headContent.sfcCode = scanValue;
          // this.queryParams.productNum = scanValue;
          this.getList()
          this.cakeLamp.scanFinish = 1
          this.cakeLamp.startWork = 1