From 30741347d747bc7268b68f6ff82749c95845e6ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 12 Jun 2026 14:49:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(inventory):=20=E6=B7=BB=E5=8A=A0=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E5=87=BA=E5=BA=93=E5=82=A8=E4=BD=8D=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在InventoryForOutItemQO中新增binNo字段用于储位编号 - 在库存控制器中实现储位匹配逻辑 - 当指定储位时不匹配的库存记录将被跳过 - 支持精确匹配物料号和储位的库存分配 - 保持原有的数量计算和批次序列号处理逻辑 --- .../com/nflg/wms/admin/controller/InventoryController.java | 7 +++++++ .../com/nflg/wms/common/pojo/qo/InventoryForOutItemQO.java | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java index c22654a2..e177bfbb 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java @@ -324,6 +324,13 @@ public class InventoryController extends BaseController { if (CollectionUtil.isNotEmpty(mis)) { BigDecimal num = item.getNum(); for (WmsInventory inventory : mis) { + InventoryForOutItemQO mqo=qo.getItems().stream() + .filter(q -> StrUtil.equals(q.getMaterialNo(), inventory.getMaterialNo())) + .findFirst() + .get(); + if (StrUtil.isNotBlank(mqo.getBinNo()) && !StrUtil.equals(mqo.getBinNo(), inventory.getBinLocation())){ + continue; + } BigDecimal outNum = NumberUtil.min(num, inventory.getNum()); vo.getItems().add(new InventoryForOutItemVO(inventory.getBatchNo(), inventory.getSerialNo(), inventory.getBinLocation(), outNum)); num = num.subtract(outNum); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryForOutItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryForOutItemQO.java index 8de52270..27cf2cae 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryForOutItemQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryForOutItemQO.java @@ -22,4 +22,9 @@ public class InventoryForOutItemQO { @NotNull @Positive public BigDecimal num; + + /** + * 储位编号 + */ + private String binNo; }