Merge remote-tracking branch 'origin/master'

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql

@@ -446,6 +446,8 @@
                 plan.qzzno = 输入.qzzno
             AND
                 plan.is_delete = '0'
+            AND
+                plan.is_child_ps_ok = '0'
             OPTION 输入.product_area <> ""
                 cut.product_area = 输入.product_area
             ENDOPTION

lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql

@@ -60,14 +60,14 @@
 			    ) AS task_status,
 			    class.class_name AS task_type,
 			    car_no,
-			    create_time,
+			    task.create_time,
 			    vehicle_code2,
 			    material_code
             FROM
             	SCH_BASE_Task task
             LEFT JOIN md_pb_classstandard class ON class.class_code = task.task_type
             WHERE
-                is_delete = '0'
+                task.is_delete = '0'
                 AND task_status <> '07'
 
                 OPTION 输入.search <> ""

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")

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">