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

Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

Browse Source
This commit is contained in:
王奎兴
2026-04-22 18:30:59 +08:00
parent 336a33f6e7 3c8aea5093
commit 3aa62897f4
2 changed files with 5 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/shiftManage/service/ShiftManageDomainService.java
+3
View File
@@ -899,6 +899,9 @@ public class ShiftManageDomainService {
materialInventoryDONow.setCreateBy(loginUser.getUserid()); materialInventoryDONow.setCreateBy(loginUser.getUserid());
materialInventoryDONow.setCreateByName(loginUser.getUsername()); materialInventoryDONow.setCreateByName(loginUser.getUsername());
materialInventoryDONow.setCreateTime(new Date()); materialInventoryDONow.setCreateTime(new Date());
materialInventoryDONow.setUpdateBy(loginUser.getUserid());
materialInventoryDONow.setUpdateByName(loginUser.getUsername());
materialInventoryDONow.setUpdateTime(new Date());
return materialInventoryDONow; return materialInventoryDONow;
}else { }else {
MaterialInventoryDO materialInventoryDONow = new MaterialInventoryDO(); MaterialInventoryDO materialInventoryDONow = new MaterialInventoryDO();
mhd_wms/src/main/java/com/mhd/wms/domain/shiftMaterialDetail/repository/persistence/ShiftMaterialDetailImpl.java
+2 -2
View File
@@ -772,7 +772,6 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
UserPo userPo = loginUser.getUserPo(); UserPo userPo = loginUser.getUserPo();
if (userPo != null) inventoryAdjustmentRecord.setCreateByName(userPo.getUserName()); if (userPo != null) inventoryAdjustmentRecord.setCreateByName(userPo.getUserName());
inventoryAdjustmentRecord.setCreateTime(new Date()); inventoryAdjustmentRecord.setCreateTime(new Date());
inventoryAdjustmentRecord.setInventoryAfterQuantity(shiftMaterialDetailDO.getShiftQuantity());
inventoryAdjustmentRecord.setAllocationBeforeQuantity(materialInventory1.getAllocationQuantity() == null ? BigDecimal.ZERO : materialInventory1.getAllocationQuantity()); inventoryAdjustmentRecord.setAllocationBeforeQuantity(materialInventory1.getAllocationQuantity() == null ? BigDecimal.ZERO : materialInventory1.getAllocationQuantity());
inventoryAdjustmentRecord.setFreezeBeforeQuantity(materialInventory1.getFreezeQuantity() == null ? BigDecimal.ZERO : materialInventory1.getFreezeQuantity()); inventoryAdjustmentRecord.setFreezeBeforeQuantity(materialInventory1.getFreezeQuantity() == null ? BigDecimal.ZERO : materialInventory1.getFreezeQuantity());
inventoryAdjustmentRecord.setFreezeAfterQuantity(materialInventory1.getFreezeQuantity() == null ? BigDecimal.ZERO : materialInventory1.getFreezeQuantity()); inventoryAdjustmentRecord.setFreezeAfterQuantity(materialInventory1.getFreezeQuantity() == null ? BigDecimal.ZERO : materialInventory1.getFreezeQuantity());
@@ -826,7 +825,8 @@ public class ShiftMaterialDetailImpl extends ServiceImpl<ShiftMaterialDetailMapp
inventoryAdjustmentRecord2.setFreezeBeforeQuantity(newFreezeBefore); inventoryAdjustmentRecord2.setFreezeBeforeQuantity(newFreezeBefore);
inventoryAdjustmentRecord2.setFreezeAfterQuantity(newFreezeBefore); inventoryAdjustmentRecord2.setFreezeAfterQuantity(newFreezeBefore);
inventoryAdjustmentRecord2.setInventoryAfterQuantity(newInvBefore.add(shiftQty)); inventoryAdjustmentRecord2.setInventoryAfterQuantity(newInvBefore.add(shiftQty));
inventoryAdjustmentRecord2.setAllocationAfterQuantity(materialInventory1.getAllocationQuantity().subtract(shiftMaterialDetailDO.getShiftQuantity())); // 新库位移入：调整后可用数量 = 新库位调整前可用 + 移入数量（与调整后库存数量一致，均为移入可用量）
inventoryAdjustmentRecord2.setAllocationAfterQuantity(newAllocBefore.add(shiftQty));
inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord2);//移位后物料记录（新库位增加） inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord2);//移位后物料记录（新库位增加）
} }