订单

sd-business/src/main/java/com/sd/business/flow/OrderFlow.java

@@ -69,22 +69,17 @@ public class OrderFlow extends FlowDelegate {
         OrderInfoDto dto = submitData.toJavaObject(OrderInfoDto.class);
         orderInfoService.edit(dto);
 
-        // 查询委外订单是否存在包材
-        Boolean isExist = orderInfoService.isExistOrderSkuBom(businessId);
-
         orderInfoService.update(q -> q
                 .eq(BaseIdPo::getId, businessId)
                 .set(OrderInfo::getFlowStatus, FlowStatusEnum.PASS.getKey())
                 // 委外订单不存在包材则直接修改为生产中
-                .set(OrderInfo::getStatus, !isExist ? OrderStatusEnum.IN_PRODUCTION.getKey() : OrderStatusEnum.STOCK_PREPARATION.getKey())
+                .set(OrderInfo::getStatus, OrderStatusEnum.IN_PRODUCTION.getKey())
                 .set(BasePo::getUpdateTime, new Date())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
         );
 
-        if (!isExist) {
-            // 生成生产任务和工单
-            productionWorkOrderService.addByOrderId(businessId);
-        }
+        // 生成生产任务和工单
+        productionWorkOrderService.addByOrderId(businessId);
 
         orderFlowExampleService.update(q -> q.eq(OrderFlowExample::getOrderId, businessId)
                 .eq(OrderFlowExample::getFlowId, flowId)

sd-business/src/main/java/com/sd/business/service/order/OrderInfoService.java

@@ -58,9 +58,4 @@ public interface OrderInfoService extends BaseService<OrderInfo> {
      */
     void confirmation(OrderInfoDto dto);
 
-    /**
-     * 订单是否存在包材
-     */
-    Boolean isExistOrderSkuBom(Long orderId);
-
 }

sd-business/src/main/java/com/sd/business/service/order/impl/OrderInfoServiceImpl.java

@@ -718,23 +718,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         sendMq(dto);
     }
 
-    @Override
-    public Boolean isExistOrderSkuBom(Long orderId) {
-        OrderInfo orderInfo = this.getById(orderId);
-        if (!ObjectUtil.equals(orderInfo.getType(), 2)) {
-            return true;
-        }
-        boolean flag = false;
-        List<OrderSku> list = orderSkuService.list(q -> q.eq(OrderSku::getOrderId, orderInfo.getId()));
-        for (OrderSku orderSku : list) {
-            long count = orderSkuBomService.count(q -> q.eq(OrderSkuBom::getOrderSkuId, orderSku.getId()));
-            if (count != 0) {
-                flag = true;
-            }
-        }
-        return flag;
-    }
-
     /**
      * 解锁库存
      */