From 5089341b7d31ea6f580f4ef3a8e97d0602d69edf Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 03 八月 2022 11:37:38 +0800
Subject: [PATCH] 更新zip解析
---
src/main/java/com/whyc/service/ProductBomApprovingService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductBomApprovingService.java b/src/main/java/com/whyc/service/ProductBomApprovingService.java
index bb64ddf..cd8d2ba 100644
--- a/src/main/java/com/whyc/service/ProductBomApprovingService.java
+++ b/src/main/java/com/whyc/service/ProductBomApprovingService.java
@@ -214,6 +214,7 @@
bomApproving.setParentModel(productModel);
bomApproving.setParentVersion(productVersion);
bomApproving.setType(type);
+ bomApproving.setExcelName(fileTempUrl.substring(fileTempUrl.lastIndexOf(File.separator)+1));
for (int m = 2; m < lastCellNum; m++) {
row = sheet.getRow(l);
@@ -303,6 +304,7 @@
String subCode = sub.getSubCode();
String subModel = sub.getSubModel();
Integer quantity = sub.getQuantity();
+ String excelName = sub.getExcelName();
boolean exists = false;
for (ProductBomApproving reference:referenceList){
if(subCode.equals(reference.getSubCode())){
@@ -311,15 +313,15 @@
if(quantity.intValue() == reference.getQuantity()){
break;
}else{
- return response.set(1,false,"缁撴瀯浠跺鎵规彁浜や腑鍒椾腑璐у搧缂栫爜:"+subCode+"瀵瑰簲鐨勬暟閲�:"+quantity+"鍦ㄥ弬鑰僢om琛ㄤ腑涓嶆纭�");
+ return response.set(1,false,excelName+"涓揣鍝佺紪鐮�:"+subCode+"瀵瑰簲鐨勬暟閲�:"+quantity+"鍦ㄥ弬鑰僢om琛ㄤ腑涓嶆纭�");
}
}else{
- return response.set(1,false,"缁撴瀯浠跺鎵规彁浜や腑鍒椾腑璐у搧缂栫爜:"+subCode+"瀵瑰簲鐨勮鏍煎瀷鍙�:"+subModel+"鍦ㄥ弬鑰僢om琛ㄤ腑涓嶆纭�");
+ return response.set(1,false,excelName+"涓揣鍝佺紪鐮�:"+subCode+"瀵瑰簲鐨勮鏍煎瀷鍙�:"+subModel+"鍦ㄥ弬鑰僢om琛ㄤ腑涓嶆纭�");
}
}
}
if(!exists){
- return response.set(1,false,"缁撴瀯浠跺鎵规彁浜や腑鍒椾腑璐у搧缂栫爜:"+subCode+"鍦ㄥ弬鑰僢om琛ㄤ腑涓嶅瓨鍦�");
+ return response.set(1,false,excelName+"涓揣鍝佺紪鐮�:"+subCode+"鍦ㄥ弬鑰僢om琛ㄤ腑涓嶅瓨鍦�");
}
ProductBomApproving reference = referenceList.get(0);
sub.setParentCode(reference.getParentCode());
--
Gitblit v1.9.1