From dfdf98629fa109a18a76bcc00a63a812c4ecbcaa Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 07 十一月 2025 10:01:55 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/utils/OrderOutBatchUtil.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/OrderOutBatchUtil.java b/src/main/java/com/zy/asrs/utils/OrderOutBatchUtil.java
index d0ed13f..cc9d61e 100644
--- a/src/main/java/com/zy/asrs/utils/OrderOutBatchUtil.java
+++ b/src/main/java/com/zy/asrs/utils/OrderOutBatchUtil.java
@@ -31,6 +31,7 @@
private String action = "";
private String orderName = "";
private Long userId = 9999L;
+ private boolean signDanger = true;
public OrderOutBatchUtil() {
@@ -45,7 +46,7 @@
this.cstmrName = cstmrName;
}
- public OrderOutBatchUtil(String orderOneNo, String cstmrName, String ip, String action,String orderName) {
+ public OrderOutBatchUtil(String orderOneNo, String cstmrName, String ip, String action,String orderName,boolean signDanger) {
this.errorMsgOrderLoc = "";
this.sign = true;
this.orderOneNo = orderOneNo;
@@ -54,6 +55,7 @@
this.action = action;
this.orderName = orderName;
this.userId = 9999L;
+ this.signDanger = signDanger;
}
public R setOrderOutBatch() {
@@ -81,11 +83,13 @@
continue;
// throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛�");
}
-// if (!locDetlSou.getDanger$().equals(outLocBoxC[4])) {
-// sign = false;
-// errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" + "绠卞彿锛�" + outLocBoxC[0] + " ==銆嬪嚭搴撹緭鍏ュ緟鍒ょ姸鎬侊細" + outLocBoxC[4] + "銆佸簱瀛樼姸鎬侊細" + locDetlSou.getDanger$() + "銆傜姸鎬佷笉鍖归厤銆�===]";
-// continue;
-// }
+ if (signDanger){
+ if (!locDetlSou.getDanger$().equals(outLocBoxC[4])) {
+ sign = false;
+ errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" + "绠卞彿锛�" + outLocBoxC[0] + " ==銆嬪嚭搴撹緭鍏ュ緟鍒ょ姸鎬侊細" + outLocBoxC[4] + "銆佸簱瀛樼姸鎬侊細" + locDetlSou.getDanger$() + "銆傜姸鎬佷笉鍖归厤銆�===]";
+ continue;
+ }
+ }
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlSou.getLocNo()));
if (Cools.isEmpty(locMast)) {
sign = false;
--
Gitblit v1.9.1