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-03 10:47:29 +08:00
parent d9fe7d96bc 1bec4678da
commit 9912352faa
1 changed files with 19 additions and 32 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 -32
View File
@@ -1165,41 +1165,28 @@ public class ReservationStockOutOrderApplicationService {
String warehouse = reservationOutMaterialDetailMapper.getWarehouse(kcId);
String opWhLoc = reservationOutMaterialDetailMapper.getOpWhLoc(kcId);
item.put("orderINo", inOrderNumber != null ? inOrderNumber : "");
item.put("warehouse", warehouse != null ? warehouse : "");
item.put("opWhLoc", opWhLoc != null ? opWhLoc : "");
item.put("billI", inLotNo != null ? inLotNo : "");
// 处理批次号中的数字
if (inLotNo != null && inLotNo.contains("-")) {
String numStr = inLotNo.substring(inLotNo.lastIndexOf("-") + 1);
try {
Integer result = Integer.valueOf(numStr);
item.put("orderIRow", result);
item.put("billIRow", result);
} catch (NumberFormatException e) {
item.put("orderIRow", null);
item.put("billIRow", null);
if (inOrderNumber != null) {
item.put("orderINo", inOrderNumber);
}
if (warehouse != null) {
item.put("warehouse", warehouse);
}
if (opWhLoc != null) {
item.put("opWhLoc", opWhLoc);
}
if (inLotNo != null) {
item.put("billI", inLotNo);
if (inLotNo.contains("-")) {
String numStr = inLotNo.substring(inLotNo.lastIndexOf("-") + 1);
try {
Integer result = Integer.valueOf(numStr);
item.put("orderIRow", result);
item.put("billIRow", result);
} catch (NumberFormatException e) {
}
}
} else {
item.put("orderIRow", null);
item.put("billIRow", null);
}
} else {
item.put("orderINo", "");
item.put("orderIRow", null);
item.put("warehouse", "");
item.put("opWhLoc", "");
item.put("billI", "");
item.put("billIRow", null);
}
} else {
item.put("orderINo", "");
item.put("orderIRow", null);
item.put("warehouse", "");
item.put("opWhLoc", "");
item.put("billI", "");
item.put("billIRow", null);
}
orderList.add(item);