Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

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/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/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/loki/view/index.vue

@@ -157,7 +157,7 @@
               <span style="color: #7c8db0">{{ log.requestTime }}</span>
               <span style="color: chocolate">{{ log.traceId }}</span>
               <span style="color: #7a6df0">{{ log.requestMethod }}</span>
-              <span style="margin: 5px;font-size: 15px">-----{{ log.message }}</span>
+              <span style="margin: 5px;font-size: 15px" v-html="log.message">{{ log.message }}</span>
             </div>
           </div>
         </div>

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