From 605be0c8702fc7bfe4f7fcdd397c9f0d40722b69 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 09 四月 2026 15:19:43 +0800
Subject: [PATCH] 1.商品档案新增最大限制和最小限制 2.mes空桶/余料回库修复

---
 src/main/java/com/zy/common/web/WcsController.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 73510d7..1bac91d 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -125,6 +125,15 @@
 
             }
             m=m*mat.getVolume();
+            Double currentStock = locDetlService.getSumAnfme(matnr);
+            if (currentStock == null) {
+                currentStock = 0D;
+            }
+            if (mat.getStoreMax() != null && currentStock + m > mat.getStoreMax()) {
+                log.info("WCS鍏ュ簱鎷︽埅: 鐗╂枡瓒呰繃搴撳瓨涓婇檺, matnr={}, currentStock={}, inboundQty={}, storeMax={}",
+                        matnr, currentStock, m, mat.getStoreMax());
+                return R.error("鐗╂枡宸插埌杈句笂闄愮姝㈠叆搴�");
+            }
             //Double val = Math.round((m - matnr.getSafeQty()) * 10000) / 10000.0;
             Config config = configService.selectConfigByCode("SimulationInbound");
             if (config != null && config.getValue().equals("Y")) {

--
Gitblit v1.9.1