From 718990b50db463b50ecfa655f893262a5c3c4581 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 21 Mar 2024 16:41:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=95=8C=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4+=E8=AE=A1=E5=88=92=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/plan/order.js              |  8 ++++++
 src/views/mes/reportWork/index.vue |  4 ++-
 src/views/plan/order/index.vue     | 40 ++++++++++++++++++++++++++----
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/api/plan/order.js b/src/api/plan/order.js
index 1eaa7c7..b68103e 100644
--- a/src/api/plan/order.js
+++ b/src/api/plan/order.js
@@ -79,6 +79,14 @@ export function subSplitOrder(data) {
 	})
 }
 
+// 提交拆分
+export function checkRepeatBatchCodes(data) {
+	return request({
+		url: '/plan/order/checkRepeatBatchCodes',
+		method: 'post',
+		data: data
+	})
+}
 
 // 获取换算值
 export function getConvert() {
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index ab08593..2a0f588 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -525,6 +525,7 @@
 						:formatter="productCodeFormate"
 						/>
 						<el-table-column label="物料名称" width="280" align="left" prop="materialName" :show-overflow-tooltip="true" />
+						<el-table-column label="BOM组件用量" width="150" align="left" prop="planQuantity"/>
 						<el-table-column label="实际用量" width="150" align="left" prop="quantity" :show-overflow-tooltip="true" >
 							<template slot-scope="scope">
 								<el-input type="number" size="small" v-model="scope.row.quantity" @change="handleEdit(scope.$index,scope.row)"></el-input>
@@ -532,7 +533,7 @@
 						</el-table-column>
 						<el-table-column label="单位" width="50" align="center" prop="unit"/>
 						<el-table-column label="反冲标识" align="center" prop="recoil"/>
-						<el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
+						
 						<el-table-column label="仓库" width="150" align="center" prop="warehouseCode">
 							<template slot-scope="scope">
 								<el-select v-model="scope.row.warehouseCode" placeholder="请选择仓库" width="50%" 
@@ -548,6 +549,7 @@
 								</el-select>
 							</template>
 						</el-table-column>
+						<el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
 						<el-table-column fixed="right" label="操作" width="90">
 							<template slot-scope="scope">
 								<el-button @click.native.prevent="deleteBomRow(scope.$index, item.libList)"
diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index dadfca1..23f7e54 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -565,7 +565,7 @@ import {
   getProRoutes,getProSortNo,
   getProShifts,
   getWorkOrderList,
-  subSplitOrder,
+  subSplitOrder,checkRepeatBatchCodes,
   listOrder,
   addOrder,
   updateOrder,
@@ -635,6 +635,8 @@ export default {
       splitData: [],
       //选择产线list表
       proline: [],
+      // 非单个禁用
+      single: true,
       //
       splitnum: null,
       // 班次
@@ -940,7 +942,8 @@ export default {
         // 获取工艺信息
         getProRoutes(row.prodCode).then(response => {
           this.routes = response.data
-          this.splitForm.routeCode = response.data[0]
+          this.splitForm.routeCode = response.data[0].routeCode
+          this.changeRoute(this.splitForm.routeCode)
         })
 
         var ymd = moment(this.splitForm.productDate).format('YYYY-MM-DD')
@@ -1166,6 +1169,31 @@ export default {
     },
     // 拆分-拆分提交按钮操作
     batchBtn() {
+      this.loading = true;
+      let _this = this;
+      //批次号检验
+      var repeatBatchCodes = "";
+      checkRepeatBatchCodes({formFields: this.formFields}).then(response => {
+        if(response != ""){
+          this.$modal.confirm('出现重复使用的批次号'+response+'，是否继续进行拆分？').then(function () {
+            _this.batchBtnFunc();
+          }).then(() => {
+            _this.getList()
+            _this.loading = false;
+          }).catch(
+            function (e) {
+              if (e == 'cancel') {
+                  _this.loading = false;
+              } else if(e == 'close') {
+                  _this.loading = false;
+
+              }
+          })
+        }
+      });
+    },
+
+    batchBtnFunc(){
       this.loading = true;
       // 判断数据不能为空
       if (this.splitForm.splitNum == null) {
@@ -1268,8 +1296,10 @@ export default {
         if (response.code == 500) {
           this.$modal.msgError(response.msg)
           return
+        }else{
+            this.$modal.msgSuccess('提交成功')
         }
-        this.$modal.msgSuccess('提交成功')
+        
         this.queryParams.status = "o1"
         this.loading = false;
         this.getList()
@@ -1295,6 +1325,7 @@ export default {
 
       this.loading = false;
     },
+
     // 拆分-新增-取消按钮
     cancel() {
       this.dialogVisible = false;
@@ -1403,7 +1434,7 @@ export default {
     /**自动排产**/
     // 多选框选中数据
 		handleAutoSplitSelection(selection) {
-
+      this.single = selection.length !== 1
 			this.orderCodes = selection
 		},
     //排产优先级
@@ -1431,7 +1462,6 @@ export default {
       this.$modal.confirm('是否确认关闭订单"' + orderCodes + '"？').then(function () {
         return deleteOrder(orderIds);
       }).then(() => {
-        this.$modal.msgSuccess("关闭成功");
         this.loading = false;
         this.getList();
       }).catch(