bug修改

sd-business/src/main/java/com/sd/business/controller/order/OrderController.java

@@ -1,6 +1,7 @@
 package com.sd.business.controller.order;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.flow.enums.FlowStatusEnum;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.sd.business.entity.order.dto.OrderInfoDto;
 import com.sd.business.entity.order.dto.OrderSelectDto;
@@ -52,6 +53,7 @@ public class OrderController {
      */
     @PostMapping("/add")
     public void add(@Validated @RequestBody OrderInfoDto orderDto) {
+        orderDto.setFlowStatus(FlowStatusEnum.READY_START.getKey());
         orderService.add(orderDto);
     }
 

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

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.sd.business.entity.order.dto.OrderInfoDto;
+import com.sd.business.entity.order.enums.OrderStatusEnum;
 import com.sd.business.entity.order.po.OrderInfo;
 import com.sd.business.service.order.OrderService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,7 +50,8 @@ public class OrderFlow extends FlowDelegate {
 
         orderService.update(q -> q
                 .eq(BaseIdPo::getId, businessId)
-                .set(OrderInfo::getFlowStatus, (FlowStatusEnum.PASS.getKey()))
+                .set(OrderInfo::getFlowStatus, FlowStatusEnum.PASS.getKey())
+                .set(OrderInfo::getStatus, OrderStatusEnum.STOCK_PREPARATION.getKey())
                 .set(BasePo::getUpdateTime, new Date())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
         );

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

@@ -6,6 +6,7 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.sd.business.entity.bom.po.BomSpec;
 import com.sd.business.entity.department.po.Department;
 import com.sd.business.entity.order.dto.OrderSkuSelectDto;
+import com.sd.business.entity.order.enums.OrderExceptionTypeEnum;
 import com.sd.business.entity.order.po.OrderInfo;
 import com.sd.business.entity.order.po.OrderSku;
 import com.sd.business.entity.order.vo.OrderSkuVo;
@@ -41,7 +42,12 @@ public class OrderSkuServiceImpl extends ServiceImpl<OrderSkuMapper, OrderSku> i
         wrapper.eq("oi", OrderInfo::getDepartmentId, dto.getDepartmentId());
         wrapper.ge("oi", OrderInfo::getWlnCreateTime, dto.getBeginTime());
         wrapper.le("oi", OrderInfo::getWlnCreateTime, dto.getEndTime());
-        // wrapper.eq("oi", OrderInfo::getExceptionType, OrderExceptionTypeEnum.NORMAL.getKey().toString());
+        wrapper.eq("oi", OrderInfo::getExceptionType, OrderExceptionTypeEnum.NORMAL.getKey().toString());
+        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))
+        );
 
         return this.baseMapper.getPage(dto.getPage(), wrapper);
     }

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -96,11 +96,6 @@ public class WlnOrderServiceImpl implements WlnOrderService {
                     continue;
                 }
 
-                Integer processStatus = wlnOrder.getInteger("process_status");
-                if (processStatus < 1) {
-                    continue;
-                }
-
                 // 数据库中是否存在订单
                 OrderInfo orderInfo = existOrderMap.get(wlnOrder.getString("uid"));