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-05 10:54:53 +08:00
parent 2d91e755bd 408f093952
commit de109a7551
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java
+19 -3
View File
@@ -1142,7 +1142,7 @@ public class ReservationStockOutOrderApplicationService {
item.put("itemNo", detail.getMaterialBaseInfoId() != null ? detail.getMaterialBaseInfoId().toString() : ""); item.put("itemNo", detail.getMaterialBaseInfoId() != null ? detail.getMaterialBaseInfoId().toString() : "");
item.put("itemName", detail.getMaterialName() != null ? detail.getMaterialName() : ""); item.put("itemName", detail.getMaterialName() != null ? detail.getMaterialName() : "");
item.put("spec", detail.getSpecificationModel() != null ? detail.getSpecificationModel() : ""); item.put("spec", detail.getSpecificationModel() != null ? detail.getSpecificationModel() : "");
item.put("unit", detail.getDeclareUnit() != null ? detail.getDeclareUnit() : ""); item.put("unit", detail.getUnit() != null ? detail.getUnit() : "");
item.put("qty", detail.getQuantity()); item.put("qty", detail.getQuantity());
// 获取物料详情 // 获取物料详情
@@ -1162,7 +1162,20 @@ public class ReservationStockOutOrderApplicationService {
} }
} }
// 库存关联信息 // 库存关联信息（实体默认值 + WMS覆盖）
item.put("orderINo", detail.getInOrderNumber() != null ? detail.getInOrderNumber() : "");
if (detail.getLotNo() != null && detail.getLotNo().contains("-")) {
String lotNumStr = detail.getLotNo().substring(detail.getLotNo().lastIndexOf("-") + 1);
try {
Integer lotRowNum = Integer.valueOf(lotNumStr);
item.put("orderIRow", lotRowNum);
item.put("billIRow", lotRowNum);
} catch (NumberFormatException ignored) {}
}
item.put("warehouse", detail.getWarehouseName() != null ? detail.getWarehouseName() : "");
item.put("opWhLoc", detail.getStorageLocationName() != null ? detail.getStorageLocationName() : "");
// WMS仓储数据（如有则覆盖）
if (detail.getLotNo() != null) { if (detail.getLotNo() != null) {
Long kcId = reservationOutMaterialDetailMapper.getKcId(detail.getLotNo()); Long kcId = reservationOutMaterialDetailMapper.getKcId(detail.getLotNo());
if (kcId != null) { if (kcId != null) {
@@ -1180,8 +1193,11 @@ public class ReservationStockOutOrderApplicationService {
item.put("opWhLoc", opWhLoc != null ? opWhLoc : ""); item.put("opWhLoc", opWhLoc != null ? opWhLoc : "");
// billI = 入库单号
if (inOrderNumber != null) {
item.put("billI", inOrderNumber);
}
if (inLotNo != null) { if (inLotNo != null) {
item.put("billI", inLotNo);
if (inLotNo.contains("-")) { if (inLotNo.contains("-")) {
String numStr = inLotNo.substring(inLotNo.lastIndexOf("-") + 1); String numStr = inLotNo.substring(inLotNo.lastIndexOf("-") + 1);
try { try {