From 495e97cbae51d4d183673e2b969943711e805647 Mon Sep 17 00:00:00 2001
From: ldj_willow <ldj_willow@163.com>
Date: Tue, 25 Oct 2022 11:12:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lms/nladmin-system/.gitignore                 |  1 -
 .../src/main/resources/config/application.yml |  7 +-
 .../src/main/resources/logback-spring.xml     | 96 ++++++++++++++-----
 .../wms/pdm/order/rawfoilworkorder/index.vue  | 10 +-
 .../wms/pdm/order/slittingplan/index.vue      | 26 ++---
 5 files changed, 91 insertions(+), 49 deletions(-)

diff --git a/lms/nladmin-system/.gitignore b/lms/nladmin-system/.gitignore
index aee03fecc..caa1a2aa2 100644
--- a/lms/nladmin-system/.gitignore
+++ b/lms/nladmin-system/.gitignore
@@ -6,4 +6,3 @@
 */*.iml
 /.gradle/
 /target/*
-src/main/resources/config/application-dev.yml
\ No newline at end of file
diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml
index 92c573466..f3b1af882 100644
--- a/lms/nladmin-system/src/main/resources/config/application.yml
+++ b/lms/nladmin-system/src/main/resources/config/application.yml
@@ -30,11 +30,6 @@ task:
     # 队列容量
     queue-capacity: 50
 
-#七牛云
-qiniu:
-  # 文件大小 /M
-  max-size: 15
-
 #邮箱验证码有效时间/秒
 code:
   expiration: 300
@@ -44,7 +39,7 @@ rsa:
   private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
 logging:
   file:
-    path: C:\log\wms
+    path: C:\log\lms
   config: classpath:logback-spring.xml
 # sa-token白名单配置
 security:
diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml
index f8547a761..c4e5e9403 100644
--- a/lms/nladmin-system/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/src/main/resources/logback-spring.xml
@@ -77,27 +77,44 @@ https://juejin.cn/post/6844903775631572999
 
     <!--开发环境:打印控制台-->
     <springProfile name="dev">
-        <root level="info">
+        <root level="debug">
             <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="lokiAppender" />
+            <appender-ref ref="lokiAppender"/>
         </root>
-
-        <logger name="jdbc.audit" level="ERROR" additivity="false">
+        <logger name="org.springframework" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.sqltiming" level="ERROR" additivity="false">
+        <logger name="org.apache" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.resultset" level="ERROR" additivity="false">
+        <logger name="org.hibernate" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="springfox.documentation" level="ERROR" additivity="false">
+        <logger name="io.netty" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.resultsettable" level="ERROR" additivity="false">
+        <logger name="jdbc" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
-        <logger name="jdbc.sqlonly" level="ERROR" additivity="false">
+        <logger name="io.lettuce" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="com.fasterxml" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="org.quartz" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="com.google" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="springfox" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="log4jdbc" level="ERROR" additivity="false">
+            <appender-ref ref="CONSOLE"/>
+        </logger>
+        <logger name="nl.basjes" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
     </springProfile>
@@ -105,35 +122,66 @@ https://juejin.cn/post/6844903775631572999
 
     <!--生产环境:打印控制台和输出到文件-->
     <springProfile name="prod">
-        <root level="info">
+        <root level="debug">
             <appender-ref ref="asyncFileAppender"/>
-            <appender-ref ref="lokiAppender" />
+            <appender-ref ref="lokiAppender"/>
         </root>
-        <logger name="jdbc.sqltiming" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+        <logger name="org.springframework" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="lokiAppender"/>
         </logger>
-        <logger name="jdbc.audit" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+        <logger name="org.apache" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="lokiAppender"/>
         </logger>
-        <logger name="jdbc.resultset" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+        <logger name="org.hibernate" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="lokiAppender"/>
         </logger>
-        <logger name="springfox.documentation" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+        <logger name="io.netty" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="lokiAppender"/>
         </logger>
-        <logger name="jdbc.resultsettable" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+        <logger name="jdbc" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="lokiAppender"/>
         </logger>
-        <logger name="jdbc.sqlonly" level="ERROR" additivity="false">
-            <appender-ref ref="CONSOLE"/>
+        <logger name="io.lettuce" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="lokiAppender"/>
+        </logger>
+        <logger name="com.fasterxml" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="lokiAppender"/>
+        </logger>
+        <logger name="org.quartz" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="lokiAppender"/>
+        </logger>
+        <logger name="com.google" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="lokiAppender"/>
+        </logger>
+        <logger name="springfox" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="lokiAppender"/>
+        </logger>
+        <logger name="log4jdbc" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="lokiAppender"/>
+        </logger>
+        <logger name="nl.basjes" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="lokiAppender"/>
         </logger>
     </springProfile>
 
 
+
     <!--测试环境:打印控制台-->
     <springProfile name="test">
         <root level="info">
-            <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="CONSOLE"/>
         </root>
         <logger name="jdbc.audit" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
index e28c38b20..17c4f3726 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
@@ -145,15 +145,15 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="workorder_id" label="工单标识" />
-        <el-table-column prop="mfg_order_name" label="工单号" />
+        <el-table-column prop="mfg_order_name" label="工单号" min-width="120" show-overflow-tooltip/>
         <el-table-column prop="status" label="工单状态" :formatter="formatStatusName" />
-        <el-table-column prop="container_name" label="母卷号" />
-        <el-table-column prop="resource_name" label="机台编码" />
-        <el-table-column prop="product_name" label="产品编码" />
+        <el-table-column prop="container_name" label="母卷号" min-width="120" show-overflow-tooltip/>
+        <el-table-column prop="resource_name" label="机台编码" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="product_name" label="产品编码" min-width="150" show-overflow-tooltip/>
         <el-table-column prop="theory_height" label="理论长度" />
         <el-table-column prop="realstart_time" label="开始时间" width="150px" />
         <el-table-column prop="realend_time" label="结束时间" width="150px" />
-        <el-table-column prop="productin_qty" label="重量" />
+        <el-table-column prop="productin_qty" label="重量" :formatter="crud.formatNum3"/>
         <el-table-column prop="agvno" label="车号" />
         <el-table-column prop="product_area" label="生产区域" />
         <el-table-column prop="update_time" label="更新时间" width="150px" />
diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
index 1b6bb985d..e20b3e850 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
@@ -207,28 +207,28 @@
         <el-table-column v-if="false" prop="workorder_id" label="分切计划标识" />
         <el-table-column prop="status" label="状态" :formatter="formatStatusName"/>
         <el-table-column prop="order_type" label="订单类型" :formatter="formatTypeName"/>
-        <el-table-column prop="mfg_order_name" label="订单号" show-overflow-tooltip/>
-        <el-table-column prop="container_name" label="子卷号" />
-        <el-table-column prop="parent_container_name" label="母卷号" />
+        <el-table-column prop="mfg_order_name" label="订单号" min-width="140" show-overflow-tooltip/>
+        <el-table-column prop="container_name" label="子卷号" min-width="140" show-overflow-tooltip/>
+        <el-table-column prop="parent_container_name" label="母卷号" min-width="120" show-overflow-tooltip/>
         <el-table-column prop="ware_house" label="来源位置" :formatter="formatHouseName" width="120px" />
         <el-table-column prop="restruct_container_name" label="改制来源子卷号" width="120px"/>
         <el-table-column prop="package_box_sn" label="改制来源子卷木箱号" width="150px" />
-        <el-table-column prop="resource_name" label="机台编码" />
-        <el-table-column prop="product_name" label="产品编码" />
+        <el-table-column prop="resource_name" label="机台编码" min-width="110" show-overflow-tooltip/>
+        <el-table-column prop="product_name" label="产品编码" min-width="130" show-overflow-tooltip/>
         <el-table-column prop="product_area" label="生产区域" />
         <el-table-column prop="split_group" label="分切组" />
         <el-table-column prop="manufacture_sort" label="生产顺序" />
         <el-table-column prop="manufacture_date" label="生产日期" width="120px" />
-        <el-table-column prop="split_breadth" label="子卷幅宽" />
-        <el-table-column prop="split_height" label="子卷理论长度" width="120px" />
-        <el-table-column prop="split_weight" label="子卷理论重量" width="120px" />
+        <el-table-column prop="split_breadth" label="子卷幅宽"  :formatter="crud.formatNum3"/>
+        <el-table-column prop="split_height" label="子卷理论长度" width="100px"  :formatter="crud.formatNum3"/>
+        <el-table-column prop="split_weight" label="子卷理论重量" width="100px"  :formatter="crud.formatNum3"/>
         <el-table-column prop="paper_tube_or_frp" label="管件类型" :formatter="formatTubeName" />
-        <el-table-column prop="paper_tube_material" label="纸筒物料编码" width="120px" />
+        <el-table-column prop="paper_tube_material" label="纸筒物料编码" min-width="140" show-overflow-tooltip />
         <el-table-column prop="paper_tube_description" label="纸筒物料描述" width="120px" />
-        <el-table-column prop="paper_tube_model" label="纸筒规格" />
-        <el-table-column prop="frp_material" label="FRP管物料编码" width="120px" />
-        <el-table-column prop="frp_description" label="FRP管物料描述" width="120px" />
-        <el-table-column prop="frp_model" label="FRP管规格" width="100px" />
+        <el-table-column prop="paper_tube_model" label="纸筒规格" min-width="140" show-overflow-tooltip/>
+        <el-table-column prop="frp_material" label="FRP管物料编码" min-width="140" show-overflow-tooltip/>
+        <el-table-column prop="frp_description" label="FRP管物料描述" min-width="140" show-overflow-tooltip />
+        <el-table-column prop="frp_model" label="FRP管规格" min-width="140" show-overflow-tooltip />
         <el-table-column prop="is_parent_ok" label="母卷上料完成" width="100px" :formatter="formatParentName" />
         <el-table-column prop="is_child_tz_ok" label="子卷套轴完成" width="100px" :formatter="formatChildName" />
         <el-table-column prop="is_child_ps_ok" label="子卷配送完成" width="100px" :formatter="formatChildPsName" />