huojin
/
sdtms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2024-12-09 09:40:14 +08:00
parent 861c5a3901
commit 0f0ea4dd2b
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/dev/stms/server/service/order/pojo/DefaultOrderManager.java
View File

@ -6993,6 +6993,7 @@ public class DefaultOrderManager extends DefaultBaseManager implements
// 收货地址 收货联系 收货电话 物料名称 波次 波次代码 // 收货地址 收货联系 收货电话 物料名称 波次 波次代码
HashMap<String,String> code_map_old=new HashMap<String, String>(); HashMap<String,String> code_map_old=new HashMap<String, String>();
HashMap<String,String> code_map=new HashMap<String, String>(); HashMap<String,String> code_map=new HashMap<String, String>();
HashMap<String,Organization> org_map=new HashMap<String, Organization>();
for (int i = 1; i < sheet.getRows(); i++) { for (int i = 1; i < sheet.getRows(); i++) {
String consignorName = sheet.getCell(0, i).getContents();// 货主名称 String consignorName = sheet.getCell(0, i).getContents();// 货主名称
String relateBill2 = sheet.getCell(1, i).getContents();// 物流单号 String relateBill2 = sheet.getCell(1, i).getContents();// 物流单号
@ -7004,6 +7005,7 @@ public class DefaultOrderManager extends DefaultBaseManager implements
Organization org = new Organization(); Organization org = new Organization();
if (organizations.size() > 0) { if (organizations.size() > 0) {
org = organizations.get(0); org = organizations.get(0);
org_map.put(consignorName, org);
} else { } else {
throw new BusinessException("第" + (i + 1) + "行，客户不存在！"); throw new BusinessException("第" + (i + 1) + "行，客户不存在！");
} }
@ -7099,15 +7101,8 @@ public class DefaultOrderManager extends DefaultBaseManager implements
if (consignorName == null || consignorName.equals("")) { if (consignorName == null || consignorName.equals("")) {
return; return;
} }
List<Organization> organizations = this.commonDao
.findByQuery( Organization org = org_map.get(consignorName);
"from Organization o where o.shortName=:name or o.code=:code",
new String[] { "name", "code" }, new Object[] {
consignorName, consignorName });
Organization org = new Organization();
if (organizations.size() > 0) {
org = organizations.get(0);
}
if(code_map_old.containsKey(xsqdh)){ if(code_map_old.containsKey(xsqdh)){
continue;//如果已存在的单号，不需要读取了 continue;//如果已存在的单号，不需要读取了
} }