From 21f6bf1d6fb89d40654deb1847fbe99dc3eec353 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 06 十一月 2025 18:55:23 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java | 9 +++++++++
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 2 +-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java b/src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java
index 6696990..d8a04a2 100644
--- a/src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java
+++ b/src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java
@@ -17,6 +17,8 @@
private String orderNo;
@ExcelProperty(value = "瀹㈡埛")
private String cstmrName;
+ @ExcelProperty(value = "寰呭垽锛堝緟鍒�/涓嶅悎鏍�/鍚堟牸锛夐粯璁ゅ悎鏍�")
+ private String danger="鍚堟牸";
@ExcelProperty(value = "澶囨敞")
private String memo="";
@@ -38,4 +40,11 @@
this.memo = memo;
}
+ public OutLocBoxVo(String batch, String orderNo, String cstmrName, String danger, String memo) {
+ this.batch = batch;
+ this.orderNo = orderNo;
+ this.cstmrName = cstmrName;
+ this.danger = danger;
+ this.memo = memo;
+ }
}
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index 4ad604c..4e88227 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -136,7 +136,7 @@
continue;
// throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛�");
}
- if (locDetlSou.getDanger$().equals(outLocBoxC[4])){
+ if (!locDetlSou.getDanger$().equals(outLocBoxC[4])){
sign = false;
errorMsgOrderLoc = errorMsgOrderLoc + "[===銆�" +"绠卞彿锛�"+outLocBoxC[0]+" ==銆嬪嚭搴撹緭鍏ュ緟鍒ょ姸鎬侊細"+outLocBoxC[4]+"銆佸簱瀛樼姸鎬侊細"+locDetlSou.getDanger$()+"銆傜姸鎬佷笉鍖归厤銆�===]";
continue;
--
Gitblit v1.9.1