From ab6435ed8f14aa1eb4bc17b5eaf59fb2bdb994f7 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 12 一月 2026 16:55:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java | 75 +++++++++++++++++++++++++++++++++----
src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html | 29 ++++++++++----
2 files changed, 87 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java b/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
index 0f5532f..f2a4e39 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
@@ -9,8 +9,10 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.OrderDetlPakin;
import com.zy.asrs.entity.param.ReportOrderBatchDetlParam;
+import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderDetlPakinService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,9 @@
@Autowired
private OrderDetlPakinService orderDetlService;
+
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/orderDetl/{id}/auth")
@ManagerAuth
@@ -73,18 +78,70 @@
@RequestMapping(value = "/orderDetl/batch/report/auth")
@ManagerAuth(memo = "淇敼涓嬪彂椤�")
public R reportBatch(ReportOrderBatchDetlParam param) {
- if (param.getAnfme()<1 && param.getInspect()==1){
- return R.error("涓嬪彂鏁伴噺涓嶈兘灏忎簬1").add("涓嬪彂鏁伴噺涓嶈兘灏忎簬1");
+ if (param.getAnfme() < 1 && param.getInspect() == 1) {
+ return R.error("涓嬪彂鏁伴噺涓嶈兘灏忎簬1");
}
- List<OrderDetlPakin> orderDetlPakinList = orderDetlService.selectList(new EntityWrapper<OrderDetlPakin>()
- .eq("order_no", param.getOrderNo()).eq("id", param.getId())
+
+ List<String> errorMessages = new ArrayList<>();
+
+ List<OrderDetlPakin> list = orderDetlService.selectList(
+ new EntityWrapper<OrderDetlPakin>()
+ .eq("order_no", param.getOrderNo())
+ .eq("id", param.getId())
);
- for (OrderDetlPakin orderDetl : orderDetlPakinList){
- orderDetl.setInspect(param.getInspect());
- orderDetl.setSortingAnfme(param.getAnfme());
- orderDetlService.updateById(orderDetl);
+
+ if (list.isEmpty()) {
+ return R.error("鏈壘鍒板搴旂殑涓嬪彂璁板綍");
}
- return R.ok();
+
+ final double LENGTH_MIN = 315, LENGTH_MAX = 1150;
+ final double WIDTH_MIN = 160, WIDTH_MAX = 730;
+ final double HEIGHT_MIN = 140, HEIGHT_MAX = 810;
+
+ for (OrderDetlPakin detl : list) {
+ Mat mat = matService.selectOne(
+ new EntityWrapper<Mat>().eq("matnr", detl.getMatnr())
+ );
+ if (mat == null) {
+ errorMessages.add("鐗╂枡缂栧彿 " + detl.getMatnr() + " 涓嶅瓨鍦�");
+ continue;
+ }
+
+ Double len = mat.getManLength();
+ Double wid = mat.getWidth();
+ Double hei = mat.getHeight();
+
+ if (len == null || len < LENGTH_MIN || len > LENGTH_MAX) {
+ errorMessages.add(String.format("鐗╂枡 %s 闀垮害寮傚父锛氬繀椤� %.0f~%.0f mm锛屽綋鍓� %s",
+ detl.getMatnr(), LENGTH_MIN, LENGTH_MAX, len));
+ }
+ if (wid == null || wid < WIDTH_MIN || wid > WIDTH_MAX) {
+ errorMessages.add(String.format("鐗╂枡 %s 瀹藉害寮傚父锛氬繀椤� %.0f~%.0f mm锛屽綋鍓� %s",
+ detl.getMatnr(), WIDTH_MIN, WIDTH_MAX, wid));
+ }
+ 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 (!errorMessages.isEmpty()) {
+ // Choose one style:
+ return R.error(String.join("锛沑n", errorMessages));
+ // or
+ // R r = R.error("灏哄鏍￠獙澶辫触锛岃妫�鏌ヤ互涓嬮棶棰橈細");
+ // r.put("errors", errorMessages);
+ // return r;
+ }
+
+ // all good 鈫� update
+ for (OrderDetlPakin detl : list) {
+ detl.setInspect(param.getInspect());
+ detl.setSortingAnfme(param.getAnfme());
+ orderDetlService.updateById(detl);
+ }
+
+ return R.ok("淇敼鎴愬姛");
}
@RequestMapping(value = "/orderDetl/add/auth")
diff --git a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
index ece51b6..353a1b2 100644
--- a/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
+++ b/src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html
@@ -773,22 +773,35 @@
method: 'POST',
success: (res) => {
loadingInstance.close();
+
if (res.code === 200 || res.success) {
this.$message({
- message: `淇敼鎴愬姛锛佽鍗曞彿: ${orderNo}, id: ${id}`,
+ message: `淇敼鎴愬姛锛佽鍗曞彿: ${orderNo}`,
type: 'success',
- duration: 3000
+ duration: 2500
});
- this.getTableDataB(orderNo);//
- // 涓嶉渶瑕侀噸鏂板姞杞芥暣椤垫暟鎹紙閬垮厤涓㈠け鐢ㄦ埛淇敼鐨勬暟閲忥級
- } else {
- this.$message.error(res.msg || '淇敼澶辫触');
+ this.getTableDataB(orderNo);
+ }
+ else {
+ // 澶勭悊鍚庣杩斿洖鐨勮缁嗛敊璇俊鎭�
+ let errorMsg = res.msg || '淇敼澶辫触';
+
+ // 濡傛灉鍚庣杩斿洖浜� errors 鏁扮粍锛屽睍绀哄緱鏇存紓浜�
+ if (res.errors && Array.isArray(res.errors) && res.errors.length > 0) {
+ errorMsg = res.errors.join('\n');
+ this.$alert(errorMsg, '灏哄鏍￠獙澶辫触', {
+ confirmButtonText: '鐭ラ亾浜�',
+ type: 'error',
+ dangerouslyUseHTMLString: true // 濡傛灉鎯虫崲琛屾洿鏄庢樉
+ });
+ } else {
+ this.$message.error(errorMsg);
+ }
}
},
error: (error) => {
loadingInstance.close();
- console.error('淇敼澶辫触:', error);
- this.$message.error('淇敼澶辫触锛岃妫�鏌ョ綉缁滆繛鎺�');
+ this.$message.error('缃戠粶寮傚父锛岃绋嶅悗閲嶈瘯');
}
});
},
--
Gitblit v1.9.1