From 3f838eba5b9a0305b939d193def3d8311273c291 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 5 Mar 2024 10:05:20 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=20=E7=94=9F=E4=BA=A7=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95:=E7=94=9F=E4=BA=A7=E6=B4=BE=E5=B7=A5=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MesProductOrderServiceImpl.java      |  4 +-
 .../views/mes/productplan/editProductPlan.vue | 42 +++++++++++++++----
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java
index b28946ef..6ffe75a3 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java
@@ -72,7 +72,9 @@ public class MesProductOrderServiceImpl implements IMesProductOrderService {
     @Override
     public int updateMesProductOrder(MesProductOrder mesProductOrder) {
         //销售订单修改工单：校验是否超出销售数量
-        if (mesProductOrder.getSaleOrderFlag().equals("1") && StringUtils.isNotNull(mesProductOrder.getSaleOrderId())) {
+        if (StringUtils.isNotEmpty(mesProductOrder.getSaleOrderFlag())
+                && mesProductOrder.getSaleOrderFlag().equals("1")
+                && StringUtils.isNotNull(mesProductOrder.getSaleOrderId())) {
             checkSalesQuantity(mesProductOrder);
         }
         mesProductOrder.setUpdateTime(DateUtils.getNowDate());
diff --git a/hw-ui/src/views/mes/productplan/editProductPlan.vue b/hw-ui/src/views/mes/productplan/editProductPlan.vue
index 5fc594a6..d039b50e 100644
--- a/hw-ui/src/views/mes/productplan/editProductPlan.vue
+++ b/hw-ui/src/views/mes/productplan/editProductPlan.vue
@@ -190,7 +190,7 @@
 </template>
 
 <script>
-import {getProductOrder} from "@//api/mes/productOrder";
+import {getProductOrder, updateProductOrder} from "@//api/mes/productOrder";
 import {
   delProductplan,
   getDispatchCode, getDispatchDrawingList,
@@ -354,6 +354,7 @@ export default {
         this.close();
       });
     },
+
     /** 删除按钮操作 */
     handleDeleteMesProductPlan() {
       let productPlan = this.checkedMesProductPlanList[0];
@@ -368,13 +369,40 @@ export default {
           });
         } else {
           //历史删除
-          const mesProductPlanDetailList = this.mesProductPlanList;
-          this.mesProductPlanList = mesProductPlanDetailList.filter(function (item) {
-            return productPlan.dispatchCode !== item.dispatchCode
-          });
+          const delList = this.mesProductPlanList;
+          let dispatchSum = 0;
+          try {
+            const planIds = delList.filter(function (item) {
+              return productPlan.dispatchCode === item.dispatchCode
+            }).map(item => {
+              if (item.planStatus !== '1') {
+                throw Error("只能删除未派工状态的生产派工单！");
+              }
+              if (item.processId === productPlan.processId) {
+                dispatchSum = dispatchSum + item.planAmount;
+              }
+              return item.planId;
+            });
+            dispatchSum = this.form.dispatchAmount - dispatchSum;
+            delProductplan(planIds).then(res =>{
+              // 更新生产工单
+              updateProductOrder({
+                productOrderId: this.form.productOrderId,
+                dispatchAmount: dispatchSum
+              })
+              getProductOrder(this.form.productOrderId).then(res => {
+                this.form = res.data;
+              });
+            });
+            const mesProductPlanDetailList = this.mesProductPlanList;
+            this.mesProductPlanList = mesProductPlanDetailList.filter(function (item) {
+              return productPlan.dispatchCode !== item.dispatchCode
+            });
+            this.$modal.msgSuccess("删除成功");
+          } catch (e) {
+            this.$modal.msgError(e);
+          }
         }
-        // delProductplan(planIds);
-        this.$modal.msgSuccess("删除成功");
       }).catch(() => {
       });
     },