上架添加单位体积等;库存添加单位体积

mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java

@@ -21,6 +21,7 @@ import com.mhd.system.api.domain.cache.SystemServiceCacheUtil;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.wms.domain.materialBaseInfo.entity.MaterialBaseInfo;
 import com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper;
+import com.mhd.wms.domain.materialBaseInfo.repository.po.MaterialBaseInfoPO;
 import com.mhd.wms.domain.materialGoodsRule.repository.facade.IMaterialGoodsRuleService;
 import com.mhd.wms.domain.materialGoodsRule.repository.po.BatchDetailPO;
 import com.mhd.wms.domain.materialGoodsRule.repository.po.BatchPO;
@@ -277,6 +278,7 @@ public class StockShelfOrderApplicationService {
             Long shipperId = stockReceiptOrderDO.getShipperId();
             MaterialInventory param = getParam(shelfMaterialDetailDO, fieldNames, shipperId);
             List<MaterialInventoryPO> materialInventoryPOS = materialInventoryMapper.selectListByWhere(param);
+            MaterialBaseInfo materialBaseInfo = materialBaseInfoMapper.selectById(materialBaseInfoId);
             if (materialInventoryPOS.size() == 0) {
                 MaterialInventory materialInventory = new MaterialInventory();
                 //仓库信息
@@ -321,6 +323,13 @@ public class StockShelfOrderApplicationService {
                 materialInventory.setAllocationQuantity(shelfMaterialDetailDO.getShelvesQuantity());
                 materialInventory.setFreezeQuantity(BigDecimal.ZERO);
 
+                //体积 重量等
+                materialInventory.setVolume(shelfMaterialDetailDO.getTotalVolume());
+                materialInventory.setArea(shelfMaterialDetailDO.getTotalArea());
+                materialInventory.setGrossWeight(shelfMaterialDetailDO.getTotalGrossWeight());
+                materialInventory.setNetWeight(shelfMaterialDetailDO.getTotalNetWeight());
+                materialInventory.setUnit(materialBaseInfo.getUnitCode());
+
                 materialInventoryMapper.insert(materialInventory);
             } else if (materialInventoryPOS.size() == 1) {
                 MaterialInventory materialInventory = new MaterialInventory();

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/entity/MaterialInventory.java

@@ -149,6 +149,10 @@ public class MaterialInventory extends BaseVOEntity {
     @Excel(name = "单位")
     private String unit;
 
+    @ApiModelProperty("单位名称")
+    @Excel(name = "单位名称")
+    private String unitName;
+
     @ApiModelProperty("净重(KG)")
     @Excel(name = "净重(KG)")
     private BigDecimal netWeight;

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java

@@ -153,6 +153,10 @@ public class MaterialInventoryDO extends MaterialBaseDO {
     @Excel(name = "单位")
     private String unit;
 
+    @ApiModelProperty("单位名称")
+    @Excel(name = "单位名称")
+    private String unitName;
+
     @ApiModelProperty("净重(KG)")
     @Excel(name = "净重(KG)")
     private BigDecimal netWeight;

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryQueryListDO.java

@@ -177,6 +177,10 @@ public class MaterialInventoryQueryListDO extends MaterialBaseDO {
     @Excel(name = "单位")
     private String unit;
 
+    @ApiModelProperty("单位名称")
+    @Excel(name = "单位名称")
+    private String unitName;
+
     @ApiModelProperty("净重(KG)")
     @Excel(name = "净重(KG)")
     private BigDecimal netWeight;

mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java

@@ -309,4 +309,20 @@ public class ShelfMaterialDetail extends BaseVOEntity {
     @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @TableField("ext_attr_4")
     private Date extAttr4;
+
+    @ApiModelProperty("总净重(KG)")
+    @Excel(name = "总净重(KG)")
+    private BigDecimal totalNetWeight;
+
+    @ApiModelProperty("总毛重(KG)")
+    @Excel(name = "总毛重(KG)")
+    private BigDecimal totalGrossWeight;
+
+    @ApiModelProperty("总体积(CBM)")
+    @Excel(name = "总体积(CBM)")
+    private BigDecimal totalVolume;
+
+    @ApiModelProperty("总面积(SQM)")
+    @Excel(name = "总面积(SQM)")
+    private BigDecimal totalArea;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/po/ShelfMaterialDetailPO.java

@@ -312,4 +312,20 @@ public class ShelfMaterialDetailPO extends BaseVOEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date extAttr4;
+
+    @ApiModelProperty("总净重(KG)")
+    @Excel(name = "总净重(KG)")
+    private BigDecimal totalNetWeight;
+
+    @ApiModelProperty("总毛重(KG)")
+    @Excel(name = "总毛重(KG)")
+    private BigDecimal totalGrossWeight;
+
+    @ApiModelProperty("总体积(CBM)")
+    @Excel(name = "总体积(CBM)")
+    private BigDecimal totalVolume;
+
+    @ApiModelProperty("总面积(SQM)")
+    @Excel(name = "总面积(SQM)")
+    private BigDecimal totalArea;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java

@@ -316,4 +316,20 @@ public class ShelfMaterialDetailDO extends BaseVOEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date extAttr4;
+
+    @ApiModelProperty("总净重(KG)")
+    @Excel(name = "总净重(KG)")
+    private BigDecimal totalNetWeight;
+
+    @ApiModelProperty("总毛重(KG)")
+    @Excel(name = "总毛重(KG)")
+    private BigDecimal totalGrossWeight;
+
+    @ApiModelProperty("总体积(CBM)")
+    @Excel(name = "总体积(CBM)")
+    private BigDecimal totalVolume;
+
+    @ApiModelProperty("总面积(SQM)")
+    @Excel(name = "总面积(SQM)")
+    private BigDecimal totalArea;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java

@@ -31,7 +31,9 @@ import com.mhd.wms.domain.inventoryAdjustmentRecord.entity.InventoryAdjustmentRe
 import com.mhd.wms.domain.inventoryAdjustmentRecord.repository.mapper.InventoryAdjustmentRecordMapper;
 import com.mhd.wms.domain.inventoryStandingDetail.repository.facade.IInventoryStandingDetailService;
 import com.mhd.wms.domain.inventoryStandingDetail.repository.todo.InventoryStandingDetailDO;
+import com.mhd.wms.domain.materialBaseInfo.entity.MaterialBaseInfo;
 import com.mhd.wms.domain.materialBaseInfo.repository.facade.IMaterialBaseInfoService;
+import com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper;
 import com.mhd.wms.domain.materialGoodsRule.repository.facade.IMaterialGoodsRuleService;
 import com.mhd.wms.domain.materialGoodsRule.repository.po.BatchDetailPO;
 import com.mhd.wms.domain.materialGoodsRule.repository.po.BatchPO;
@@ -112,6 +114,8 @@ public class StockShelfOrderDomainService {
     private IMaterialGoodsRuleService materialGoodsRuleService;
     @Autowired
     private InventoryAdjustmentRecordMapper inventoryAdjustmentRecordMapper;
+    @Autowired
+    private MaterialBaseInfoMapper materialBaseInfoMapper;
 
     /**
      * 分页查询上架单列表
@@ -428,6 +432,7 @@ public class StockShelfOrderDomainService {
             Long shipperId = stockReceiptOrderDO.getShipperId();
             MaterialInventory param = getParam(shelfMaterialDetail, fieldNames, shipperId);
             List<MaterialInventoryPO> materialInventoryPOS = materialInventoryMapper.selectListByWhere(param);
+            MaterialBaseInfo materialBaseInfo = materialBaseInfoMapper.selectById(materialBaseInfoId);
             LoginUser loginUser = SecurityUtils.getLoginUser();
             if (materialInventoryPOS.size() == 0) {
                 MaterialInventory materialInventory = new MaterialInventory();
@@ -478,6 +483,14 @@ public class StockShelfOrderDomainService {
                 materialInventory.setCreateByName(loginUser.getUsername());
                 materialInventory.setCreateTime(new Date());
 
+                //体积 重量等
+                materialInventory.setVolume(shelfMaterialDetail.getTotalVolume());
+                materialInventory.setArea(shelfMaterialDetail.getTotalArea());
+                materialInventory.setGrossWeight(shelfMaterialDetail.getTotalGrossWeight());
+                materialInventory.setNetWeight(shelfMaterialDetail.getTotalNetWeight());
+                materialInventory.setUnit(materialBaseInfo.getUnitCode());
+                materialInventory.setUnitName(materialBaseInfo.getUnitName());
+
                 materialInventoryMapper.insert(materialInventory);