From 549799903fe9e95618d40edd7c13a25c422ec882 Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Tue, 21 Dec 2021 18:40:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9D=90=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yieldReport/com_produce_material.js   | 42 ++++++++++
 .../yieldReport/com_produce_material.vue      | 78 +++++++++++++------
 2 files changed, 97 insertions(+), 23 deletions(-)
 create mode 100644 src/api/yieldReport/com_produce_material.js

diff --git a/src/api/yieldReport/com_produce_material.js b/src/api/yieldReport/com_produce_material.js
new file mode 100644
index 0000000..ad60ec6
--- /dev/null
+++ b/src/api/yieldReport/com_produce_material.js
@@ -0,0 +1,42 @@
+import { createAPI } from '@/utils/httpRequest.js'
+
+// 获取当前BOM行号
+export const getBomItemNosByPartNo = data => createAPI('schedule/getBomItemNosByPartNo', 'POST', data)
+
+// 获取上机卷的时间信息汇总
+export const countSfdcTimeQty = data => createAPI('schedule/countSfdcTimeQty', 'POST', data)
+
+// 获取派工单的班次信息
+export const getScheduleShiftData = data => createAPI('schedule/getScheduleShiftData', 'POST', data)
+
+// 获取sfdc表的时间信息汇总
+export const getSfdcTimeData = data => createAPI('schedule/getSfdcTimeData', 'POST', data)
+
+// 获取当前时间记录信息
+export const getSfdcTimeMaxAndMinTime = data => createAPI('schedule/getSfdcTimeMaxAndMinTime', 'POST', data)
+
+// 获取当前卷sfdc表的报工数据
+export const getSfdcReportedData = data => createAPI('schedule/getSfdcReportedData', 'POST', data)
+
+// 获取当前卷的材料记录--在线的
+export const getSfdcMaterialByRollNo = data => createAPI('schedule/getSfdcMaterialByRollNo', 'POST', data)
+
+// 获取当前派工单的材料记录
+export const getSfdcMaterialByCon = data => createAPI('schedule/getSfdcMaterialByCon', 'POST', data)
+
+// 获取当前派工单的上机卷记录
+export const getSfdcRollOpsByCon = data => createAPI('schedule/getSfdcRollOpsByCon', 'POST', data)
+
+// 获取当前派工单的不良卷记录
+export const getSfdcDefectByCon = data => createAPI('schedule/getSfdcDefectByCon', 'POST', data)
+
+// 获取当前上机卷信息
+export const getSfdcRollByCon = data => createAPI('schedule/getSfdcRollByCon', 'POST', data)
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/yieldReport/com_produce_material.vue b/src/views/modules/yieldReport/com_produce_material.vue
index 1165298..a9b2689 100644
--- a/src/views/modules/yieldReport/com_produce_material.vue
+++ b/src/views/modules/yieldReport/com_produce_material.vue
@@ -19,10 +19,10 @@
             <el-row>
             <el-col :span="16">
               <el-form-item :label="'BOM 序号:'">
-                <el-select v-model="pageData.bomItemNo" style="width: 120px">
+                <el-select v-model="pageData.bomItemNo" :disabled="selectFlag" style="width: 120px">
                   <el-option
-                    v-for="item in bomList"
-                    :key="item.itemNo"
+                    v-for="(item, index) in bomList"
+                    :key="index"
                     :label="item.itemNo"
                     :value="item.itemNo">
                   </el-option>
@@ -33,7 +33,7 @@
           </el-form>
       </el-container>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary">确定</el-button>
+        <el-button type="primary" @click="checkRmRollNo">确定</el-button>
         <el-button type="primary" @click="closeDialog">关闭</el-button>
       </span>
     </el-dialog>
@@ -41,12 +41,15 @@
 </template>
 
 <script>
+import {
+  getBomItemNosByPartNo,
+} from "@/api/yieldReport/com_produce_material.js";
 export default {
-  name: "com_defect_roll",
   data() {
     return {
       titleCon: '材料',
       sfdcTimeList: [],
+      selectFlag: true,
       scheduleData: {
         site: this.$store.state.user.site,
         userName: this.$store.state.user.name,
@@ -79,14 +82,14 @@ export default {
         seqNo: '',
         orderNo: '',
         itemNo: 0,
-        partNo: '',
         workCenterNo: '',
         rollNo: '',
         rmRollNo: '',
-        bomItemNo: 0,
+        bomItemNo: '',
         shiftNo: '',
         nextItemNo: 0,
-        operatorId: ''
+        operatorId: '',
+        closedFlag: 'N'
       },
       operatorData: {
         site: this.$store.state.user.site,
@@ -114,7 +117,8 @@ export default {
       this.pageData.seqNo = scheduleData.seqNo;
       this.pageData.rollNo = scheduleData.rollNo;
       this.pageData.rmRollNo = '';
-      this.pageData.bomItemNo = 0;
+      this.pageData.bomItemNo = '';
+      this.pageData.closedFlag = 'N';
       //自动获取焦点
       this.$nextTick(() => {
         this.$refs.rmRollNo.focus();
@@ -132,33 +136,62 @@ export default {
     },
 
     /*检查材料卷号的数据*/
-    checkRmRollNo(){
+    checkRmRollNo() {
       //首先判断时间是否超过100毫秒
       let len = this.timeArray.length;
-      let timeDiff = this.timeArray[len-1] - this.timeArray[0];
+      let timeDiff = this.timeArray[len - 1] - this.timeArray[0];
       //判断时间是否在范围之内
       /*if(timeDiff > 1000){
         this.$message.error('请扫码输入!');
       }*/
       //判断null和空字符串
-      if(this.pageData.rmRollNo == null || this.pageData.rmRollNo == ''){
+      if (this.pageData.rmRollNo == null || this.pageData.rmRollNo == '') {
         this.$message.error('材料卷号不能为空!');
+        return false;
+      }else{
+        this.pageData.rmRollNo = this.pageData.rmRollNo.trim();
       }
       //处理扫描材料卷号
-      debugger;
+      this.refreshSomItemNos();
     },
 
+    /*获取BOM行号*/
+    refreshSomItemNos(){
+      getBomItemNosByPartNo(this.pageData).then(({data}) => {
+        //判断是否成功
+        if(data.code == 500){
+          this.$message.error(data.msg);
+          return false;
+        }
+       this.bomList = data.rows;
+        //首先判断行号是否只有一行
+        if(this.bomList.length == 1){
+          //禁用下拉框
+          this.selectFlag = true;
+          //选中第一个
+          this.pageData.bomItemNo = data.rows[0].itemNo;
+        }else{
+          //启用下拉框
+          this.selectFlag = false;
+          //this.bomList.unshift({'itemNo': '请选择'})
+        }
+      });
+    },
 
+    /*保存材料上机的记录*/
+    feedingMaterialRoll(){
+      //判断卷号是否为空
+      if (this.pageData.rmRollNo == null || this.pageData.rmRollNo == ''){
+        this.$message.error('请扫描材料卷号!')
+        return false;
+      }
+      //判断是否选中行号
+      if(this.pageData.bomItemNo == '请选择' || this.pageData.bomItemNo == ''){
+        this.$message.error('请选择BOM行号!')
+        return false;
+      }
 
-
-
-
-
-
-
-
-
-
+    },
 
   },
   created() {
@@ -166,7 +199,6 @@ export default {
     // this.getLanguageList()
   }
 }
-
 </script>
 
 <style scoped lang="scss">