From 50018034796393c9fc814ef4bf3af8f2f62271f4 Mon Sep 17 00:00:00 2001
From: Leon <3066758958@qq.com>
Date: Fri, 3 Sep 2021 18:00:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 console/src/main/resources/log4j2.xml         | 30 ++++++++++++++-----
 .../resources/mapper/SfcDispatchMapper.xml    |  2 +-
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/console/src/main/resources/log4j2.xml b/console/src/main/resources/log4j2.xml
index 8009dd35..b52b1bd8 100644
--- a/console/src/main/resources/log4j2.xml
+++ b/console/src/main/resources/log4j2.xml
@@ -6,7 +6,6 @@
         <Property name="log.pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n</Property>
     </Properties>
 
-    <!-- 日志输出器 -->
     <Appenders>
         <Console name="console" target="SYSTEM_OUT">
             <PatternLayout>
@@ -14,8 +13,22 @@
             </PatternLayout>
         </Console>
 
-        <RollingFile name="file_info"
-                     fileName="${log.path}/mes-info.log"
+        <RollingFile name="optimize" fileName="${log.path}/mes-optimize.log"
+                     filePattern="${log.path}/$${date:yyyy-MM}/mes-optimize.%d{yyyy-MM-dd}-%i.log">
+            <Filters>
+                <ThresholdFilter level="error" onMatch="DENY" onMismatch="NEUTRAL" />
+                <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
+            </Filters>
+            <PatternLayout>
+                <pattern>${log.pattern}</pattern>
+            </PatternLayout>
+            <Policies>
+                <TimeBasedTriggeringPolicy />
+                <SizeBasedTriggeringPolicy size="10MB"/>
+            </Policies>
+        </RollingFile>
+
+        <RollingFile name="file_info" fileName="${log.path}/mes-info.log"
                      filePattern="${log.path}/$${date:yyyy-MM}/mes-info.%d{yyyy-MM-dd}-%i.log">
             <Filters>
                 <ThresholdFilter level="error" onMatch="DENY" onMismatch="NEUTRAL" />
@@ -30,8 +43,7 @@
             </Policies>
         </RollingFile>
 
-        <RollingFile name="file_error"
-                     fileName="${log.path}/mes-error.log"
+        <RollingFile name="file_error" fileName="${log.path}/mes-error.log"
                      filePattern="${log.path}/$${date:yyyy-MM}/mes-error.%d{yyyy-MM-dd}-%i.log">
             <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout>
@@ -44,12 +56,14 @@
         </RollingFile>
     </Appenders>
 
-
     <Loggers>
-        <logger name="info" level="debug">
+        <logger name="optimize" level="debug">
+            <AppenderRef ref="optimize"/>
+        </logger>
+        <logger name="com.foreverwin" level="debug">
             <AppenderRef ref="file_info"/>
         </logger>
-        <Root level="error">
+        <Root level="info">
             <AppenderRef ref="console"/>
             <AppenderRef ref="file_error"/>
         </Root>
diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
index b0950a61..ac8408bb 100644
--- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
+++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
@@ -776,7 +776,7 @@
                           SD.STEP_ID, SD.OPERATION, OT.DESCRIPTION, SD.RESOURCE_TYPE, SD.RESRCE, SD.EMPLOYEE, SD.EMPLOYEE, SD.DISPATCH_QTY, SD.PROD_HOURS, RS.DESCRIPTION,
                           SD.DISPATCH_STATUS, SD.DISPATCH_QTY, SD.PLANNED_START_DATE, SD.PLANNED_COMP_DATE, SD.WORK_CENTER, SD.IS_DISPATCH, SD.EMPLOYEE_DESCRIPTION,
                           SD.ACTUAL_START_DATE, SD.ACTUAL_COMPLETE_DATE, SD.REMARK, SD.DISPATCH_SEQ, SD.EARLIEST_START_DATE, SD.LATEST_END_DATE,
-                          IM.LOT_SIZE, SD.TURN_OPERATION, SD.BLANKING_SIZE, WR.WORK_CENTER
+                          CC.VALUE, SD.TURN_OPERATION, SD.BLANKING_SIZE, WR.WORK_CENTER
             ) WIP
             LEFT JOIN Z_SFC_DISPATCH V1 ON V1.SITE = WIP.SITE AND V1.SFC = WIP.SFC AND V1.DISPATCH_SEQ = WIP.BEFORE_SEQ
             LEFT JOIN Z_SFC_DISPATCH V2 ON V2.SITE = WIP.SITE AND V2.SFC = WIP.SFC AND V2.DISPATCH_SEQ = WIP.AFTER_SEQ