weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

入库调整记录修改;

Browse Source
This commit is contained in:
王奎兴
2026-04-20 18:13:40 +08:00
parent 2fa09050cc
commit c22b28c484
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java
+1 -1
View File
@@ -634,7 +634,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
inventoryAdjustmentRecord.setAdjustedVolume(materialInventory.getVolume()); inventoryAdjustmentRecord.setAdjustedVolume(materialInventory.getVolume());
inventoryAdjustmentRecord.setAdjustedArea(materialInventory.getArea()); inventoryAdjustmentRecord.setAdjustedArea(materialInventory.getArea());
} else if ("入库".equals(adjustAction)){ } else if ("入库".equals(adjustAction)){
if (materialInventory == null) { if ("1".equals(materialInventoryParamDO.getIsNew())) {
inventoryAdjustmentRecord.setAllocationBeforeQuantity(BigDecimal.ZERO); inventoryAdjustmentRecord.setAllocationBeforeQuantity(BigDecimal.ZERO);
inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventoryParamDO.getQuantity()); inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventoryParamDO.getQuantity());
inventoryAdjustmentRecord.setFreezeBeforeQuantity(BigDecimal.ZERO); inventoryAdjustmentRecord.setFreezeBeforeQuantity(BigDecimal.ZERO);
mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryParamDO.java
+2
View File
@@ -100,4 +100,6 @@ public class MaterialInventoryParamDO extends MaterialBaseDO {
private String batchNumber; private String batchNumber;
private String isNew;
} }
mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
+3 -1
View File
@@ -1062,6 +1062,7 @@ public class StockShelfOrderDomainService {
// materialInventoryMapper.insert(materialInventory); // materialInventoryMapper.insert(materialInventory);
inventoryParamDO.setType("1"); inventoryParamDO.setType("1");
inventoryParamDO.setIsNew("1");
//库存调整记录 //库存调整记录
materialInventoryService.xgkc(inventoryParamDO); materialInventoryService.xgkc(inventoryParamDO);
@@ -1119,9 +1120,10 @@ public class StockShelfOrderDomainService {
inventoryParamDO.setQuantity(shelfMaterialDetail.getShelvesQuantity()); inventoryParamDO.setQuantity(shelfMaterialDetail.getShelvesQuantity());
inventoryParamDO.setType("1"); inventoryParamDO.setType("1");
inventoryParamDO.setUpdateTime(new Date()); inventoryParamDO.setUpdateTime(new Date());
materialInventoryService.xgkc(inventoryParamDO);
//库存调整记录 //库存调整记录
materialInventoryService.kctzjl(inventoryParamDO, "入库", loginUser); materialInventoryService.kctzjl(inventoryParamDO, "入库", loginUser);
materialInventoryService.xgkc(inventoryParamDO);
//抄码商品对照数据插入 //抄码商品对照数据插入
copyCodeProductComparison(materialBaseInfo,shelfMaterialDetail,inventoryParamDO); copyCodeProductComparison(materialBaseInfo,shelfMaterialDetail,inventoryParamDO);
} }