diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java index fba82098..8e259d53 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java @@ -159,6 +159,7 @@ public class OutPurchaseController extends BaseController { item.setOrderId(orderId); item.setNum(BigDecimal.ZERO); item.setWerks(it.getWerks()); + Set batchNo=new HashSet<>(); if (CollectionUtil.isNotEmpty(it.getQrCodes())) { it.getQrCodes().forEach(qrCode -> { WmsQrCodeMaster qrCodeMaster = qrCodeMasters.stream() @@ -172,7 +173,9 @@ public class OutPurchaseController extends BaseController { .throwMessage("物料" + it.getMatnr() + "与二维码不匹配"); // VUtil.trueThrowBusinessError(!check(qrCodeMaster, it.getCharg(), it.getSernrs())) // .throwMessage("物料" + it.getMatnr() + "包含不符合批次号和序列号的扫码记录"); + item.setMeins(qrCodeMaster.getUnit()); item.setNum(item.getNum().add(qrCodeMaster.getQuantity())); + batchNo.add(qrCodeMaster.getBatchNo()); // qrCodeMaster.setFactoryCode(""); // qrCodeMaster.setStorageLocation(""); // qrCodeMaster.setBinLocation(""); @@ -203,6 +206,7 @@ public class OutPurchaseController extends BaseController { ); }); } + item.setCharg(StrUtil.join(",", batchNo)); // VUtil.trueThrowBusinessError(it.getNum().compareTo(item.getTemng()) > 0) // .throwMessage("物料" + it.getMatnr() + "的扫码数量大于退货数量"); // VUtil.trueThrowBusinessError(item.getNum().compareTo(it.getNum()) != 0)