问题处理

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

@@ -7,23 +7,36 @@ import lombok.Setter;
 /**
  * 出入库记录列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-03-20
  */
 @Getter
 @Setter
 public class StockJournalSelectDto extends BaseSelectDto {
 
-    /**记录类型 1为手动入库 2为手动出库*/
+    /**
+     * 记录类型 1为手动入库 2为手动出库
+     */
     private String type;
 
-    /**操作类型 1入库 2出库*/
+    /**
+     * 操作类型 1入库 2出库
+     */
     private String opType;
 
-    /**仓库id*/
+    /**
+     * 仓库id
+     */
     private String warehouseId;
 
-    /**商品id*/
+    /**
+     * 目标仓库id
+     */
+    private Long toWarehouseId;
+
+    /**
+     * 商品id
+     */
     private String productId;
 
 }

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

@@ -9,8 +9,8 @@ public enum JournalType {
     MANUAL_IN(InOutType.IN, 1, "手动入库", ""),
     MANUAL_OUT(InOutType.OUT, 2, "手动出库", ""),
     ADJUSTING_IN(InOutType.IN, 3, "调仓入库", ""),
-    STOCK_WAIT_IN(InOutType.IN, 4, "待入库入库", "stock_wait"),
-    STOCK_WAIT_OUT(InOutType.OUT, 5, "待出库出库", "stock_wait"),
+//    STOCK_WAIT_IN(InOutType.IN, 4, "待入库入库", "stock_wait"),
+//    STOCK_WAIT_OUT(InOutType.OUT, 5, "待出库出库", "stock_wait"),
     COMBINATION_IN(InOutType.IN, 6, "组合入库", "group_record_details"),
     COMBINATION_OUT(InOutType.OUT, 7, "组合出库", "group_record_details"),
     SPLIT_IN(InOutType.IN, 8, "组合拆分入库", "group_record_details"),

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockJournalDetailsVo.java

@@ -58,4 +58,16 @@ public class StockJournalDetailsVo extends StockJournalDetails {
      */
     private String opUserName;
 
+    /**
+     * 目标仓库id
+     */
+    private Long toWarehouseId;
+    /**
+     * 目标仓库名称
+     */
+    private String toWarehouseName;
+
+    /**仓库单号*/
+    private String code;
+
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockVo.java

@@ -7,17 +7,56 @@ import lombok.Setter;
 /**
  * 库存列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-03-20
  */
 @Getter
 @Setter
 public class StockVo extends Stock {
 
-    /**产品名称*/
+    /**
+     * 产品名称
+     */
     private String productName;
 
-    /**产品类型*/
+    /**
+     * 产品类型
+     */
     private Integer type;
 
+    /**
+     * 产品编码
+     */
+    private String productCode;
+
+    /**
+     * 产品类型
+     */
+    private Integer productType;
+
+    /**
+     * 规格型号
+     */
+    private String productSpec;
+
+    /**
+     * 单位
+     */
+    private String productUnit;
+
+    /**
+     * 产品分类id
+     */
+    private Long productClassifyId;
+
+    /**
+     * 产品分类名称
+     */
+    private String productClassifyName;
+
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+
 }

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

@@ -12,6 +12,7 @@ import com.fjhx.wms.service.stock.StockJournalDetailsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.wms.entity.stock.dto.StockJournalDetailsDto;
 import com.fjhx.wms.entity.stock.dto.StockJournalDetailsSelectDto;
+import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,6 +38,8 @@ import java.util.stream.Collectors;
 public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDetailsMapper, StockJournalDetails> implements StockJournalDetailsService {
     @Autowired
     ProductInfoService productInfoService;
+    @Autowired
+    WarehouseService warehouseService;
 
     @Override
     public Page<StockJournalDetailsVo> getPage(StockJournalSelectDto dto) {
@@ -45,6 +48,7 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
         wrapper.eq("sj.type",dto.getType());
         wrapper.like("w.name",dto.getKeyword());
         wrapper.eq("w.id",dto.getWarehouseId());
+        wrapper.eq("sj.to_warehouse_id",dto.getToWarehouseId());
         wrapper.eq("sjd.product_id",dto.getProductId());
         Page<StockJournalDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockJournalDetailsVo> records = page.getRecords();
@@ -58,6 +62,10 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
         });
         //赋值操作人名称
         UserUtil.assignmentNickName(records,StockJournalDetailsVo::getCreateUser,StockJournalDetailsVo::setOpUserName);
+        //赋值目标仓库名称
+        warehouseService.attributeAssign(records, StockJournalDetailsVo::getToWarehouseId, (item, warehouse) -> {
+            item.setToWarehouseName(warehouse.getName());
+        });
         return page;
     }
 

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

@@ -5,7 +5,9 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.item.entity.product.po.ProductClassify;
 import com.fjhx.item.entity.product.po.ProductInfo;
+import com.fjhx.item.service.product.ProductClassifyService;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.wms.entity.stock.bo.InOutBo;
 import com.fjhx.wms.entity.stock.dto.StockDto;
@@ -17,6 +19,7 @@ import com.fjhx.wms.entity.stock.po.Stock;
 import com.fjhx.wms.entity.stock.po.StockJournal;
 import com.fjhx.wms.entity.stock.po.StockJournalDetails;
 import com.fjhx.wms.entity.stock.vo.StockVo;
+import com.fjhx.wms.entity.stock.vo.StockWaitVo;
 import com.fjhx.wms.entity.warehouse.po.Warehouse;
 import com.fjhx.wms.mapper.stock.StockMapper;
 import com.fjhx.wms.service.stock.StockJournalDetailsService;
@@ -55,6 +58,8 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Autowired
     ProductInfoService productInfoService;
     @Autowired
+    ProductClassifyService productClassifyService;
+    @Autowired
     WarehouseService warehouseService;
 
     @Override
@@ -67,15 +72,23 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
 
         Page<StockVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockVo> stockVos = page.getRecords();
-        //获取产品id列表
-        List<Long> productIds = stockVos.stream().map(Stock::getProductId).collect(Collectors.toList());
-        if (ObjectUtil.isNotEmpty(productIds)) {
-            //赋值产品名称
-            productInfoService.attributeAssign(stockVos, StockVo::getProductId, (item, productInfo) -> {
-                item.setType(productInfo.getType());
-                item.setProductName(productInfo.getName());
-            });
-        }
+        //赋值产品信息
+        productInfoService.attributeAssign(stockVos, StockVo::getProductId, (item, productInfo) -> {
+            item.setProductCode(productInfo.getCode());
+            item.setProductUnit(productInfo.getUnit());
+            item.setProductType(productInfo.getType());
+            item.setProductName(productInfo.getName());
+            item.setProductSpec(productInfo.getSpec());
+            item.setProductClassifyId(productInfo.getProductClassifyId());
+        });
+        //赋值产品分类
+        productClassifyService.attributeAssign(stockVos, StockVo::getProductClassifyId, (item, productClassify) -> {
+            item.setProductClassifyName(productClassify.getName());
+        });
+        //赋值仓库名称
+        productClassifyService.attributeAssign(stockVos, StockVo::getWarehouseId, (item, warehouse) -> {
+            item.setWarehouseName(warehouse.getName());
+        });
         return page;
     }
 

hx-wms/src/main/resources/mapper/stock/StockJournalDetailsMapper.xml

@@ -6,7 +6,10 @@
             sjd.id,
             sj.op_type,
             sj.type,
+            sj.`code`,
+            sj.warehouse_id,
             w.`name` warehouseName,
+            sj.to_warehouse_id,
             sjd.product_id,
             sjd.quantity,
             sjd.create_time,