This commit is contained in:
linfso 2024-06-05 16:55:26 +08:00
parent 29f20ff7ae
commit 569a22fbb6
2 changed files with 20 additions and 12 deletions

View File

@ -241,9 +241,11 @@ public class EmisTmsScanRecordController extends EmisBaseController
setPrivParams(emisTmsScanRecord); setPrivParams(emisTmsScanRecord);
if(!StringUtils.isEmpty(emisTmsScanRecord.getBillCode())){ if(!StringUtils.isEmpty(emisTmsScanRecord.getBillCode())){
if(emisTmsScanRecord.getBillCode().lastIndexOf(",")!=-1) {
StringBuilder sb = new StringBuilder(emisTmsScanRecord.getBillCode()); StringBuilder sb = new StringBuilder(emisTmsScanRecord.getBillCode());
sb.deleteCharAt(sb.lastIndexOf(",")); sb.deleteCharAt(sb.lastIndexOf(","));
emisTmsScanRecord.setBillCode(sb.toString()); emisTmsScanRecord.setBillCode(sb.toString());
}
String[] billCodeSortList = emisTmsScanRecord.getBillCode().split(","); String[] billCodeSortList = emisTmsScanRecord.getBillCode().split(",");
if(billCodeSortList.length>1){ if(billCodeSortList.length>1){
@ -252,9 +254,11 @@ public class EmisTmsScanRecordController extends EmisBaseController
} }
if(!StringUtils.isEmpty(emisTmsScanRecord.getOrderSn())){ if(!StringUtils.isEmpty(emisTmsScanRecord.getOrderSn())){
if(emisTmsScanRecord.getOrderSn().lastIndexOf(",")!=-1) {
StringBuilder sb = new StringBuilder(emisTmsScanRecord.getOrderSn()); StringBuilder sb = new StringBuilder(emisTmsScanRecord.getOrderSn());
sb.deleteCharAt(sb.lastIndexOf(",")); sb.deleteCharAt(sb.lastIndexOf(","));
emisTmsScanRecord.setOrderSn(sb.toString()); emisTmsScanRecord.setOrderSn(sb.toString());
}
String[] orderSnSortList = emisTmsScanRecord.getOrderSn().split(","); String[] orderSnSortList = emisTmsScanRecord.getOrderSn().split(",");
if(orderSnSortList.length>1){ if(orderSnSortList.length>1){
emisTmsScanRecord.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList)); emisTmsScanRecord.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));

View File

@ -298,9 +298,11 @@ public class EmisWaybillController extends EmisBaseController
if(!StringUtils.isEmpty(emisWaybill.getBillCode())){ if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
if(emisWaybill.getBillCode().lastIndexOf(",")!=-1) {
StringBuilder sb = new StringBuilder(emisWaybill.getBillCode()); StringBuilder sb = new StringBuilder(emisWaybill.getBillCode());
sb.deleteCharAt(sb.lastIndexOf(",")); sb.deleteCharAt(sb.lastIndexOf(","));
emisWaybill.setBillCode(sb.toString()); emisWaybill.setBillCode(sb.toString());
}
String[] billCodeSortList = emisWaybill.getBillCode().split(","); String[] billCodeSortList = emisWaybill.getBillCode().split(",");
if(billCodeSortList.length>1){ if(billCodeSortList.length>1){
@ -309,9 +311,11 @@ public class EmisWaybillController extends EmisBaseController
} }
if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){ if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
if(emisWaybill.getOrderSn().lastIndexOf(",")!=-1) {
StringBuilder sb = new StringBuilder(emisWaybill.getOrderSn()); StringBuilder sb = new StringBuilder(emisWaybill.getOrderSn());
sb.deleteCharAt(sb.lastIndexOf(",")); sb.deleteCharAt(sb.lastIndexOf(","));
emisWaybill.setOrderSn(sb.toString()); emisWaybill.setOrderSn(sb.toString());
}
String[] orderSnSortList = emisWaybill.getOrderSn().split(","); String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
if(orderSnSortList.length>1){ if(orderSnSortList.length>1){
emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList)); emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));