备料

sd-business/src/main/java/com/sd/business/service/production/impl/StockPreparationServiceImpl.java

@@ -380,7 +380,6 @@ public class StockPreparationServiceImpl implements StockPreparationService {
 
         IWrapper<StockPreparationVo> wrapper = IWrapper.getWrapper();
         wrapper.eq("oi", OrderInfo::getStatus, OrderStatusEnum.STOCK_PREPARATION.getKey());
-        wrapper.ge("oi", OrderInfo::getWlnStatus, 3);
         wrapper.eq("oi", OrderInfo::getExceptionType, OrderExceptionTypeEnum.NORMAL.getKey().toString());
         wrapper.eq("os", OrderSku::getStockPreparationStatus, StatusConstant.NO);
         wrapper.eq("oi", OrderInfo::getDepartmentId, dto.getDepartmentId());
@@ -388,11 +387,7 @@ public class StockPreparationServiceImpl implements StockPreparationService {
         wrapper.eq("bs", BomSpec::getName, dto.getBomSpecName());
         wrapper.eq("ss", SkuSpec::getCode, dto.getSkuSpecCode());
         wrapper.eq("ss", SkuSpec::getName, dto.getSkuSpecName());
-        wrapper.and(q -> q
-                .and(r -> r.eq("oi", OrderInfo::getWlnStorageCode, "T007").ge("oi", OrderInfo::getWlnStatus, 2))
-                .or(r -> r.ne("oi", OrderInfo::getWlnStorageCode, "T007").ge("oi", OrderInfo::getWlnStatus, 1))
-                .or(r -> r.eq("oi", OrderInfo::getSource, 1))
-        );
+        wrapper.and(q -> q.ge("oi", OrderInfo::getWlnStatus, 2).or().eq("oi", OrderInfo::getSource, 1));
 
         wrapper.and(q -> q
                 .and(r -> r.isNull("oi.flow_id").isNull("oi.flow_status"))