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; }