计划模块(白坯订单删除BUG解决)

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
      */

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

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 id="selectProOrderWorkorderByOrderId" parameterType="String" resultMap="ProOrderWorkorderResult">
-        select workorder_id,status from pro_order_workorder where order_id = #{orderId}
+        <include refid="selectProOrderWorkorderVo"/>
+        where order_id = #{orderId}
     </select>
 
     <insert id="createPrepareDetails">