diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java index f8c74da3e..99fefa42b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java @@ -1021,6 +1021,8 @@ public class MaterialInventoryApplicationService { //未查询到库存记录 if (materialInventoryPOS==null || materialInventoryPOS.size()==0) return; for (MaterialInventoryPO materialInventoryPO : materialInventoryPOS) { + String businessChargeType = materialInventoryPO.getBusinessChargeType(); + if (!"散租".equals(businessChargeType)) continue; Date createTime = materialInventoryPO.getCreateTime(); Long materialBaseInfoId = materialInventoryPO.getMaterialBaseInfoId(); String lotNumber = materialInventoryPO.getLotNumber(); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java index 0a1007541..d5157b036 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java @@ -277,4 +277,7 @@ public class MaterialInventoryPO extends MaterialBasePO { @ApiModelProperty("半月仓租单位") @Excel(name = "半月仓租单位") private String halfMonthWarehouseRentUnit; + + @ApiModelProperty("业务计价类型") + private String businessChargeType; } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml index 3f5e19f8d..384540582 100644 --- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml @@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -1822,8 +1823,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"