From b285d25532a36a7c87df8b0c3507fba35c10d334 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 16 三月 2026 13:19:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java b/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
index f2a4e39..e74c090 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
@@ -97,7 +97,7 @@
final double LENGTH_MIN = 315, LENGTH_MAX = 1150;
final double WIDTH_MIN = 160, WIDTH_MAX = 730;
final double HEIGHT_MIN = 140, HEIGHT_MAX = 810;
-
+ final double WIEGHT_MIN = 0,WIEGHT_MAX = 23;
for (OrderDetlPakin detl : list) {
Mat mat = matService.selectOne(
new EntityWrapper<Mat>().eq("matnr", detl.getMatnr())
@@ -110,6 +110,7 @@
Double len = mat.getManLength();
Double wid = mat.getWidth();
Double hei = mat.getHeight();
+ Double WET = mat.getWeight();
if (len == null || len < LENGTH_MIN || len > LENGTH_MAX) {
errorMessages.add(String.format("鐗╂枡 %s 闀垮害寮傚父锛氬繀椤� %.0f~%.0f mm锛屽綋鍓� %s",
@@ -122,6 +123,10 @@
if (hei == null || hei < HEIGHT_MIN || hei > HEIGHT_MAX) {
errorMessages.add(String.format("鐗╂枡 %s 楂樺害寮傚父锛氬繀椤� %.0f~%.0f mm锛屽綋鍓� %s",
detl.getMatnr(), HEIGHT_MIN, HEIGHT_MAX, hei));
+ }
+ if (hei == null || WET < WIEGHT_MIN || WET > WIEGHT_MAX) {
+ errorMessages.add(String.format("鐗╂枡 %s 姣涢噸寮傚父锛氬繀椤� %.0f~%.0f mm锛屽綋鍓� %s",
+ detl.getMatnr(), WIEGHT_MIN, WIEGHT_MAX, hei));
}
}
@@ -161,6 +166,18 @@
return R.ok();
}
+ @RequestMapping(value = "/orderDetl/beBatch/update/auth")
+ @ManagerAuth(memo = "鍚屾宸蹭笅鍙戞暟閲�")
+ public R updateBeBatch(@RequestParam Long id, @RequestParam Integer beBatch) {
+ if (id == null) {
+ return R.error("id涓嶈兘涓虹┖");
+ }
+ if (!orderDetlService.updateBeBatch(id, beBatch)) {
+ return R.error("鏇存柊澶辫触");
+ }
+ return R.ok();
+ }
+
@RequestMapping(value = "/orderDetl/delete/auth")
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Long[] ids){
--
Gitblit v1.9.1