diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 607c16a4b..e2cdd8294 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -2084,17 +2084,18 @@ public class EmisBaseService { String mainBillCode="T70803005000020002"; -// boolean isSubBill=false; -// // 判断是否是子单 -// String queryBillCode=""; -// if(mainBillCode.startsWith("T7080") && mainBillCode.length()>14 ){ -// isSubBill = true; -// queryBillCode=mainBillCode.substring(0,14); -// String subBillSuffix=mainBillCode.substring(14); -// System.out.println(mainBillCode); -// System.out.println(queryBillCode); -// System.out.println(Integer.valueOf(subBillSuffix)); -// } + boolean isSubBill=false; + // 判断是否是子单 + String queryBillCode=""; + if(mainBillCode.startsWith("T7080") && mainBillCode.length()>14 ){ + isSubBill = true; + queryBillCode=mainBillCode.substring(0,14); + int len=mainBillCode.length(); + String subBillSuffix=mainBillCode.substring(len-4); + System.out.println(mainBillCode); + System.out.println(subBillSuffix); + System.out.println(Integer.valueOf(subBillSuffix)); + } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index 328fd18a4..cef8cd975 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -192,7 +192,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm String mainBillCode = getMainBillCode(scanBillCode); // 判断是主单还是子单 - boolean isExists = checkWaybillIsExists(mainBillCode); + boolean isExists = checkWaybillIsExists(scanBillCode); // 检查运单号是否存在 if (!isExists) { scanResultItem.setResult("fail"); @@ -275,9 +275,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm throw new EmisBizError(EmisBizErrorType.PARAM_ERROR1,"扫描单号必填"); } - - - billCodeInStr=WaybillHelper.formatQueryValue(billCodeInStr); String[] billCodeArr = billCodeInStr.split(","); @@ -307,7 +304,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 获取主单号 String mainBillCode = getMainBillCode(scanBillCode); // 判断单号是否存在 - boolean isExists = checkWaybillIsExists(mainBillCode); + boolean isExists = checkWaybillIsExists(scanBillCode); // 检查运单号是否存在 if (!isExists) { scanResultItem.setResult("fail"); @@ -388,8 +385,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 获取主单号 String mainBillCode = getMainBillCode(scanBillCode); - // 判断是主单还是子单 - boolean isExists = checkWaybillIsExists(mainBillCode); + // 判断是否存在 + boolean isExists = checkWaybillIsExists(scanBillCode); // 检查运单号是否存在 if (!isExists) { scanResultItem.setResult("fail");