rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

获取物料出库批次差异null修改

This commit is contained in:
yf001217 2026-03-20 10:58:17 +08:00
parent a55d503c83
commit 5a47d42c33
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java
View File

@ -136,11 +136,13 @@ public class LocationTransferController extends BaseController {
.collect(Collectors.toList()).size(); .collect(Collectors.toList()).size();
VUtil.trueThrowBusinessError(count2 > 0).throwMessage("存在不同仓库的二维码"); VUtil.trueThrowBusinessError(count2 > 0).throwMessage("存在不同仓库的二维码");
boolean hasDuplicates1 = allQcMasters.stream()
.map(WmsQrCodeMaster::getBarcodeCode)
.collect(Collectors.toSet()) // boolean hasDuplicates1 = allQcMasters.stream()
.size() != request.getItems().size(); // .map(WmsQrCodeMaster::getBarcodeCode)
VUtil.trueThrowBusinessError(!hasDuplicates1).throwMessage("存在同时扫箱码和箱中物料码的情况"); // .collect(Collectors.toSet())
// .size() != request.getItems().size();
// VUtil.trueThrowBusinessError(!hasDuplicates1).throwMessage("存在同时扫箱码和箱中物料码的情况");
List<WmsTransferOrders> transferOrders = new ArrayList<>(); List<WmsTransferOrders> transferOrders = new ArrayList<>();
List<InventoryOutDTO> outBoundInventory = new ArrayList<>(); List<InventoryOutDTO> outBoundInventory = new ArrayList<>();

22
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ScanRecordController.java
View File

@ -138,14 +138,30 @@ public class ScanRecordController extends BaseController {
v.stream() v.stream()
.collect(Collectors.groupingBy(OutMaterialScanRecord::getKey9)) .collect(Collectors.groupingBy(OutMaterialScanRecord::getKey9))
.forEach((key, vv) -> { .forEach((key, vv) -> {
List<String> keyParts = StrUtil.split(key, "|");
String scanBatchNo = "";
if (keyParts.size() > 1) {
scanBatchNo = "null".equals(keyParts.get(1)) ? "" : keyParts.get(1);
}
String scanSerialNo = "";
if (keyParts.size() > 2) {
scanSerialNo = "null".equals(keyParts.get(2)) ? "" : keyParts.get(2);
}
String scanBinNo = "";
if (keyParts.size() > 3) {
scanBinNo = keyParts.get(3);
}
vo.getItems().add(new OutDifferenceItemVO() vo.getItems().add(new OutDifferenceItemVO()
.setRecommendbatchNo("") .setRecommendbatchNo("")
.setRecommendSerialNo("") .setRecommendSerialNo("")
.setRecommendBinNo("") .setRecommendBinNo("")
// .setRecommendNum(BigDecimal.ZERO) // .setRecommendNum(BigDecimal.ZERO)
.setScanBatchNo(StrUtil.split(key, "|").get(1)) // .setScanBatchNo(StrUtil.split(key, "|").get(1))
.setScanSerialNo(StrUtil.split(key, "|").get(2)) // .setScanSerialNo(StrUtil.split(key, "|").get(2))
.setScanBinNo(StrUtil.split(key, "|").get(3)) // .setScanBinNo(StrUtil.split(key, "|").get(3))
.setScanBatchNo(scanBatchNo)
.setScanSerialNo(scanSerialNo)
.setScanBinNo(scanBinNo)
.setScanNum(vv.stream().map(OutMaterialScanRecord::getNum).reduce(BigDecimal.ZERO, BigDecimal::add))); .setScanNum(vv.stream().map(OutMaterialScanRecord::getNum).reduce(BigDecimal.ZERO, BigDecimal::add)));
}); });
}); });