diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
index a7430cc76..2ee8fbe17 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
@@ -241,9 +241,11 @@ public class EmisTmsScanRecordController extends EmisBaseController
         setPrivParams(emisTmsScanRecord);
 
         if(!StringUtils.isEmpty(emisTmsScanRecord.getBillCode())){
-            StringBuilder sb = new StringBuilder(emisTmsScanRecord.getBillCode());
-            sb.deleteCharAt(sb.lastIndexOf(","));
-            emisTmsScanRecord.setBillCode(sb.toString());
+            if(emisTmsScanRecord.getBillCode().lastIndexOf(",")!=-1) {
+                StringBuilder sb = new StringBuilder(emisTmsScanRecord.getBillCode());
+                sb.deleteCharAt(sb.lastIndexOf(","));
+                emisTmsScanRecord.setBillCode(sb.toString());
+            }
 
             String[] billCodeSortList = emisTmsScanRecord.getBillCode().split(",");
             if(billCodeSortList.length>1){
@@ -252,9 +254,11 @@ public class EmisTmsScanRecordController extends EmisBaseController
         }
 
         if(!StringUtils.isEmpty(emisTmsScanRecord.getOrderSn())){
-            StringBuilder sb = new StringBuilder(emisTmsScanRecord.getOrderSn());
-            sb.deleteCharAt(sb.lastIndexOf(","));
-            emisTmsScanRecord.setOrderSn(sb.toString());
+            if(emisTmsScanRecord.getOrderSn().lastIndexOf(",")!=-1) {
+                StringBuilder sb = new StringBuilder(emisTmsScanRecord.getOrderSn());
+                sb.deleteCharAt(sb.lastIndexOf(","));
+                emisTmsScanRecord.setOrderSn(sb.toString());
+            }
             String[] orderSnSortList = emisTmsScanRecord.getOrderSn().split(",");
             if(orderSnSortList.length>1){
                 emisTmsScanRecord.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index 9b29459c5..47ce6f257 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -298,9 +298,11 @@ public class EmisWaybillController extends EmisBaseController
 
 
         if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
-            StringBuilder sb = new StringBuilder(emisWaybill.getBillCode());
-            sb.deleteCharAt(sb.lastIndexOf(","));
-            emisWaybill.setBillCode(sb.toString());
+            if(emisWaybill.getBillCode().lastIndexOf(",")!=-1) {
+                StringBuilder sb = new StringBuilder(emisWaybill.getBillCode());
+                sb.deleteCharAt(sb.lastIndexOf(","));
+                emisWaybill.setBillCode(sb.toString());
+            }
 
             String[] billCodeSortList = emisWaybill.getBillCode().split(",");
             if(billCodeSortList.length>1){
@@ -309,9 +311,11 @@ public class EmisWaybillController extends EmisBaseController
         }
 
         if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
-            StringBuilder sb = new StringBuilder(emisWaybill.getOrderSn());
-            sb.deleteCharAt(sb.lastIndexOf(","));
-            emisWaybill.setOrderSn(sb.toString());
+            if(emisWaybill.getOrderSn().lastIndexOf(",")!=-1) {
+                StringBuilder sb = new StringBuilder(emisWaybill.getOrderSn());
+                sb.deleteCharAt(sb.lastIndexOf(","));
+                emisWaybill.setOrderSn(sb.toString());
+            }
             String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
             if(orderSnSortList.length>1){
                 emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));