huanglizhi 1 жил өмнө
parent
commit
9c900c669a
18 өөрчлөгдсөн 46 нэмэгдсэн , 7 устгасан
  1. 1 2
      module-erp/src/main/java/com/hys/app/model/erp/dos/OrderItemDO.java
  2. 1 1
      module-erp/src/main/java/com/hys/app/model/erp/dos/OrderSendItemDO.java
  3. 3 0
      module-erp/src/main/java/com/hys/app/model/erp/dos/WarehouseEntryProductDO.java
  4. 1 0
      module-erp/src/main/java/com/hys/app/model/erp/dto/OrderDTO.java
  5. 3 1
      module-erp/src/main/java/com/hys/app/model/erp/dto/OrderItemDTO.java
  6. 4 0
      module-erp/src/main/java/com/hys/app/model/erp/dto/StockDamageReportProductDTO.java
  7. 3 0
      module-erp/src/main/java/com/hys/app/model/erp/dto/StockInventoryProductDTO.java
  8. 3 0
      module-erp/src/main/java/com/hys/app/model/erp/dto/WarehouseOutProductDTO.java
  9. 0 2
      module-erp/src/main/java/com/hys/app/model/erp/vo/ProductStockVO.java
  10. 4 0
      module-erp/src/main/java/com/hys/app/model/erp/vo/StockTransferProductVO.java
  11. 5 0
      module-erp/src/main/java/com/hys/app/service/erp/impl/OrderManagerImpl.java
  12. 3 0
      module-erp/src/main/java/com/hys/app/service/erp/impl/ScanCodeManagerImpl.java
  13. 3 0
      module-erp/src/main/java/com/hys/app/service/erp/impl/StockDamageReportManagerImpl.java
  14. 3 0
      module-erp/src/main/java/com/hys/app/service/erp/impl/StockInventoryManagerImpl.java
  15. 1 0
      module-erp/src/main/java/com/hys/app/service/erp/impl/StockTransferManagerImpl.java
  16. 1 1
      module-erp/src/main/java/com/hys/app/service/erp/impl/WarehouseAreaManagerImpl.java
  17. 3 0
      module-erp/src/main/java/com/hys/app/service/erp/impl/WarehouseEntryManagerImpl.java
  18. 4 0
      module-erp/src/main/java/com/hys/app/service/erp/impl/WarehouseOutManagerImpl.java

+ 1 - 2
module-erp/src/main/java/com/hys/app/model/erp/dos/OrderItemDO.java

@@ -128,7 +128,6 @@ public class OrderItemDO implements Serializable {
 
     private Integer  dayNum;
 
-    @TableField(typeHandler = FastjsonTypeHandler.class)
-    private List<AreaStock> areaStockList;
+    private String areaStock;
 
 }

+ 1 - 1
module-erp/src/main/java/com/hys/app/model/erp/dos/OrderSendItemDO.java

@@ -69,7 +69,7 @@ public class OrderSendItemDO implements Serializable {
     @ApiModelProperty(name = "remark", value = "备注")
     private String remark;
 
-    @TableField(typeHandler = FastjsonTypeHandler.class)
+    @TableField(exist = false)
     private List<AreaStock> areaStockList;
 
 }

+ 3 - 0
module-erp/src/main/java/com/hys/app/model/erp/dos/WarehouseEntryProductDO.java

@@ -121,4 +121,7 @@ public class WarehouseEntryProductDO implements Serializable {
 
     @ApiModelProperty(name = "order_num", value = "订单原数量")
     private Long orderNum;
+
+    @TableField(exist = false)
+    private List<AreaStock> areaStockList;
 }

+ 1 - 0
module-erp/src/main/java/com/hys/app/model/erp/dto/OrderDTO.java

@@ -129,5 +129,6 @@ public class OrderDTO {
     private Long  saleChannelId;
 
 
+
 }
 

+ 3 - 1
module-erp/src/main/java/com/hys/app/model/erp/dto/OrderItemDTO.java

@@ -62,7 +62,9 @@ public class OrderItemDTO {
 
     private Integer dayNum;
 
-    List<AreaStock> areaStockList;
+    private String areaStock;;
+
+    private List<AreaStock> areaStockList;
 
 }
 

+ 4 - 0
module-erp/src/main/java/com/hys/app/model/erp/dto/StockDamageReportProductDTO.java

@@ -1,5 +1,6 @@
 package com.hys.app.model.erp.dto;
 
+import com.hys.app.model.erp.dos.AreaStock;
 import com.hys.app.model.erp.dos.GoodsSnDO;
 import com.hys.app.model.erp.vo.GoodsVO;
 import com.hys.app.model.erp.vo.ProductVO;
@@ -44,6 +45,9 @@ public class StockDamageReportProductDTO implements Serializable {
     @ApiModelProperty(name = "scan_iff_num", value = "差异数量,扫码订单打出来的数据必传")
     List<GoodsSnDO> snCodeList;
 
+    private List<AreaStock> areaStockList;
+
+
 
 
 }

+ 3 - 0
module-erp/src/main/java/com/hys/app/model/erp/dto/StockInventoryProductDTO.java

@@ -1,6 +1,7 @@
 package com.hys.app.model.erp.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.hys.app.model.erp.dos.AreaStock;
 import com.hys.app.model.erp.dos.GoodsSnDO;
 import com.hys.app.model.erp.vo.GoodsVO;
 import com.hys.app.model.erp.vo.ProductVO;
@@ -62,4 +63,6 @@ public class StockInventoryProductDTO implements Serializable {
 
     @ApiModelProperty(name = "product_stock_id", value = "product_stock_id不能为空")
     private Long productStockId;
+
+    private List<AreaStock> areaStockList;
 }

+ 3 - 0
module-erp/src/main/java/com/hys/app/model/erp/dto/WarehouseOutProductDTO.java

@@ -1,5 +1,6 @@
 package com.hys.app.model.erp.dto;
 
+import com.hys.app.model.erp.dos.AreaStock;
 import com.hys.app.model.erp.dos.GoodsDO;
 import com.hys.app.model.erp.dos.GoodsSnDO;
 import com.hys.app.model.erp.enums.ScanFormCodeTypeEnum;
@@ -76,6 +77,8 @@ public class WarehouseOutProductDTO {
     @ApiModelProperty(name = "product_stock_id", value = "商品库存id")
     private Long productStockId;
 
+    private  List<AreaStock> areaStockList;
+
 
 }
 

+ 0 - 2
module-erp/src/main/java/com/hys/app/model/erp/vo/ProductStockVO.java

@@ -39,7 +39,5 @@ public class ProductStockVO extends ProductStockDO {
 
     @ApiModelProperty(name = "scan_order_item_id", value = "商品信息")
     private Long scanOrderItemId;
-
-
 }
 

+ 4 - 0
module-erp/src/main/java/com/hys/app/model/erp/vo/StockTransferProductVO.java

@@ -1,5 +1,6 @@
 package com.hys.app.model.erp.vo;
 
+import com.hys.app.model.erp.dos.AreaStock;
 import com.hys.app.model.erp.dos.StockTransferProductDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,6 +9,7 @@ import lombok.ToString;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * 调拨单商品明细VO
@@ -32,5 +34,7 @@ public class StockTransferProductVO {
 
     private ProductVO productVO;
 
+    private List<AreaStock> areaStockList;
+
 }
 

+ 5 - 0
module-erp/src/main/java/com/hys/app/service/erp/impl/OrderManagerImpl.java

@@ -65,6 +65,7 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
     private LockedStockDetailManager lockedStockDetailManager;
     private OrderCustomerFeeManager orderCustomerFeeManager;
     private RedisTemplate redisTemplate;
+    private AreaStockManager areaStockManager;
 
     @Override
     public WebPage<OrderVO> list(OrderQueryParams queryParams) {
@@ -146,6 +147,8 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
             GoodsVO goodsVO = BeanUtil.copyProperties(goodsMapper.selectById(productVO.getGoodsId()), GoodsVO.class);
             dto.setGoodsVO(goodsVO);
             dto.setUsableStock(productStockManager.getById(dto.getProductStockId()).getUsableStock());
+            List<AreaStock> areaStockList = areaStockManager.list(new LambdaQueryWrapper<AreaStock>().eq(AreaStock::getProductStockId, dto.getProductStockId()));
+            dto.setAreaStockList(areaStockList);
         }
         //核销费用
         List<OrderCustomerFee> orderCustomerFees = orderCustomerFeeManager.list(new LambdaQueryWrapper<OrderCustomerFee>().eq(OrderCustomerFee::getOrderId, id));
@@ -472,6 +475,8 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
                 List<Long> collected = list2.stream().map(ItemSnCodeDO::getSnCodeId).collect(Collectors.toList());
                 itemDO.setSnCodeList(goodsSnManager.list(new LambdaQueryWrapper<GoodsSnDO>().in(GoodsSnDO::getId, collected)));
             }
+            List<AreaStock> areaStockList = areaStockManager.list(new LambdaQueryWrapper<AreaStock>().eq(AreaStock::getProductStockId, itemDO.getProductStockId()));
+            itemDO.setAreaStockList(areaStockList);
         }
         byId.setOrderVo(aDo);
         byId.setOrderItemVOS(bean);

+ 3 - 0
module-erp/src/main/java/com/hys/app/service/erp/impl/ScanCodeManagerImpl.java

@@ -55,6 +55,7 @@ public class ScanCodeManagerImpl extends BaseServiceImpl<ProductStockMapper, Pro
     private GoodsManager goodsManager;
     private ProductManager productManager;
     private GoodsSnManager goodsSnManager;
+    private AreaStockManager areaStockManager;
 
 
     @Override
@@ -206,6 +207,8 @@ public class ScanCodeManagerImpl extends BaseServiceImpl<ProductStockMapper, Pro
         ProductStockVO productStockVO = BeanUtil.copyProperties(stockDO, ProductStockVO.class);
         productStockVO.setProductVO(BeanUtil.copyProperties(productDO, ProductVO.class));
         productStockVO.setGoodsVO(BeanUtil.copyProperties(goodsManager.getById(stockDO.getGoodsId()), GoodsVO.class));
+        List<AreaStock> areaStockList = areaStockManager.list(new LambdaQueryWrapper<AreaStock>().eq(AreaStock::getProductStockId, productStockVO.getId()));
+        productStockVO.setAreaStockList(areaStockList);
         return productStockVO;
     }
 

+ 3 - 0
module-erp/src/main/java/com/hys/app/service/erp/impl/StockDamageReportManagerImpl.java

@@ -65,6 +65,7 @@ public class StockDamageReportManagerImpl extends ServiceImpl<StockDamageReportM
     private ItemSnCodeManager itemSnCodeManager;
     private GoodsSnManager goodsSnManager;
     private RedisTemplate redisTemplate;
+    private AreaStockManager areaStockManager;
 
     /**
      * 查询库存报损单分页列表数据
@@ -133,6 +134,8 @@ public class StockDamageReportManagerImpl extends ServiceImpl<StockDamageReportM
             dto.setGoodsVO(goodsVO);
             dto.setUsableStock(aDo.getUsableStock());
             dto.setProductVO(BeanUtil.copyProperties(productManager.getById(aDo.getProductId()), ProductVO.class));
+            List<AreaStock> areaStockList = areaStockManager.list(new LambdaQueryWrapper<AreaStock>().eq(AreaStock::getProductStockId, dto.getProductStockId()));
+            dto.setAreaStockList(areaStockList);
         }
         reportVO.setProductList(beanList);
         return reportVO;

+ 3 - 0
module-erp/src/main/java/com/hys/app/service/erp/impl/StockInventoryManagerImpl.java

@@ -58,6 +58,7 @@ public class StockInventoryManagerImpl extends ServiceImpl<StockInventoryMapper,
     private ItemSnCodeManager itemSnCodeManager;
     private GoodsSnManager goodsSnManager;
     private RedisTemplate redisTemplate;
+    private AreaStockManager areaStockManager;
 
 
     /**
@@ -240,6 +241,8 @@ public class StockInventoryManagerImpl extends ServiceImpl<StockInventoryMapper,
                 List<Long> collected = list2.stream().map(ItemSnCodeDO::getSnCodeId).collect(Collectors.toList());
                 dto.setSnCodeList(goodsSnManager.list(new LambdaQueryWrapper<GoodsSnDO>().in(GoodsSnDO::getId, collected)));
             }
+            List<AreaStock> areaStockList = areaStockManager.list(new LambdaQueryWrapper<AreaStock>().eq(AreaStock::getProductStockId, dto.getProductStockId()));
+            dto.setAreaStockList(areaStockList);
             dto.setGoodsVO(goodsVO);
         }
         stockInventoryVO.setProductList(beanList);

+ 1 - 0
module-erp/src/main/java/com/hys/app/service/erp/impl/StockTransferManagerImpl.java

@@ -65,6 +65,7 @@ public class StockTransferManagerImpl extends BaseServiceImpl<StockTransferMappe
     private WarehouseEntryManager warehouseEntryManager;
     private WarehouseEntryProductManager warehouseEntryProductManager;
     private LockedStockDetailManager lockedStockDetailManager;
+    private AreaStockManager areaStockManager;
 
     @Override
     public WebPage<StockTransferVO> list(StockTransferQueryParams queryParams) {

+ 1 - 1
module-erp/src/main/java/com/hys/app/service/erp/impl/WarehouseAreaManagerImpl.java

@@ -120,7 +120,7 @@ public class WarehouseAreaManagerImpl extends BaseServiceImpl<WarehouseAreaMappe
         for (Long aLong : stockIdList) {
             AreaStock stock = new AreaStock();
             stock.setProductStockId(aLong);
-            stock.setWarehouseAreaName(areaDO.getName());
+            stock.setWarehouseAreaName(areaDO.getCode());
             stock.setWarehouseId(warehouseId);
             stock.setWarehouseAreaId(warehouseAreaId);
             list.add(stock);

+ 3 - 0
module-erp/src/main/java/com/hys/app/service/erp/impl/WarehouseEntryManagerImpl.java

@@ -88,6 +88,7 @@ public class WarehouseEntryManagerImpl extends BaseServiceImpl<WarehouseEntryMap
     private StockTransferMapper stockTransferMapper;
     private OrderItemManager orderItemManager;
     private RedisTemplate redisTemplate;
+    private AreaStockManager areaStockManager;
 
 
     @Override
@@ -283,6 +284,8 @@ public class WarehouseEntryManagerImpl extends BaseServiceImpl<WarehouseEntryMap
                 productDO.setSnCodeList(goodsSnManager.list(new LambdaQueryWrapper<GoodsSnDO>().in(GoodsSnDO::getId, collected)));
             }
             productDO.setUsableStock(stockDOList.stream().filter(item -> item.getProductId().equals(productDO.getProductId())).findFirst().get().getUsableStock());
+            List<AreaStock> areaStockList = areaStockManager.list(new LambdaQueryWrapper<AreaStock>().eq(AreaStock::getProductStockId, productDO.getProductStockId()));
+            productDO.setAreaStockList(areaStockList);
         }
         warehouseEntryVO.setProductList(itemConverter.convert(productList));
         return warehouseEntryVO;

+ 4 - 0
module-erp/src/main/java/com/hys/app/service/erp/impl/WarehouseOutManagerImpl.java

@@ -264,6 +264,8 @@ public class WarehouseOutManagerImpl extends BaseServiceImpl<WarehouseOutMapper,
             dto.setUsableStock(stockDOList.stream().filter(item -> item.getProductId().equals(dto.getProductId())).findFirst().get().getUsableStock());
             dto.setActualStock(stockDOList.stream().filter(item -> item.getProductId().equals(dto.getProductId())).findFirst().get().getActualStock());
             dto.setGoodsVO(BeanUtil.copyProperties(goodsDO, GoodsVO.class));
+            List<AreaStock> areaStockList = areaStockManager.list(new LambdaQueryWrapper<AreaStock>().eq(AreaStock::getProductStockId, dto.getProductStockId()));
+            dto.setAreaStockList(areaStockList);
         }
         outVO.setProductList(productList);
         return outVO;
@@ -484,6 +486,8 @@ public class WarehouseOutManagerImpl extends BaseServiceImpl<WarehouseOutMapper,
             record.setGoodsVO(BeanUtil.copyProperties(goodsMapper.selectById(record.getGoodsId()), GoodsVO.class));
             record.setProductVO(BeanUtil.copyProperties(productManager.getById(record.getProductId()), ProductVO.class));
             record.setWarehouseVO(warehouseManager.getById(record.getWarehouseId()));
+            List<AreaStock> areaStockList = areaStockManager.list(new LambdaQueryWrapper<AreaStock>().eq(AreaStock::getProductStockId, record.getId()));
+            record.setAreaStockList(areaStockList);
         }
         return convert;
     }