待出库

hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockWaitDetailsSelectDto.java

@@ -7,11 +7,20 @@ import lombok.Setter;
 /**
  * 待出入库明细列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-13
  */
 @Getter
 @Setter
 public class StockWaitDetailsSelectDto extends BaseSelectDto {
 
+    /**
+     * 待出入库操作类型
+     */
+    private Integer type;
+    /**
+     * 待出入库业务类型
+     */
+    private Integer businessType;
+
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/emums/StockWaitType.java

@@ -11,6 +11,7 @@ public enum StockWaitType {
     COMPLETION_IN(InOutType.IN, 2, "完工入库", ""),
     PURCHASE_ARRIVAL_IN(InOutType.IN, 3, "采购到货", ""),
     BACK_OUT(InOutType.OUT, 4, "退货出库", ""),
+    JD_ORDER_OUT(InOutType.OUT, 5, "京东订单出库", "jd_order")
     ;
 
 

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitDetailsServiceImpl.java

@@ -1,6 +1,8 @@
 package com.fjhx.wms.service.stock.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.mapper.stock.StockWaitDetailsMapper;
 import com.fjhx.wms.service.stock.StockWaitDetailsService;
@@ -35,6 +37,11 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
     public Page<StockWaitDetailsVo> getPage(StockWaitDetailsSelectDto dto) {
         IWrapper<StockWaitDetails> wrapper = getWrapper();
         wrapper.orderByDesc("swd", StockWaitDetails::getId);
+        wrapper.eq("sw", StockWait::getType,dto.getType());
+        if(ObjectUtil.isNotEmpty(dto.getKeyword())){
+            wrapper.and(q->q.like(StockWaitDetails::getQuantity,dto.getKeyword()).or().like(StockWaitDetailsVo::getBusinessCode,dto.getKeyword()));
+        }
+        wrapper.eq("sw", StockWait::getBusinessType,dto.getBusinessType());
         Page<StockWaitDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockWaitDetailsVo> records = page.getRecords();
         // 赋值产品属性