一件排产

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderServiceImpl.java

@@ -800,8 +800,12 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
         // 判断计划是否在生产中，如果是在生产中不可删除
         isFalse(checkPlan(model) > 0, "订单已生产，不可删除");
 
+
+        //此时参数传来的是计划ID，进行中的订单显示的数据都是计划
+        List<PlanProduct>planProductList = planProductMapper.selectList(Wraps.<PlanProduct>lbQ().eq(PlanProduct::getPlanId,model.getId()));
+        List<Long>orderProductIdList = planProductList.stream().map(t->t.getOrderProductId()).collect(Collectors.toList());
         //原炉数量回收
-        List<OrderProduct>orderProductList = orderProductService.list(Wraps.<OrderProduct>lbQ().eq(OrderProduct::getOrderId,model.getId()));
+        List<OrderProduct>orderProductList = orderProductService.list(Wraps.<OrderProduct>lbQ().in(OrderProduct::getId,orderProductIdList));
         Map<Long,Integer>orderProductMap = orderProductList.stream().collect(groupingBy(OrderProduct::getMeterialReceiveId, Collectors.summingInt(OrderProduct::getBomNum)));