From be8c7cedb6173014dfc8b6d86291b3c2aab0c8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 1 Apr 2026 10:54:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(out-purchase):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=89=B9=E6=AC=A1=E5=8F=B7=E5=92=8C=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF=E5=A4=84=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在出库采购控制器中新增批次号集合用于存储扫码批次信息 - 添加单位信息设置功能，从二维码主数据获取并设置到项目中 - 实现批次号去重合并功能，将多个批次号以逗号分隔形式存储 - 优化扫码数量累加逻辑，确保单位和批次信息正确关联 --- .../com/nflg/wms/admin/controller/OutPurchaseController.java | 4 ++++ 1 file changed, 4 insertions(+) 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)