Merge remote-tracking branch 'origin/master'

lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java

@@ -117,25 +117,26 @@ public class LogAspect {
             }
         }catch (Exception ex){
             StringBuffer errorStack = new StringBuffer();
+            errorStack.append("<br/>【异常堆栈:");
             String errorMsg = ex.getMessage();
             int x = 0;
             StackTraceElement[] stackTrace = ex.getStackTrace();
             if (stackTrace!=null && stackTrace.length>0){
                 for (StackTraceElement stack : stackTrace) {
                     x++;
-                    errorStack.append(stack.toString()).append(" | ");
+                    errorStack.append(stack.toString().replaceAll("<",">")).append("<br/>");
                     if (x>10){
                         break;
                     }
                 }
             }
-            log.error("[-requestError-][请求接口:{}]【异常信息:{}】[请求参数:{}][异常堆栈:{}]", url,errorMsg,params, errorStack.toString());
+            log.error("[-requestError-][请求接口:{}]【异常信息:{}】[请求参数:{}] {}", url,errorMsg,params, errorStack.append("】").toString());
             Log log = new Log("ERROR", System.currentTimeMillis() - comming);
             log.setExceptionDetail(ThrowableUtil.getStackTrace(ex).getBytes());
             logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint) joinPoint, log);
             throw  ex;
         }finally {
-            log.info("[--response--][接口:{} 执行结束][耗时:{}s]",url,(System.currentTimeMillis() - comming)/1000);
+            log.info("[--response--][请求接口:{} 执行结束][耗时:{}s]",url,(System.currentTimeMillis() - comming)/1000);
             MDC.clear();
         }
         return result;

lms/nladmin-system/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml

@@ -67,7 +67,7 @@
         sys_roles_menus
         WHERE
         role_id IN ( SELECT role_id FROM sys_users_roles  where user_id = #{user})
-        )
+        ) order by menu_sort
     </select>
     <select id="getMenusByRole" resultType="java.util.Map">
         SELECT

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/st/wql/PDA_CHECK.wql

@@ -98,7 +98,7 @@
 
 	IF 输入.flag = "2"
 		QUERY
-			SELECT
+			SELECT DISTINCT
             	dtl.check_code,
             	(
             	    CASE

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-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql

@@ -17,6 +17,8 @@
 	输入.pcsn					                 TYPEAS s_string
 	输入.struct_id					             TYPEAS s_string
 	输入.iostorinv_id					         TYPEAS s_string
+	输入.width					         TYPEAS s_string
+	输入.thickness					         TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -121,4 +123,55 @@
 
 			ENDSELECT
 		ENDQUERY
-	ENDIF
+	ENDIF
+
+    IF 输入.flag = "5"
+		QUERY
+            SELECT
+              	sub.width,
+              	sub.thickness
+            FROM
+                ST_IVT_IOStorInvDis dis
+                LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_sn = dis.box_no
+            WHERE
+                1 = 1
+
+                OPTION 输入.iostorinv_id <> ""
+                        dis.iostorinv_id = 输入.iostorinv_id
+                ENDOPTION
+
+                group by sub.width,sub.thickness
+
+			ENDSELECT
+		ENDQUERY
+	ENDIF
+
+    IF 输入.flag = "6"
+		QUERY
+            SELECT
+                sub.package_box_sn AS box_no,
+                MAX( sub.product_description ) AS material_name,
+                SUM( sub.net_weight ) AS qty
+            FROM
+              	ST_IVT_IOStorInvDis dis
+              	LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn
+            WHERE
+                1 = 1
+
+                OPTION 输入.iostorinv_id <> ""
+                        dis.iostorinv_id = 输入.iostorinv_id
+                ENDOPTION
+
+                OPTION 输入.width <> ""
+                        sub.width = 输入.width
+                ENDOPTION
+
+                OPTION 输入.thickness <> ""
+                        sub.width = 输入.thickness
+                ENDOPTION
+
+                group by sub.package_box_sn
+
+			ENDSELECT
+		ENDQUERY
+	ENDIF

lms/nladmin-system/src/main/resources/logback-spring.xml

@@ -187,7 +187,7 @@ https://juejin.cn/post/6844903775631572999
 
     <!--生产环境:打印控制台和输出到文件-->
     <springProfile name="prod">
-        <root level="debug">
+        <root level="info">
             <appender-ref ref="asyncFileAppender"/>
             <appender-ref ref="ERROR" />
             <appender-ref ref="esLogAppender" />

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