更新生产排产BUG

admin/src/main/resources/application-dev.yml

@@ -18,7 +18,7 @@ ximai-mes:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8088
+  port: 8080
   servlet:
     # 应用的访问路径
     context-path: /
@@ -56,9 +56,9 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://localhost:3307/xm_mes_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: root
-        password: 123456
+        url: jdbc:mysql://192.168.222.136:3306/xm_mes_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: admin
+        password: t0psunit
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

admin/src/main/resources/logback.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-    <property name="log.path" value="d:/logs/mes" />
+    <property name="log.path" value="/home/ximai/logs" />
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
@@ -9,7 +9,6 @@
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>${log.pattern}</pattern>
-            <charset>UTF-8</charset>
         </encoder>
     </appender>
 
@@ -25,7 +24,6 @@
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
-            <charset>UTF-8</charset>
         </encoder>
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <!-- 过滤的级别 -->
@@ -48,7 +46,6 @@
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
-            <charset>UTF-8</charset>
         </encoder>
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <!-- 过滤的级别 -->
@@ -71,7 +68,6 @@
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
-            <charset>UTF-8</charset>
         </encoder>
     </appender>
 
@@ -86,7 +82,6 @@
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
-            <charset>UTF-8</charset>
         </encoder>
     </appender>
 

mes/src/main/java/com/ximai/mes/report/response/WorkOrderProgressFeedbackListResponse.java

@@ -25,4 +25,5 @@ public class WorkOrderProgressFeedbackListResponse {
     @ApiModelProperty("报工时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date feedbackTime;
+    private String taskBatch;
 }

mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml

@@ -526,7 +526,7 @@
         sum(feedback.quantity_uncheck) quantity_uncheck,
         feedback.nick_name,
         workunit.std_working_time ,
-        pro_task.idx
+        pro_task.task_batch
         FROM
         pro_task_workunit workunit
         JOIN pro_feedback feedback ON feedback.task_workunit_id = workunit.task_workunit_id
@@ -540,7 +540,7 @@
             feedback.user_name,
             feedback.nick_name,
             workunit.std_working_time ,
-            pro_task.idx
+            pro_task.task_batch
         order by
             pro_task.idx
     </select>