diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
index 99fdcaed5..3acac5f49 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -2873,7 +2873,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 String box_no = json.getString("box_no");
                 String sub_box_no = "";
                 if (ObjectUtil.isNotEmpty(box_no)) {
-                    sub_box_no = box_no.substring(box_no.lastIndexOf("@")+1, box_no.length());
+                    try {
+                        sub_box_no = box_no.substring(box_no.lastIndexOf("@")+1, box_no.length());
+                    } catch (Exception e) {
+                        sub_box_no = box_no;
+                    }
                 }
 
                 HashMap<String, Object> mapFL = new HashMap<>();
@@ -2920,7 +2924,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 String box_no = json.getString("box_no");
                 String sub_box_no = "";
                 if (ObjectUtil.isNotEmpty(box_no)) {
-                    sub_box_no = box_no.substring(box_no.lastIndexOf("@")+1, box_no.length());
+                    try {
+                        sub_box_no = box_no.substring(box_no.lastIndexOf("@")+1, box_no.length());
+                    } catch (Exception e) {
+                        sub_box_no = box_no;
+                    }
                 }
 
                 HashMap<String, Object> mapFL = new HashMap<>();
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
index 00d004d59..63b23e576 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
@@ -165,7 +165,7 @@
                     LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = iosdtl.iostorinv_id
                     LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = iosdtl.pcsn
                     WHERE
-                        1=1
+                        sub.status = '2'
                     OPTION 输入.iostorinv_id <> ""
                           iosdtl.iostorinv_id = 输入.iostorinv_id
                     ENDOPTION
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 eea4f6926..93036b737 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
@@ -985,9 +985,9 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     new LmsToMesServiceImpl().childRollFGOutboundComplete(paramMesMst);
 
                     jo_mst.put("upload_mes", "1");
-                    jo_mst.put("is_upload", "1");
-                    WQLObject.getWQLObject("ST_IVT_IOStorInv").update(jo_mst);
                 }
+                jo_mst.put("is_upload", "1");
+                WQLObject.getWQLObject("ST_IVT_IOStorInv").update(jo_mst);
             }
 
             // 改切出库
diff --git a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
index 0ab41e779..ec1831a40 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
@@ -506,6 +506,9 @@ export default {
         date_of_production: [
           { required: true, message: '制造完成日期不能为空', trigger: 'blur' }
         ],
+        sale_order_name: [
+          { required: true, message: '销售订单及行号不能为空', trigger: 'blur' }
+        ],
         is_un_plan_production: [
           { required: true, message: '计划外分切的子卷不能为空', trigger: 'blur' }
         ],