aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-21 14:52:13 +08:00
parent 5a61196fe5
commit 2f316317e7
1 changed files with 43 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -171,28 +171,16 @@ public class EmisBaseService {
* @return * @return
*/ */
public String getMainBillCode(String billCode){ public String getMainBillCode(String billCode){
// 判断是否是子单
String mainBillCode = "";
String subSeqNo="";
if(billCode.startsWith("T7080") && billCode.length()>14 ){
mainBillCode=billCode.substring(0,14);
}
else{
// 不是探路主单号是否
// 查询数据看下是否主单，如果不是则同样剔除4位 // 查询数据看下是否主单，如果不是则同样剔除4位
boolean isExists=checkWaybillIsExists(billCode); boolean isExists=checkWaybillIsExists(billCode);
if(isExists){ if(isExists){
mainBillCode=billCode; return billCode;
}else{ }
String mainBillCode = billCode;
if(billCode.length()>5){ if(billCode.length()>4){
int len=billCode.length(); int len=billCode.length();
mainBillCode=billCode.substring(0,len-4); mainBillCode=billCode.substring(0,len-4);
} }
}
}
return mainBillCode; return mainBillCode;
} }
@ -1409,38 +1397,33 @@ public class EmisBaseService {
* @return * @return
*/ */
public boolean checkWaybillIsExists(String billCode){ public boolean checkWaybillIsExists(String billCode){
// 判断是否是子单
String mainBillCode = ""; if(StringUtils.isEmpty(billCode)){
String subNumStr=""; return false;
if(billCode.startsWith("T7080") && billCode.length()>14 ){
mainBillCode=billCode.substring(0,14);
} }
else{
// 不是探路主单号是否 String queryBillCode=billCode.trim();
// 查询数据看下是否主单，如果不是则同样剔除4位 // 查询数据看下是否主单，如果不是则同样剔除4位
boolean isExists=emisWaybillMapper.checkWaybillIsExists(billCode)==1; boolean isExists=emisWaybillMapper.checkWaybillIsExists(queryBillCode)==1;
if(isExists){ if(isExists){
mainBillCode=billCode;
return true; return true;
}else{
if(billCode.length()>4){
int len=billCode.length();
subNumStr=billCode.substring(len-4);
if(Integer.valueOf(subNumStr)<=0){
return false;
} }
}
else{ if(queryBillCode.trim().length()<=4){
return false; return false;
} }
} int len=queryBillCode.length();
String subNumStr=queryBillCode.substring(len-4);
String mainBillCode=queryBillCode.substring(0,len-4);
try {
return emisWaybillMapper.checkSubBillIsExists(mainBillCode,Integer.valueOf(subNumStr))==1;
}catch (Exception ex){
return false;
} }
Integer subNum=Integer.valueOf(subNumStr);
return emisWaybillMapper.checkSubBillIsExists(mainBillCode,subNum)==1;
} }
@ -2086,20 +2069,19 @@ public class EmisBaseService {
// System.out.println(packageWJC); // System.out.println(packageWJC);
// System.out.println(package3dm); // System.out.println(package3dm);
String mainBillCode="T70803005000020002"; String billCode="T7080300200ab";
boolean isSubBill=false; boolean isSubBill=false;
// 判断是否是子单
String queryBillCode="";
if(mainBillCode.startsWith("T7080") && mainBillCode.length()>14 ){
isSubBill = true; isSubBill = true;
queryBillCode=mainBillCode.substring(0,14); // queryBillCode=mainBillCode.substring(0,14);
int len=mainBillCode.length(); int len=billCode.length();
String subBillSuffix=mainBillCode.substring(len-4); String subBillSuffix=billCode.substring(len-4);
String mainBillCode = billCode.substring(0,len-4);
System.out.println(mainBillCode); System.out.println(mainBillCode);
System.out.println(subBillSuffix); System.out.println(subBillSuffix);
System.out.println(Integer.valueOf(subBillSuffix)); System.out.println(Integer.valueOf(subBillSuffix));
}