bug修复2

op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java

@@ -201,5 +201,7 @@ public interface ProOrderWorkorderMapper {
     List<ProOrderWorkorder> getUnSplitOrder(@Param("orderIds") String[] orderIds);
 
     ProOrderWorkorder selectSonOrder(String parentOrder);
+
+    List<ProOrderWorkorder> getProductOrders(@Param("orderIds") String[] orderIds);
 }
 

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java

@@ -1123,11 +1123,13 @@ public class ProOrderServiceImpl implements IProOrderService {
         }
 
         //完全拆分已经存在工单可以进行订单关闭的数据
-        List<ProOrderWorkorder> checkWorkOrders = proOrderWorkorderMapper.getWorkOrderByOrders(orderIds);
+        List<ProOrderWorkorder> productWorkOrders = proOrderWorkorderMapper.getProductOrders(orderIds);
-        if(checkWorkOrders.size() != orderIds.length){
+        if(!CollectionUtils.isEmpty(productWorkOrders)){
             return 2;
         }
 
+        List<ProOrderWorkorder> checkWorkOrders = proOrderWorkorderMapper.getWorkOrderByOrders(orderIds);
+
         for(ProOrderWorkorder workorder:checkWorkOrders){
             //要删除的工单id们
             List<String> delteIds = new ArrayList<>();

op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml

@@ -571,6 +571,16 @@
         where po.parent_order = #{parentOrder}
           and po.del_flag = '0'
     </select>
+    <select id="getProductOrders" resultType="com.op.plan.domain.ProOrderWorkorder">
+        select workorder_code workorderCode,status
+        from pro_order_workorder
+        where order_id in
+        <foreach item="orderId" collection="orderIds" open="(" separator="," close=")">
+            #{orderId}
+        </foreach>
+        and del_flag = '0'
+        and status in('w2','w3')
+    </select>
 
     <insert id="createPrepareDetails">
         insert into mes_prepare_detail