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 638cea79e..63fcfd747 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
@@ -787,6 +787,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             throw new BadRequestException("查不到出库单信息");
         }
 
+        // 如果是发货出库则判断运费和物流公司不能为空
+        String bill_type = jo_mst.getString("bill_type");
+        if (StrUtil.equals(bill_type, "1001")) {
+            String trans_code = jo_mst.getString("trans_code");
+            String estimated_freight = jo_mst.getString("estimated_freight");
+
+            if (ObjectUtil.isEmpty(trans_code)) throw new BadRequestException("物流公司不能为空");
+            if (ObjectUtil.isEmpty(estimated_freight)) throw new BadRequestException("预估运费不能为空");
+
+        }
+
         //查询生成和未分配完的明细
         JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL")
                 .addParam("flag", "2")
@@ -1010,6 +1021,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             throw new BadRequestException("查不到出库单信息");
         }
 
+        // 如果是发货出库则判断运费和物流公司不能为空
+        String bill_type = jo_mst.getString("bill_type");
+        if (StrUtil.equals(bill_type, "1001")) {
+            String trans_code = jo_mst.getString("trans_code");
+            String estimated_freight = jo_mst.getString("estimated_freight");
+
+            if (ObjectUtil.isEmpty(trans_code)) throw new BadRequestException("物流公司不能为空");
+            if (ObjectUtil.isEmpty(estimated_freight)) throw new BadRequestException("预估运费不能为空");
+
+        }
+
         //查询生成和未分配完的明细
         JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL")
                 .addParam("flag", "2")
@@ -3659,6 +3681,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             throw new BadRequestException("当前订单无可分配出库明细");
         }
 
+        // 如果是发货出库则判断运费和物流公司不能为空
+        String bill_type = jo_mst.getString("bill_type");
+        if (StrUtil.equals(bill_type, "1001")) {
+            String trans_code = jo_mst.getString("trans_code");
+            String estimated_freight = jo_mst.getString("estimated_freight");
+
+            if (ObjectUtil.isEmpty(trans_code)) throw new BadRequestException("物流公司不能为空");
+            if (ObjectUtil.isEmpty(estimated_freight)) throw new BadRequestException("预估运费不能为空");
+
+        }
+
         //查询生成和未分配完的明细
         JSONObject dtl = WQL.getWO("QST_IVT_CHECKOUTBILL")
                 .addParam("flag", "2")
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 9b1daba43..9156a1ae4 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
@@ -456,16 +456,6 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                     // 1.回传sap
                     JSONArray paramSapMstArr = new JSONArray();
 
-                    String estimated_freight = jo_mst.getString("estimated_freight");
-                    String trans_code = jo_mst.getString("trans_code");
-
-                    if (ObjectUtil.isEmpty(estimated_freight)) {
-                        throw new BadRequestException("运费不能为空");
-                    }
-                    if (ObjectUtil.isEmpty(trans_code)) {
-                        throw new BadRequestException("物流公司不能为空");
-                    }
-
                     JSONObject paramSapMst = new JSONObject();
                     paramSapMst.put("ZACTION", "P");
                     paramSapMst.put("BUDAT", jo_mst.getString("biz_date"));
@@ -931,16 +921,6 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                 // 1.回传sap
                 JSONArray paramSapMstArr = new JSONArray();
 
-                String estimated_freight = jo_mst.getString("estimated_freight");
-                String trans_code = jo_mst.getString("trans_code");
-
-                if (ObjectUtil.isEmpty(estimated_freight)) {
-                    throw new BadRequestException("运费不能为空");
-                }
-                if (ObjectUtil.isEmpty(trans_code)) {
-                    throw new BadRequestException("物流公司不能为空");
-                }
-
                 JSONObject paramSapMst = new JSONObject();
                 paramSapMst.put("ZACTION", "P");
                 paramSapMst.put("BUDAT", jo_mst.getString("biz_date"));
diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue
index de4fb0fbd..9af753984 100644
--- a/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue
@@ -130,7 +130,7 @@
     </el-form>
     <el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}" style="margin-top: 5px;">
       <el-form ref="form2" :inline="true" :model="form" :rules="rules" size="mini">
-        <el-form-item label="销售订单-新" prop="new_sale_order_name">
+        <el-form-item label="销售订单及行号-新" prop="new_sale_order_name">
         <el-input v-model="form.new_sale_order_name" :disabled="crud.status.view > 0" class="input-with-select"/>
         </el-form-item>
         <el-form-item label="客户编码-新" prop="new_sale_order_name">