From 0c56b5e1e99222077c7bd90358ca81bbbe0e23ba Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Wed, 16 Feb 2022 09:43:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E4=B8=8B=E6=96=99=20?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yieldReport/com_cutting_material.js   |  4 ++
 .../yieldReport/com_cutting_material.vue      | 37 ++++++++++++-------
 2 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 src/api/yieldReport/com_cutting_material.js

diff --git a/src/api/yieldReport/com_cutting_material.js b/src/api/yieldReport/com_cutting_material.js
new file mode 100644
index 0000000..adcfa5b
--- /dev/null
+++ b/src/api/yieldReport/com_cutting_material.js
@@ -0,0 +1,4 @@
+import { createAPI } from '@/utils/httpRequest.js'
+
+// 材料下机操作
+export const processCuttingMaterialRoll = data => createAPI('schedule/processCuttingMaterialRoll', 'POST', data)
diff --git a/src/views/modules/yieldReport/com_cutting_material.vue b/src/views/modules/yieldReport/com_cutting_material.vue
index c756a09..513764d 100644
--- a/src/views/modules/yieldReport/com_cutting_material.vue
+++ b/src/views/modules/yieldReport/com_cutting_material.vue
@@ -35,7 +35,7 @@
           </el-form>
       </el-container>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="processCuttingMaterial">确定</el-button>
+        <el-button type="primary" @click="processCuttingMaterialBun">确定</el-button>
         <el-button type="primary" @click="closeDialog">关闭</el-button>
       </span>
     </el-dialog>
@@ -44,9 +44,8 @@
 
 <script>
 import {
-  getBomItemNosByPartNo,
-  feedingMaterialRoll,
-} from "@/api/yieldReport/com_produce_material.js";
+  processCuttingMaterialRoll,
+} from "@/api/yieldReport/com_cutting_material.js";
 export default {
   data() {
     return {
@@ -139,7 +138,7 @@ export default {
 
     /*检查材料卷号的数据*/
     checkValidQty() {
-      //首先判断时间是否超过100毫秒
+      //获取当前是的数量
       let transQty = this.pageData.transQty;
       //判断是否可以修改
       if (transQty > this.pageData.oriTransQty){
@@ -149,24 +148,34 @@ export default {
       //判断时间是否在范围之内
       if(transQty <= 0){
         this.$message.error('请输入有效的数量!');
+        return false;
       }
     },
 
     /*处理材料下料的记录*/
-    processCuttingMaterial(){
-      //判断卷号是否为空
-
+    processCuttingMaterialBun(){
+      //数量是否符合要求
+      let transQty = this.pageData.transQty;
+      //判断是否可以修改
+      if (transQty > this.pageData.oriTransQty){
+        this.$message.error('退料数量超过了该记录上的发料数量!');
+        return false;
+      }
+      //判断时间是否在范围之内
+      if(transQty <= 0){
+        this.$message.error('请输入有效的数量!');
+        return false;
+      }
       //调用方法执行上材料
-      feedingMaterialRoll(this.pageData).then(({data}) => {
+      processCuttingMaterialRoll(this.pageData).then(({data}) => {
         if(data.code == 500){
           this.$message.error(data.msg);
         }else{
           this.$message.info(data.msg);
-          //清空信息二次操作
-          this.pageData.rmRollNo = '';
-          this.pageData.bomItemNo = -1;
-          this.bomList = [];
-          this.timeArray = [];
+          //刷新报工的页面
+          this.$emit('refreshPageData');
+          //关闭当前的页面
+          this.closeDialog();
         }
       });