From 4c7976d9bf5326f5379afc0545fe8265e5db09da Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Wed, 29 Dec 2021 10:26:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=80=E6=A8=A1=E4=B8=8A=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yieldReport/com_produce_tool.js       |  11 ++
 .../yieldReport/com_produce_report_normal.vue |   2 +-
 .../modules/yieldReport/com_produce_tool.vue  | 112 +++++++++++++-----
 3 files changed, 96 insertions(+), 29 deletions(-)
 create mode 100644 src/api/yieldReport/com_produce_tool.js

diff --git a/src/api/yieldReport/com_produce_tool.js b/src/api/yieldReport/com_produce_tool.js
new file mode 100644
index 0000000..214e637
--- /dev/null
+++ b/src/api/yieldReport/com_produce_tool.js
@@ -0,0 +1,11 @@
+import { createAPI } from '@/utils/httpRequest.js'
+
+//检查工具实例编码
+export const checkToolInstanceId = data => createAPI('schedule/checkToolInstanceId', 'POST', data)
+
+// 获取不良代码的信息
+export const checkDefectCode = data => createAPI('schedule/checkDefectCode', 'POST', data)
+
+// 获取不良代码的信息
+export const reportDefectCode = data => createAPI('schedule/reportDefectCode', 'POST', data)
+
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 06226e2..a8d5593 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -3074,7 +3074,7 @@ export default {
       //打开生产过程的工具的页面
       this.$nextTick(() => {
         this.showToolFlag = true;
-        this.$refs.comProduceTool.init(this.scheduleData, this.operatorData)
+        this.$refs.comProduceTool.init(this.scheduleData, this.operatorData, false)
       });
     },
 
diff --git a/src/views/modules/yieldReport/com_produce_tool.vue b/src/views/modules/yieldReport/com_produce_tool.vue
index 84c4dbb..0d219e1 100644
--- a/src/views/modules/yieldReport/com_produce_tool.vue
+++ b/src/views/modules/yieldReport/com_produce_tool.vue
@@ -8,7 +8,8 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item :label="'工具实例编号:'">
-                  <el-input v-model="scheduleData.seqNo" style="width: 120px"></el-input>
+                  <el-input ref="toolInstanceId" v-model="pageData.toolInstanceId"
+                       @keyup.enter.native="checkToolInstanceIdFun"     style="width: 120px"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -20,7 +21,7 @@
                   <el-col :span="16">
                     <el-form-item class="customer-item">
                       <el-checkbox disabled="disabled" true-label="Y" false-label="N"
-                                   v-model="scheduleData.reportedFlag">换刀模</el-checkbox>
+                                   v-model="pageData.replaceFlag">换刀模</el-checkbox>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -28,24 +29,24 @@
                 <el-row>
                   <el-col :span="12">
                     <el-form-item class="customer-item" label="原工具实例编码:">
-                      <el-input v-model="scheduleData.orderNo" readonly style="width: 100px;" ></el-input>
+                      <el-input v-model="pageData.oriToolInstanceId" readonly="readonlyFlag" style="width: 100px;" ></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item class="customer-item" label="本卷生产数量:">
-                      <el-input v-model="scheduleData.orderNo" readonly style="width: 100px;" ></el-input>
+                      <el-input v-model="pageData.consumeQty" readonly="readonlyFlag" style="width: 100px;" ></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row>
                   <el-col :span="12">
                     <el-form-item class="customer-item" label="之前卷以生产数量:">
-                      <el-input v-model="scheduleData.orderNo" readonly style="width: 100px;" ></el-input>
+                      <el-input v-model="pageData.oriConsumeQty" readonly="readonlyFlag" style="width: 100px;" ></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item class="customer-item" label="累计生产数量:">
-                      <el-input v-model="scheduleData.orderNo" readonly style="width: 100px;" ></el-input>
+                      <el-input v-model="pageData.totalConsumeQty" readonly="readonlyFlag" style="width: 100px;" ></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -55,7 +56,6 @@
           </el-form>
       </el-container>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary">列表</el-button>
         <el-button type="primary">确 定</el-button>
         <el-button type="primary" @click="closeDialog">关闭</el-button>
       </span>
@@ -64,6 +64,10 @@
 </template>
 
 <script>
+import {
+  checkToolInstanceId,
+}
+  from '@/api/yieldReport/com_produce_tool.js';
 export default {
   name: "com_defect_roll",
   data() {
@@ -75,23 +79,41 @@ export default {
         userName: this.$store.state.user.name,
         seqNo: '',
         orderNo: '',
+        itemNo: 0,
         partNo: '',
+        workCenterNo: '',
+        workCenterDesc: '',
+        resourceDesc: '',
         rollNo: '',
         partDesc: '',
-        reportedFlag: 'N',
+        planStartTime: '',
+        planFinishTime: '',
         qtyRequiredOriginal: 0,
         scheduledDate: '',
         shiftNo: '',
         preItemDesc: '',
         nextItemDesc: '',
         nextItemNo: 0,
+        operatorId: '',
+        functionName: '',
         currentRollFlag: false
       },
-      currentRollOps: {
+      pageData: {
         site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+        orderNo: '',
+        itemNo: '',
         seqNo: '',
         rollNo: '',
-        finishedFlag: '',
+        operatorId: '',
+        replaceFlag: false,
+        toolInstanceId: '',
+        oriToolInstanceId: '',
+        consumeQty: 0,
+        oriConsumeQty: 0,
+        totalConsumeQty: 0,
+        readonlyFlag: true,
+        checkFlag: false,
       },
       operatorData: {
         site: this.$store.state.user.site,
@@ -107,32 +129,66 @@ export default {
   },
   methods: {
 
+    //初始化组件的参数
+    init(scheduleData, operatorData, replaceFlag) {
+      //初始化参数
+      this.scheduleData = scheduleData;
+      //初始化操作员对象
+      this.operatorData = JSON.parse(JSON.stringify(operatorData));
+      //是否是切换
+      this.pageData.replaceFlag = replaceFlag;
+      //设置参数
+      this.pageData.orderNo = scheduleData.orderNo;
+      this.pageData.itemNo = scheduleData.itemNo;
+      this.pageData.seqNo = scheduleData.seqNo;
+      this.pageData.rollNo = scheduleData.rollNo;
+      this.pageData.operatorId = operatorData.operatorId;
+      //清空数据
+      this.pageData.toolInstanceId = '';
+      this.pageData.oriToolInstanceId = '';
+      this.pageData.defectDesc = '';
+      //自动获取焦点
+      this.$nextTick(() => {
+        this.$refs.toolInstanceId.focus();
+      });
+      //区分是否是切换切换的
+      if(replaceFlag){
+        this.pageData.consumeQty = 0;
+        this.pageData.oriConsumeQty = 0;
+        this.pageData.totalConsumeQty = 0;
+        this.readonlyFlag = false;
+      }else{
+        this.pageData.consumeQty = '';
+        this.pageData.oriConsumeQty = '';
+        this.pageData.totalConsumeQty = '';
+        this.readonlyFlag = true;
+      }
+    },
+
     /*关闭modal*/
     closeDialog(){
       this.$emit('update:visible', false);
     },
 
+    /*检查新的工具实例信息*/
+    checkToolInstanceIdFun(){
+      if(this.pageData.toolInstanceId == null || this.pageData.toolInstanceId == ''){
+        this.$message.error('请扫描工具实例!');
+        return false;
+      }
+      checkToolInstanceId(this.pageData).then(({data}) => {
+        //判断检查是否通过
+        //判断是否存在异常
+        if(data.code == 500){
+          this.$message.error(data.msg);
+        }else{
+          this.pageData.checkFlag = true;
+        }
+      });
+    },
 
 
 
-
-
-
-
-
-
-
-    init(seqNo, operatorData) {
-      //初始化参数
-      this.scheduleData.seqNo = seqNo;
-      //初始化操作员对象
-      this.operatorData = JSON.parse(JSON.stringify(operatorData));
-      // this.currentRollOps.seqNo = seqNo;
-      // this.currentRollOps.rollNo = rollNo;
-      //刷新当前派工单的信息
-      //this.refreshPageData();
-    },
-
   },
   created() {
     // this.factoryList()