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 72fc7853..0d7513d4 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 @@ -201,5 +201,7 @@ public interface ProOrderWorkorderMapper { List getUnSplitOrder(@Param("orderIds") String[] orderIds); ProOrderWorkorder selectSonOrder(String parentOrder); + + List getProductOrders(@Param("orderIds") String[] orderIds); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index 0b119c07..2f79d470 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -1123,11 +1123,13 @@ public class ProOrderServiceImpl implements IProOrderService { } //完全拆分已经存在工单可以进行订单关闭的数据 - List checkWorkOrders = proOrderWorkorderMapper.getWorkOrderByOrders(orderIds); - if(checkWorkOrders.size() != orderIds.length){ + List productWorkOrders = proOrderWorkorderMapper.getProductOrders(orderIds); + if(!CollectionUtils.isEmpty(productWorkOrders)){ return 2; } + List checkWorkOrders = proOrderWorkorderMapper.getWorkOrderByOrders(orderIds); + for(ProOrderWorkorder workorder:checkWorkOrders){ //要删除的工单id们 List delteIds = new ArrayList<>(); 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 18185476..ef438b38 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 @@ -571,6 +571,16 @@ where po.parent_order = #{parentOrder} and po.del_flag = '0' + insert into mes_prepare_detail