From a83ff6730f74c22413e656821504cd5214bed7e7 Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Wed, 26 Jan 2022 18:02:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=8D=B7=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yieldReport/com_finish_roll.js        |  7 +-
 .../yieldReport/com_exception_reason.vue      | 62 +++++++++++++
 .../modules/yieldReport/com_finish_roll.vue   | 87 +++++++++++++++----
 .../yieldReport/com_produce_material.vue      |  1 +
 4 files changed, 137 insertions(+), 20 deletions(-)
 create mode 100644 src/views/modules/yieldReport/com_exception_reason.vue

diff --git a/src/api/yieldReport/com_finish_roll.js b/src/api/yieldReport/com_finish_roll.js
index 1a1a3f1..107e72d 100644
--- a/src/api/yieldReport/com_finish_roll.js
+++ b/src/api/yieldReport/com_finish_roll.js
@@ -33,10 +33,11 @@ export const getSfdcDefectByCon = data => createAPI('schedule/getSfdcDefectByCon
 // 获取当前上机卷信息
 export const getSfdcRollByCon = data => createAPI('schedule/getSfdcRollByCon', 'POST', data)
 
-// 结束卷的操作
-export const finishRoll = data => createAPI('schedule/finishRoll', 'POST', data)
-
+// 结束卷的验证
+export const checkFinishRollWithNoFqc = data => createAPI('schedule/checkFinishRollWithNoFqc', 'POST', data)
 
+// 结束卷的操作
+export const finishRollWithNoFqc = data => createAPI('schedule/finishRollWithNoFqc', 'POST', data)
 
 
 
diff --git a/src/views/modules/yieldReport/com_exception_reason.vue b/src/views/modules/yieldReport/com_exception_reason.vue
new file mode 100644
index 0000000..ce706e9
--- /dev/null
+++ b/src/views/modules/yieldReport/com_exception_reason.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="customer-css">
+    <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
+               width="900px" style="height: 415px;" class="customer-dialog">
+      <el-form :inline="true" label-position="top" style="height: 265px;"
+               label-width="80px">
+        <!-- 菜单信息 -->
+        <el-row>
+          <el-col :span="3" >
+            <el-form-item :label="'异常原因:'">
+              <textarea rows="2"  cols="24"    placeholder="异常原因"></textarea>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "com_exception_reason",
+  data() {
+    return {
+      titleCon: '异常原因',
+      pageData: {
+        site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+        exceptionReason: ''
+      },
+    }
+  },
+  methods: {
+    /*初始化页面参数*/
+    init() {
+     //什么都不做
+    },
+
+    /*关闭modal*/
+    closeDialog(){
+      this.$emit('update:visible', false);
+    },
+
+
+
+
+
+
+  },
+  created() {
+    //
+  }
+}
+
+</script>
+
+<style scoped lang="scss">
+
+
+</style>
diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue
index 3f526a4..82d3a64 100644
--- a/src/views/modules/yieldReport/com_finish_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_roll.vue
@@ -24,7 +24,7 @@
               刷新</el-button>
             </el-form-item>
             <el-form-item class="customer-button">
-              <el-button type="primary" @click="finishRollOperation"  style="margin-left: 10px; margin-bottom: 5px;">
+              <el-button type="primary" @click="finishRollBun"  style="margin-left: 10px; margin-bottom: 5px;">
               结束卷</el-button>
             </el-form-item>
             <el-form-item class="customer-button">
@@ -41,7 +41,7 @@
               <el-checkbox disabled="disabled" style="margin-top: 15px;" true-label="Y" false-label="N"
                            v-model="pageData.reportedFlag">是否报告产量</el-checkbox>
             </el-form-item>
-            <el-form-item class="customer-item" label="良品总数量:" style="margin-top: -10px;">
+            <el-form-item class="customer-item" label="总良品数量:" style="margin-top: -10px;">
               <el-input v-model="pageData.approvedQty" type="number"  @blur="checkValidApprovedQty"
                         style="width: 80px;" ></el-input>
             </el-form-item>
@@ -123,6 +123,7 @@
             <!-- 产量报告 -->
             <fieldset class="customer-fieldset"
                       style="margin-left: 325px; margin-top: -165px; width: 575px;">
+
               <legend>产量报告</legend>
               <!-- 开工时间 -->
               <el-row>
@@ -213,10 +214,20 @@
 
 
     </el-dialog>
+
+    <!-- 异常原因录入的组件 -->
+    <comExceptionReason ref="comExceptionReason" :close-on-click-modal="false"
+                    :visible.sync="showExceptionFlag"
+                    @initExceptionReason = "initExceptionReason">
+
+    </comExceptionReason>
   </div>
+
 </template>
 
 <script>
+  /*添加组件*/
+  import comExceptionReason from "./com_exception_reason";//异常远远
 import {
   getCurrentRollReportedQty,
   countSfdcTimeQty,
@@ -225,13 +236,15 @@ import {
   getSfdcTimeData,
   getSfdcReportedData,
   getSfdcMaterialByRollNo,
-  finishRoll,
+  checkFinishRollWithNoFqc,
+  finishRollWithNoFqc
 } from '@/api/yieldReport/com_finish_roll.js';
 export default {
   name: "com_finish_roll",
   data() {
     return {
-      titleCon: '',
+      titleCon: '结束卷',
+      showExceptionFlag: false,
       sfdcTimeList: [],
       scheduleData: {
         site: this.$store.state.user.site,
@@ -272,6 +285,7 @@ export default {
         approvedQty: 0,
         defectedQty: 0,
         totalQty: 0,
+        editNewRollQty: 0,
         otherRollQty: '',
         shiftDesc: '',
         totalSetupTime: 0,
@@ -295,6 +309,8 @@ export default {
         sfdcDefectedQty: 0,
         sfdcReportedQty: 0,
         remark: '',
+        exceptionFlag: 'N',
+        exceptionReason: '',
       },
       operatorData: {
         site: this.$store.state.user.site,
@@ -486,6 +502,9 @@ export default {
       dataListLoading: false,
     }
   },
+  components: {
+    comExceptionReason,/*异常原因的组件*/
+  },
   methods: {
     /*初始化页面参数*/
     init(scheduleData, operatorData) {
@@ -499,6 +518,7 @@ export default {
       this.pageData.scheduledDate = scheduleData.scheduledDate;
       this.pageData.shiftNo = scheduleData.shiftNo;
       this.pageData.resourceId = scheduleData.resourceId;
+      this.pageData.operatorId = operatorData.operatorId;
       //重置时间
       this.pageData.reportedTime = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
       //初始化操作员对象
@@ -514,6 +534,17 @@ export default {
       this.$emit('update:visible', false);
     },
 
+    /*生产过程的停机组件*/
+    exceptionReasonModal() {
+      //1.首先调用菜单判断方式  打开生产过程的停机的页面
+      //checkProduceButton('produceDownFlag');
+      //打开生产过程的工具的页面
+      this.$nextTick(() => {
+        this.show = true;
+        this.$refs.comProduceDown.init(this.scheduleData, this.operatorData)
+      });
+    },
+
     /*刷新当前的页面参数*/
     refreshPageData(){
       //1.刷新当前卷的报工数据
@@ -542,7 +573,7 @@ export default {
           //制造时间=总制造时间
           this.pageData.sfdcManufactureTime = this.pageData.totalManufactureTime;
           //调机停机=总调机过程停机时间
-          this.pageData.sfdcDownTime = this.pageData.totalDowntimeTimeSetup;
+          this.pageData.sfdcSetupDownTime = this.pageData.totalDowntimeTimeSetup;
           //生产调机=总生产过程停机时间
           this.pageData.sfdcProdSetupTime = this.pageData.totalDowntimeTimeProd;
           //停机时间=总制造过程停机时间
@@ -551,7 +582,8 @@ export default {
       }).then(() => {
         //3.刷新派工单的班次信息
         getScheduleShiftData(this.scheduleData).then(({data}) => {
-          this.pageData.shiftDesc = data.row.shiftDesc;
+          this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
+          this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
         });
       }).then(() => {
         //4.刷新当前卷的最早和最晚时间
@@ -621,7 +653,8 @@ export default {
     //刷新派工单的班次信息
     refreshScheduleShiftData(){
       getScheduleShiftData(this.scheduleData).then(({data}) => {
-        this.pageData.shiftDesc = data.row.shiftDesc;
+        this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
+        this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
       });
     },
 
@@ -707,7 +740,7 @@ export default {
     },
 
     /*结束当前的操作*/
-    finishRollOperation(){
+    finishRollBun(){
       //首先判断数值是否通过判断
       let approvedQty = this.pageData.approvedQty;
       if(approvedQty == null || approvedQty == ''){
@@ -725,9 +758,29 @@ export default {
         this.$message.error('该时间段内没有匹配的班次信息,请联系相关人员！!');
         return false;
       }
+
       //验证通过提交到后台
       let postData = {'pageData': JSON.stringify(this.pageData), 'materialList': JSON.stringify(this.sfdcMaterialList)};
-      finishRoll(postData).then(({data}) => {
+
+      //先调用检查方法
+      checkFinishRollWithNoFqc(postData).then(({data}) => {
+        //判断是否成功
+        if(data.code == 500){
+          this.$message.error(data.msg);
+        }else if (data.resultMap.resultCode == '201'){
+          //打开异常原因录入的界面
+
+        }else{
+          //执行结束卷操作
+        }
+      });
+
+    },
+
+    /*结束卷的具体操作*/
+    finishRollOperation(){
+      //处理信息
+      finishRollWithNoFqc(postData).then(({data}) => {
         this.$message.error('qty_reported找不到!');
         //判断操作是否成功
         if(data.code == 500){
@@ -741,14 +794,14 @@ export default {
       })
     },
 
-
-
-
-
-
-
-
-
+    /*处理异常的原因*/
+    initExceptionReason(exceptionReason){
+      //处理异常的原因
+      this.pageData.exceptionFlag = 'Y';
+      this.pageData.exceptionReason =  exceptionReason;
+      //然后提交结束卷的数据
+      this.finishRollOperation();
+    }
   },
   created() {
     // this.factoryList()
diff --git a/src/views/modules/yieldReport/com_produce_material.vue b/src/views/modules/yieldReport/com_produce_material.vue
index a1dd36a..65c2c79 100644
--- a/src/views/modules/yieldReport/com_produce_material.vue
+++ b/src/views/modules/yieldReport/com_produce_material.vue
@@ -202,6 +202,7 @@ export default {
         if(data.code == 500){
           this.$message.error(data.msg);
         }else{
+          this.$message.info(data.msg);
           //清空信息二次操作
           this.pageData.rmRollNo = '';
           this.pageData.bomItemNo = -1;