diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
index bdbd0e5d6..7e35792cd 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
@@ -823,9 +823,14 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
             if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
                 throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!");
             }
-            map.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
-            map.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
 
+            try {
+                map.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
+                map.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
+            } catch (Exception e) {
+                map.put("销售订单", json.getString("sale_order_name"));
+                map.put("行号", "");
+            }
             String statusName = "";
             if (StrUtil.equals(json.getString("work_status"), "00")) {
                 statusName = "未生成";
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
index db06fd85b..e69a1c662 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
@@ -278,8 +278,13 @@ public class InBillQueryServiceImpl implements InBillQueryService {
                 if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
                     throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!");
                 }
-                mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
-                mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
+                try {
+                    mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
+                    mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
+                } catch (Exception e) {
+                    mp.put("销售订单", json.getString("sale_order_name"));
+                    mp.put("行号", "");
+                }
                 mp.put("客户编码", json.getString("customer_name"));
                 mp.put("规格", json.getString("thickness_request"));
                 mp.put("尺寸（mm）（客户要求幅宽）", String.format("%.0f", json.getDoubleValue("width_standard")));
@@ -327,8 +332,14 @@ public class InBillQueryServiceImpl implements InBillQueryService {
                 if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
                     throw new BadRequestException("箱号"+json.getString("box_no")+"销售订单为空!");
                 }
-                mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
-                mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
+                try {
+                    mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
+                    mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
+                } catch (Exception e) {
+                    mp.put("销售订单", json.getString("sale_order_name"));
+                    mp.put("行号", "");
+                }
+
                 mp.put("生产日期", json.getString("date_of_production").replace("-","/"));
                 mp.put("箱号", json.getString("box_no"));
                 mp.put("生产批号", (json.getString("confirm_time").substring(0,10)).replace("-","").trim());
@@ -413,8 +424,13 @@ public class InBillQueryServiceImpl implements InBillQueryService {
                 if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
                     throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!");
                 }
-                mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
-                mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
+                try {
+                    mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
+                    mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
+                } catch (Exception e) {
+                    mp.put("销售订单", json.getString("sale_order_name"));
+                    mp.put("行号", "");
+                }
                 mp.put("客户编码", json.getString("customer_name"));
                 mp.put("规格", json.getString("thickness_request"));
                 mp.put("尺寸（mm）（客户要求幅宽）", String.format("%.0f", json.getDoubleValue("width_standard")));
@@ -462,8 +478,13 @@ public class InBillQueryServiceImpl implements InBillQueryService {
                 if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
                     throw new BadRequestException("箱号"+json.getString("box_no")+"销售订单为空!");
                 }
-                mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
-                mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
+                try {
+                    mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
+                    mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
+                } catch (Exception e) {
+                    mp.put("销售订单", json.getString("sale_order_name"));
+                    mp.put("行号", "");
+                }
                 mp.put("生产日期", json.getString("date_of_production").replace("-","/"));
                 mp.put("箱号", json.getString("box_no"));
                 mp.put("生产批号", (json.getString("confirm_time").substring(0,10)).replace("-","").trim());
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java
index 40b184cf9..98cca8fda 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java
@@ -186,8 +186,13 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
             if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
                 throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!");
             }
-            mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
-            mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
+            try {
+                mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
+                mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
+            } catch (Exception e) {
+                mp.put("销售订单", json.getString("sale_order_name"));
+                mp.put("行号", "");
+            }
             mp.put("出库日期", json.getString("input_time"));
             mp.put("产品规格", String.format("%.0f", json.getDoubleValue("width")));
             mp.put("产品厚度", json.getString("thickness"));
@@ -253,8 +258,13 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
             if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
                 throw new BadRequestException("子卷"+json.getString("pcsn")+"销售订单为空!");
             }
-            mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
-            mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
+            try {
+                mp.put("销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
+                mp.put("行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-")+1,json.getString("sale_order_name").length()));
+            } catch (Exception e) {
+                mp.put("销售订单", json.getString("sale_order_name"));
+                mp.put("行号", "");
+            }
             mp.put("出库日期", json.getString("input_time"));
             mp.put("产品规格", String.format("%.0f", json.getDoubleValue("width")));
             mp.put("产品厚度", json.getString("thickness"));