From 2aae2ddd866c3fc88f37c44f69a38f6de076b502 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 12 七月 2024 10:39:55 +0800
Subject: [PATCH] 人工工位未做完工序给plc回22 未扫总成码回26

---
 jcdm-ui/src/views/main/kb/stationTerminal/index.vue |   32 +++++++++++---------------------
 1 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 4e760fc..3d4e227 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -30,22 +30,15 @@
            <span style="font-weight: bold">褰撳墠宸ヤ欢淇℃伅</span>
          </div>
          <el-descriptions :column="1" border :content-style="{'min-width': '140px'}">
-<!--         <el-descriptions :column="1" :label-style="{'font-size': '15px'}" border :content-style="{'min-width': '150px'}">-->
            <el-descriptions-item label="宸ュ崟缂栧彿">
                <span>{{workpieceInformation.workOrderNo}}</span>
            </el-descriptions-item>
-           <el-descriptions-item label="浜у搧鍨嬪彿">
-             <span>{{workpieceInformation.productCode}}</span>
+           <el-descriptions-item label="鐗╂枡缂栫爜">
+             <span>{{workpieceInformation.materialCode}}</span>
            </el-descriptions-item>
-           <el-descriptions-item label="灏忚溅鐮�">
-             <span>{{headContent.cardCode}}</span>
+           <el-descriptions-item label="璁″垝鏁伴噺">
+             <span>{{workpieceInformation.planQty}}</span>
            </el-descriptions-item>
-<!--           <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>
@@ -309,7 +302,7 @@
   fistSetpNumber, initializedData,
   listFormulaChild,
   noPageListFormulaChild,
-  releaseCheck,
+  releaseCheck, unfinishedProcess,
   updateResults,
   updateTighteningFormula,
   workpieceRelease
@@ -367,6 +360,8 @@
         productModel: null,
         productName: null,
         inboundTime: null,
+        materialCode: null,
+        planQty: null,
       },
       // 鏌ヨ鍙傛暟
       queryParams: {
@@ -623,8 +618,8 @@
         console.log(rowsData)
         this.workpieceInformation.workOrderNo = rowsData.workOrderNo;
         this.workpieceInformation.productCode = rowsData.productCode;
-        this.workpieceInformation.productModel = rowsData.productModel;
-        this.workpieceInformation.productName = rowsData.productName;
+        this.workpieceInformation.materialCode = rowsData.materialCode;
+        this.workpieceInformation.planQty = rowsData.planQty;
         this.headContent.cardCode = rowsData.trolleyYard;
       });
       this.getListFormulaChild()
@@ -743,18 +738,13 @@
 
           if(self.headContent.sfcCode=== ''||self.headContent.sfcCode=== null){
             self.$message('鎬绘垚鐮佷负绌猴紝璇锋壂鐮侊紒')
+            unfinishedProcess({processesCode: self.headContent.processesCode,recordDataDone: 26}).then(response => {});
             return;
           }
 
-          // 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('鏈仛瀹屽伐搴忕姝㈡斁琛�');
+            unfinishedProcess({processesCode: self.headContent.processesCode,recordDataDone: 25}).then(response => {});
             return;
           }
 

--
Gitblit v1.9.3