Merge remote-tracking branch 'origin/master'

src/api/yieldReport/com_produce_material.js

@@ -3,40 +3,5 @@ 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)
-
-
-
-
-
-
-
-
+//材料上机
+export const feedingMaterialRoll = data => createAPI('schedule/feedingMaterialRoll', 'POST', data)

src/api/yieldReport/com_produce_tool.js

@@ -3,8 +3,8 @@ 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 addToolInstanceId = data => createAPI('schedule/addToolInstanceId', 'POST', data)
 
 // 获取不良代码的信息
 export const reportDefectCode = data => createAPI('schedule/reportDefectCode', 'POST', data)

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)

src/views/modules/yieldReport/com_material_settlement.vue → src/views/modules/yieldReport/com_end_tuning.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="customer-css">
     <el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
-               width="925px" style="height: 415px;" class="customer-dialog">
+               width="900px" style="height: 415px;" class="customer-dialog">
       <el-form :inline="true" label-position="top" style="height: 265px;"
                label-width="80px">
         <!-- 菜单信息 -->
@@ -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() {

src/views/modules/yieldReport/com_produce_material.vue

@@ -33,7 +33,7 @@
           </el-form>
       </el-container>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="checkRmRollNo">确定</el-button>
+        <el-button type="primary" @click="feedingMaterialRollFun">确定</el-button>
         <el-button type="primary" @click="closeDialog">关闭</el-button>
       </span>
     </el-dialog>
@@ -43,6 +43,7 @@
 <script>
 import {
   getBomItemNosByPartNo,
+  feedingMaterialRoll,
 } from "@/api/yieldReport/com_produce_material.js";
 export default {
   data() {
@@ -82,12 +83,10 @@ export default {
         seqNo: '',
         orderNo: '',
         itemNo: 0,
-        workCenterNo: '',
         rollNo: '',
         rmRollNo: '',
         bomItemNo: '',
-        shiftNo: '',
-        nextItemNo: 0,
+        histSeqNo: -1,
         operatorId: '',
         closedFlag: 'N'
       },
@@ -118,11 +117,14 @@ export default {
       this.pageData.rollNo = scheduleData.rollNo;
       this.pageData.rmRollNo = '';
       this.pageData.bomItemNo = '';
-      this.pageData.closedFlag = 'N';
+      this.pageData.histSeqNo = -1;
+      this.pageData.operatorId = operatorData.operatorId;
       //自动获取焦点
       this.$nextTick(() => {
         this.$refs.rmRollNo.focus();
       });
+      //清空当前的时间数据
+      this.timeArray = [];
     },
 
     /*关闭modal*/
@@ -132,7 +134,12 @@ export default {
 
     /*记录每一次录入字符串的时间*/
     recordTime(){
-      this.timeArray.push(new Date().getTime());
+      //判断是否清掉所有的内容
+      if(this.pageData.rmRollNo.trim().length == 0){
+        this.timeArray = [];
+      }else{
+        this.timeArray.push(new Date().getTime());
+      }
     },
 
     /*检查材料卷号的数据*/
@@ -141,9 +148,9 @@ export default {
       let len = this.timeArray.length;
       let timeDiff = this.timeArray[len - 1] - this.timeArray[0];
       //判断时间是否在范围之内
-      /*if(timeDiff > 1000){
+      if(timeDiff > 1000){
         this.$message.error('请扫码输入!');
-      }*/
+      }
       //判断null和空字符串
       if (this.pageData.rmRollNo == null || this.pageData.rmRollNo == '') {
         this.$message.error('材料卷号不能为空!');
@@ -173,23 +180,35 @@ export default {
         }else{
           //启用下拉框
           this.selectFlag = false;
-          //this.bomList.unshift({'itemNo': '请选择'})
         }
       });
     },
 
     /*保存材料上机的记录*/
-    feedingMaterialRoll(){
+    feedingMaterialRollFun(){
       //判断卷号是否为空
       if (this.pageData.rmRollNo == null || this.pageData.rmRollNo == ''){
         this.$message.error('请扫描材料卷号!')
         return false;
       }
       //判断是否选中行号
-      if(this.pageData.bomItemNo == '请选择' || this.pageData.bomItemNo == ''){
+      if(this.pageData.bomItemNo == '请选择' || this.pageData.bomItemNo === ''){
         this.$message.error('请选择BOM行号!')
         return false;
       }
+      //调用方法执行上材料
+      feedingMaterialRoll(this.pageData).then(({data}) => {
+        debugger;
+        if(data.code == 500){
+          this.$message.error(data.msg);
+        }else{
+          //清空信息二次操作
+          this.pageData.rmRollNo = '';
+          this.pageData.bomItemNo = -1;
+          this.bomList = [];
+          this.timeArray = [];
+        }
+      });
 
     },
 

src/views/modules/yieldReport/com_produce_tool.vue

@@ -56,7 +56,7 @@
           </el-form>
       </el-container>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary">确 定</el-button>
+        <el-button type="primary" @click="addToolInstanceIdFun">确 定</el-button>
         <el-button type="primary" @click="closeDialog">关闭</el-button>
       </span>
     </el-dialog>
@@ -66,6 +66,7 @@
 <script>
 import {
   checkToolInstanceId,
+  addToolInstanceId,
 }
   from '@/api/yieldReport/com_produce_tool.js';
 export default {
@@ -140,15 +141,13 @@ export default {
       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();
       });
       //区分是否是切换切换的
+      this.pageData.toolInstanceId = '';
+      this.pageData.oriToolInstanceId = '';
       if(histSeqNo > 0){
         this.pageData.consumeQty = 0;
         this.pageData.oriConsumeQty = 0;
@@ -162,6 +161,8 @@ export default {
         this.readonlyFlag = true;
         this.replaceFlag = false;
       }
+      //重置校验的标记
+      this.pageData.checkFlag = false;
     },
 
     /*关闭modal*/
@@ -179,13 +180,43 @@ export default {
         //判断是否存在异常
         if(data.code == 500){
           this.$message.error(data.msg);
+        }else if (data.resultMap.resultCode == 201){
+          let msg = data.resultMap.resultMsg;
+          this.$confirm(msg, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: "warning"
+          }).then(() => {
+              this.pageData.checkFlag = true;
+          }).catch(() => {
+            this.pageData.checkFlag = false;
+          });
         }else{
           this.pageData.checkFlag = true;
         }
       });
     },
 
-
+    /*添加刀模记录*/
+    addToolInstanceIdFun(){
+      //判断是否校验通过
+      if(!this.pageData.checkFlag){
+        this.$message.error('校验失败,请重试!')
+        return false;
+      }
+      addToolInstanceId(this.pageData).then(({data}) => {
+        if(data.code == 500){
+          this.$message.error(data.msg);
+        }else{
+          //清空数据再次准备
+          this.pageData.toolInstanceId = '';
+          this.pageData.oriToolInstanceId = '';
+          this.pageData.consumeQty = '';
+          this.pageData.oriConsumeQty = '';
+          this.pageData.totalConsumeQty = '';
+        }
+      });
+    },
 
   },
   created() {

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()