From ac62f122943ca4ff6971d37ed239c04646cc090f Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 15 Sep 2023 16:39:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97(=E7=99=BD?=
 =?UTF-8?q?=E5=9D=AF=E8=AE=A2=E5=8D=95=E5=88=A0=E9=99=A4BUG=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan/mapper/ProOrderWorkorderMapper.java  |  2 +-
 .../impl/ProWhiteOrderServiceImpl.java        | 19 +++++++++++++------
 .../mapper/plan/ProOrderWorkorderMapper.xml   |  5 +++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
index 12e8f004e..55524237a 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java
@@ -143,7 +143,7 @@ public interface ProOrderWorkorderMapper {
     String selectRouteNameByRouteCode(String routeCode);
 
     /**
-     * 通过订单id查询工单信息list(仅包含status、workorderId)
+     * 通过订单id查询工单信息list
      * @param orderId
      * @return
      */
diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWhiteOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWhiteOrderServiceImpl.java
index 5ccbee5e2..2bed9f870 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWhiteOrderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWhiteOrderServiceImpl.java
@@ -188,12 +188,12 @@ public class ProWhiteOrderServiceImpl implements IProWhiteOrderService {
     @Override
     @DS("#header.poolName")
     public AjaxResult deleteProOrderByIds(String[] ids) {
+        // 校验逻辑
         for (String id : ids) {
             // 通过母订单查询自定单list
             String[] orderIds = proOrderMapper.selectOrderIdByParentOrder(id);
             // 通过子订单id列表查询
             for (String orderId : orderIds) {
-
                 List<ProOrderWorkorder> proOrderWorkorderList = proOrderWorkorderMapper.selectProOrderWorkorderByOrderId(orderId);
                 if (proOrderWorkorderList.size() > 0) {
                     for (ProOrderWorkorder workOrder : proOrderWorkorderList) {
@@ -208,15 +208,22 @@ public class ProWhiteOrderServiceImpl implements IProWhiteOrderService {
                         }
                     }
                 }
-                // 删除逻辑
+            }
+        }
+
+        // 删除逻辑
+        for (String id : ids) {
+            String[] orderIds = proOrderMapper.selectOrderIdByParentOrder(id);
+            for (String orderId : orderIds) {
+                List<ProOrderWorkorder> proOrderWorkorderList = proOrderWorkorderMapper.selectProOrderWorkorderByOrderId(orderId);
                 if (proOrderWorkorderList.size() > 0) {
-                    for (ProOrderWorkorder workorder : proOrderWorkorderList) {
+                    for (ProOrderWorkorder workOrder : proOrderWorkorderList) {
                         // 删除批次信息
-                        proOrderWorkorderBatchMapper.deleteProOrderWorkorderBatchByWorkorderId(workorder.getWorkorderId());
+                        proOrderWorkorderBatchMapper.deleteProOrderWorkorderBatchByWorkorderId(workOrder.getWorkorderId());
                         // 删除湿料详情
-                        proWetMaterialPlanDetailMapper.deleteProWetMaterialPlanDetailByWorkId(workorder.getWorkorderId());
+                        proWetMaterialPlanDetailMapper.deleteProWetMaterialPlanDetailByWorkId(workOrder.getWorkorderId());
                         // 删除工单
-                        proOrderWorkorderMapper.deleteProOrderWorkorderByWorkorderId(workorder.getWorkorderId());
+                        proOrderWorkorderMapper.deleteProOrderWorkorderByWorkorderId(workOrder.getWorkorderId());
                     }
                 }
             }
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
index 2aae714d1..8341a066b 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
@@ -324,8 +324,9 @@
         select route_name from pro_route where route_code = #{routeCode}
     </select>
 
-    <select id="selectProOrderWorkorderByOrderId" resultType="com.op.plan.domain.ProOrderWorkorder">
-        select workorder_id,status from pro_order_workorder where order_id = #{orderId}
+    <select id="selectProOrderWorkorderByOrderId" parameterType="String" resultMap="ProOrderWorkorderResult">
+        <include refid="selectProOrderWorkorderVo"/>
+        where order_id = #{orderId}
     </select>
 
     <insert id="createPrepareDetails">