From e7190aef417c59e0c1638b33e5a5dc00cb21509a Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Fri, 31 Dec 2021 13:54:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E7=94=9F=E4=BA=A7=E7=9A=84?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...terial_settlement.js => com_end_tuning.js} |  0
 src/api/yieldReport/com_start_produce.js      |  4 ++
 ...rial_settlement.vue => com_end_tuning.vue} |  2 +-
 .../modules/yieldReport/com_start_produce.vue | 70 +++++++++++--------
 4 files changed, 45 insertions(+), 31 deletions(-)
 rename src/api/yieldReport/{com_material_settlement.js => com_end_tuning.js} (100%)
 create mode 100644 src/api/yieldReport/com_start_produce.js
 rename src/views/modules/yieldReport/{com_material_settlement.vue => com_end_tuning.vue} (99%)

diff --git a/src/api/yieldReport/com_material_settlement.js b/src/api/yieldReport/com_end_tuning.js
similarity index 100%
rename from src/api/yieldReport/com_material_settlement.js
rename to src/api/yieldReport/com_end_tuning.js
diff --git a/src/api/yieldReport/com_start_produce.js b/src/api/yieldReport/com_start_produce.js
new file mode 100644
index 0000000..413b47c
--- /dev/null
+++ b/src/api/yieldReport/com_start_produce.js
@@ -0,0 +1,4 @@
+import { createAPI } from '@/utils/httpRequest.js'
+
+//判断是否可以开始生产
+export const checkStartProduce = data => createAPI('schedule/checkStartProduce', 'POST', data)
diff --git a/src/views/modules/yieldReport/com_material_settlement.vue b/src/views/modules/yieldReport/com_end_tuning.vue
similarity index 99%
rename from src/views/modules/yieldReport/com_material_settlement.vue
rename to src/views/modules/yieldReport/com_end_tuning.vue
index fb3d963..6a924f7 100644
--- a/src/views/modules/yieldReport/com_material_settlement.vue
+++ b/src/views/modules/yieldReport/com_end_tuning.vue
@@ -82,7 +82,7 @@
 <script>
 import {
   getSfdcMaterialByRollNo,
-} from '@/api/yieldReport/com_material_settlement.js';
+} from '@/api/yieldReport/com_end_tuning.js';
 export default {
   name: "com_finish_roll",
   data() {
diff --git a/src/views/modules/yieldReport/com_start_produce.vue b/src/views/modules/yieldReport/com_start_produce.vue
index 53414d1..3d8b63e 100644
--- a/src/views/modules/yieldReport/com_start_produce.vue
+++ b/src/views/modules/yieldReport/com_start_produce.vue
@@ -31,26 +31,31 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="materialSettlementModal">保存</el-button>
+        <el-button type="primary" @click="startProduceFun">保存</el-button>
         <el-button type="primary" @click="closeDialog">关闭</el-button>
       </span>
     </el-dialog>
 
     <!--  卷调机-卷材料耗用  -->
-    <comMaterialSettlement ref="comMaterialSettlement" :close-on-click-modal="false"
-                           :visible.sync="materialSettlementFlag">
-    </comMaterialSettlement>
+    <comEndTuning ref="comEndTuning" :close-on-click-modal="false"
+                           :visible.sync="endTuningFlag">
+    </comEndTuning>
   </div>
 </template>
 
 <script>
+import {
+  checkStartProduce,
+}
+from '@/api/yieldReport//com_start_produce.js';
 /*引入组件*/
-import comMaterialSettlement from './com_material_settlement';/*开始生产时候报告调机的材料的使用数量*/
+import comEndTuning from './com_end_tuning';
+/*开始生产时候报告调机的材料的使用数量*/
 export default {
   data() {
     return {
       titleCon: '开始生产',
-      materialSettlementFlag: false,
+      endTuningFlag: false,
       sfdcTimeList: [],
       scheduleData: {
         site: this.$store.state.user.site,
@@ -59,6 +64,7 @@ export default {
         orderNo: '',
         itemNo: 0,
         partNo: '',
+        workCenterNo: '',
         workCenterDesc: '',
         resourceDesc: '',
         rollNo: '',
@@ -71,18 +77,14 @@ export default {
         preItemDesc: '',
         nextItemDesc: '',
         nextItemNo: 0,
+        operatorId: '',
+        functionName: '',
         currentRollFlag: false
       },
       pageData: {
         reportDate: this.dayjs().format('YYYY-MM-DD'),
         reportTime: this.dayjs().format('HH:mm:ss'),
       },
-      currentRollOps: {
-        site: this.$store.state.user.site,
-        seqNo: '',
-        rollNo: '',
-        finishedFlag: '',
-      },
       operatorData: {
         site: this.$store.state.user.site,
         username: this.$store.state.user.name,
@@ -92,24 +94,11 @@ export default {
         seqNo: '',
         showFlag: false
       },
-      buttonTags:{
-        createRollFlag: true,
-        switchRollFlag: true,
-        separatorRollFlag: true,
-        finishRollFlag: true,
-        mergeRollFlag: true,
-        tuningFlag: true,
-        produceFlag: true,
-        defectFlag: true,
-        toolFlag: true,
-        materialFlag: true,
-        downTimeFlag: true
-      },
       dataListLoading: false,
     }
   },
   components: {
-    comMaterialSettlement,/*开始生产时候报告调机的材料的使用数量*/
+    comEndTuning,/*开始生产时 调用结束调机的功能*/
   },
   methods: {
 
@@ -133,16 +122,37 @@ export default {
       this.$emit('update:visible', false);
     },
 
-    /*打开调机时候卷材料的耗用界面*/
-    materialSettlementModal(){
+    /*开始生产的方法*/
+    startProduceFun(){
+      //首先要检查是否可以开始生产
+      checkStartProduce(this.scheduleData).then(({data}) => {
+        //判断返回的结果 ---》异常
+        if(data.code == 500){
+          this.$message.error(data.msg);
+          //需要跳转到结束调机的功能
+        }else if (data.resultMap.resultCode == 201){
+          //需要跳到结束停机的页面
+          debugger;
+          this.comEndTuningModal();
+        }else{
+          //需要报告开始生产
+        }
+
+      });
+    },
+
+    /*打开结束调机的modal*/
+    comEndTuningModal(){
       //打开当前的页面
       this.$nextTick(() => {
         //打开modal
-        this.materialSettlementFlag = true;
-        this.$refs.comMaterialSettlement.init(this.scheduleData, this.operatorData);
+        this.endTuningFlag = true;
+        this.$refs.comEndTuning.init(this.scheduleData, this.operatorData);
       });
     },
 
+
+
   },
   created() {
     // this.factoryList()