From 3388c58f3322f661aa549a95c1506d70f25e5280 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 06 十一月 2025 16:19:48 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index 0e81ddc..4ad604c 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -36,6 +36,7 @@
private String errorMsgOrderLoc = "";
private String orderOneNo = null;
private String cstmrName = null;
+ private String danger = null;
private Long userId;
private String remoteAddr;
private boolean sign = true;
@@ -74,7 +75,7 @@
@Override
public void invoke(OutLocBoxExcel excel, AnalysisContext ctx) {
String batch = excel.getBatch();
- String orderNo = excel.getOrderNo();
+// String orderNo = excel.getOrderNo();
// String cstmrName = excel.getCstmrName();
String memo = excel.getMemo();
if (Cools.isEmpty(orderOneNo)){
@@ -91,11 +92,22 @@
throw new CoolException("瀹㈡埛鍚嶇О鍙傛暟涓虹┖");
}
}
- String[] s=new String[4];
+ if (Cools.isEmpty(danger)){
+ if (!Cools.isEmpty(excel.getDanger())){
+ danger = excel.getDanger();
+ } else {
+// throw new CoolException("寰呭垽鍙傛暟涓虹┖");
+ }
+ }
+ if (Cools.isEmpty(danger)){
+ danger = "鍚堟牸";
+ }
+ String[] s=new String[5];
s[0] = batch;
s[1] = orderOneNo;
s[2] = cstmrName;
s[3] = memo;
+ s[4] = danger;
OutLocBoxCs.add(s);
total++;
}
@@ -106,7 +118,7 @@
*/
@Override
public void doAfterAllAnalysed(AnalysisContext ctx) {
- if (!Cools.isEmpty(OutLocBoxCs) && OutLocBoxCs.size() != 0) {
+ if (!Cools.isEmpty(OutLocBoxCs) && !OutLocBoxCs.isEmpty()) {
LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
@@ -121,6 +133,12 @@
if (Cools.isEmpty(locDetlSou)){
sign = false;
errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" +"绠卞彿锛�"+outLocBoxC[0]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛併��===]";
+ continue;
+// throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛�");
+ }
+ if (locDetlSou.getDanger$().equals(outLocBoxC[4])){
+ sign = false;
+ errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" +"绠卞彿锛�"+outLocBoxC[0]+" ==銆嬪嚭搴撹緭鍏ュ緟鍒ょ姸鎬侊細"+outLocBoxC[4]+"銆佸簱瀛樼姸鎬侊細"+locDetlSou.getDanger$()+"銆傜姸鎬佷笉鍖归厤銆�===]";
continue;
// throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛�");
}
@@ -154,11 +172,12 @@
.eq("loc_no", locDetlSou.getLocNo()).eq("origin", locDetlSou.getOrigin()));
for (LocDetl locDetl:locDetls){
total++;
- String[] locDetlNow=new String[4];
+ String[] locDetlNow=new String[5];
locDetlNow[0] = locDetl.getBatch();
locDetlNow[1] = outLocBoxC[1];
locDetlNow[2] = outLocBoxC[2];
locDetlNow[3] = outLocBoxC[3];
+ locDetlNow[4] = outLocBoxC[4];
outLocBoxCList.add(locDetlNow);
outLocBoxCNew.add(outLocBoxC[0]);
}
--
Gitblit v1.9.1