From e8be12f73d66be96241656c30dcac1f757889b87 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 15 十月 2025 08:40:41 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java | 3 +++
src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java | 3 +++
src/main/webapp/static/js/pakStore/stockOut.js | 2 +-
3 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
index 8670366..f2d345f 100644
--- a/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
+++ b/src/main/java/com/zy/asrs/controller/BarcodeMatnrController.java
@@ -107,6 +107,9 @@
throw new CoolException("璇ョ墿鏂欎笌鍏朵粬鎵樼洏缁戝畾锛屼笉鑳戒笌褰撳墠鎵樼洏"+waitPakin.getBarcode()+"缁戝畾锛屼笌璇ョ墿鏂欑粦瀹氱殑鎵樼洏鏄�"+matBarcode.getZpallet());
}
}
+ if (mat.getColor().equals("鎶ュ簾")){
+ throw new CoolException("璇ョ墿鏂欏凡鎶ュ簾锛岃鍕跨粦瀹�");
+ }
if (Cools.isEmpty(waitPakin.getBarcode())||Cools.isEmpty(waitPakin.getModiUser())||Cools.isEmpty(waitPakin.getAnfme())){
return R.error(BaseRes.PARAM);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
index 8de630f..d31b45d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
@@ -44,6 +44,9 @@
if (matBarcode != null){
throw new CoolException("璇ョ墿鏂欏凡缁忕粦瀹氭墭鐩橈紝璇峰嬁閲嶅缁戝畾");
}
+ if (mat.getColor().equals("鎶ュ簾")){
+ throw new CoolException("璇ョ墿鏂欏凡鎶ュ簾锛岃鍕跨粦瀹�");
+ }
MatBarcode mb=new MatBarcode();
mb.setZpallet(waitPakin.getBarcode());
mb.setMatnr(mat.getMatnr());
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index de516ce..505c3a3 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -50,7 +50,7 @@
layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
modify = false;
} else {
- if (vle <= 0) {
+ if (vle < 0) {
layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
modify = false;
}
--
Gitblit v1.9.1