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-06-04 17:45:52 +08:00
parent af83950e1a 083eb04026
commit 71b1faffb7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java
+1 -1
View File
@@ -236,6 +236,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
ReservationOutMaterialDetailDO reservationOutMaterialDetailDO = new ReservationOutMaterialDetailDO(); ReservationOutMaterialDetailDO reservationOutMaterialDetailDO = new ReservationOutMaterialDetailDO();
reservationOutMaterialDetailDO.setOutOrderNumber(reservationStockOutOrderDO.getOutOrderNumber()); reservationOutMaterialDetailDO.setOutOrderNumber(reservationStockOutOrderDO.getOutOrderNumber());
MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(productDetail.getProductCode()); MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(productDetail.getProductCode());
reservationOutMaterialDetailDO.setQuantity(new BigDecimal(productDetail.getPieceCount()).setScale(2, BigDecimal.ROUND_HALF_UP));
if (materialBaseInfoPO != null) { if (materialBaseInfoPO != null) {
reservationOutMaterialDetailDO.setMaterialBaseInfoId(materialBaseInfoPO.getMaterialBaseInfoId()); reservationOutMaterialDetailDO.setMaterialBaseInfoId(materialBaseInfoPO.getMaterialBaseInfoId());
reservationOutMaterialDetailDO.setMaterialCode(materialBaseInfoPO.getMaterialCode()); reservationOutMaterialDetailDO.setMaterialCode(materialBaseInfoPO.getMaterialCode());
@@ -249,7 +250,6 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
} }
} }
reservationOutMaterialDetailDO.setQuantity(new BigDecimal(productDetail.getPieceCount()).setScale(2, BigDecimal.ROUND_HALF_UP));
reservationOutMaterialDetailDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); reservationOutMaterialDetailDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
reservationOutMaterialDetailDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); reservationOutMaterialDetailDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
reservationOutMaterialDetailDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); reservationOutMaterialDetailDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());