From 58a518f8bc23ed382f4da2a86b09024b063a620c Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期一, 13 五月 2024 15:40:47 +0800
Subject: [PATCH] 20240511修改: 分发单优化， 分类，物品，分发单明细，采购单明细数据导入
---
deploy-jar-single/src/main/resources/import/采购导入.xls | 0
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 4 ++--
deploy-jar-single/src/main/resources/import/物品信息.xls | 0
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 3 +++
deploy-jar-single/src/main/resources/import/分发导入.xls | 0
5 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index ef8e0db..1ac5ca9 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -455,6 +455,9 @@
if (StrUtil.isEmpty(goodsType)) {
throw new ExcelAnalysisException("绗�" + index + "鏉℃暟鎹紝鐗╁搧绫诲瀷涓嶈兘涓虹┖锛�" + goodsType);
}
+ if(!"鑷噰".equals(goodsType) && !"闆嗛噰".equals(goodsType)){
+ throw new ExcelAnalysisException("绗�" + index + "鏉℃暟鎹紝鐗╁搧绫诲瀷鍙栧�间负[鑷噰/闆嗛噰] 鏁版嵁婧愬�间负锛�" + goodsType);
+ }
// 绗竴娆¤繘鏉ユ妸澶栧眰鐨勫�艰缃竴涓�
if (lWhFormProcureParam.getAgencyId() == null) {
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index 61409c5..dd2a671 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -783,8 +783,8 @@
}
// 浣跨敤浜�
String user = data.getUser();
- if (StrUtil.isEmpty(user)) {
- throw new ExcelAnalysisException("绗�" + index + "鏉℃暟鎹紝浣跨敤浜轰笉鑳戒负绌猴細" + user);
+ if (StrUtil.isEmpty(user) && type.equals("A")) {
+ throw new ExcelAnalysisException("绗�" + index + "鏉℃暟鎹紝绠＄悊鍒嗙被涓篈鐨勭墿鍝侊紝浣跨敤浜轰笉鑳戒负绌猴細" + user);
}
// 鑱旂郴鐢佃瘽
String userContactPhone = data.getUserContactPhone();
diff --git "a/deploy-jar-single/src/main/resources/import/\345\210\206\345\217\221\345\257\274\345\205\245.xls" "b/deploy-jar-single/src/main/resources/import/\345\210\206\345\217\221\345\257\274\345\205\245.xls"
index fb416ed..e6ade3f 100644
--- "a/deploy-jar-single/src/main/resources/import/\345\210\206\345\217\221\345\257\274\345\205\245.xls"
+++ "b/deploy-jar-single/src/main/resources/import/\345\210\206\345\217\221\345\257\274\345\205\245.xls"
Binary files differ
diff --git "a/deploy-jar-single/src/main/resources/import/\347\211\251\345\223\201\344\277\241\346\201\257.xls" "b/deploy-jar-single/src/main/resources/import/\347\211\251\345\223\201\344\277\241\346\201\257.xls"
index 9882375..42a53e6 100644
--- "a/deploy-jar-single/src/main/resources/import/\347\211\251\345\223\201\344\277\241\346\201\257.xls"
+++ "b/deploy-jar-single/src/main/resources/import/\347\211\251\345\223\201\344\277\241\346\201\257.xls"
Binary files differ
diff --git "a/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\345\257\274\345\205\245.xls" "b/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\345\257\274\345\205\245.xls"
index 91e1853..81b8597 100644
--- "a/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\345\257\274\345\205\245.xls"
+++ "b/deploy-jar-single/src/main/resources/import/\351\207\207\350\264\255\345\257\274\345\205\245.xls"
Binary files differ
--
Gitblit v1.9.1