Merge remote-tracking branch 'origin/dev' into dev

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

@@ -42,7 +42,7 @@ logging:
       sql:
         Statement: debug
   file:
-    name: ximai-mes.log
+    name: logs/ximai-mes.log
 
 # Spring配置
 spring:
@@ -122,9 +122,9 @@ spring:
   servlet:
      multipart:
        # 单个文件大小
-       max-file-size:  10MB
+       max-file-size:  30MB
        # 设置总上传的文件大小
-       max-request-size:  20MB
+       max-request-size:  30MB
   # 服务模块
   devtools:
     restart:
@@ -159,7 +159,7 @@ token:
     # 令牌自定义标识
     header: Authorization
     # 令牌密钥
-    secret: abcdefghijklmnopqrstuvwxyz
+    secret: q8w3Cx9Lr4fT2y6uV5sZ8aE1mN0kP7gH
     # 令牌有效期（默认30分钟）
     expireTime: 1440
 

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

@@ -157,7 +157,7 @@ token:
   # 令牌自定义标识
   header: Authorization
   # 令牌密钥
-  secret: abcdefghijklmnopqrstuvwxyz
+  secret: q8w3Cx9Lr4fT2y6uV5sZ8aE1mN0kP7gH
   # 令牌有效期（默认30分钟）
   expireTime: 1440
 

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

@@ -159,7 +159,7 @@ token:
   # 令牌自定义标识
   header: Authorization
   # 令牌密钥
-  secret: abcdefghijklmnopqrstuvwxyz
+  secret: q8w3Cx9Lr4fT2y6uV5sZ8aE1mN0kP7gH
   # 令牌有效期（默认30分钟）
   expireTime: 1440
 

admin/src/main/resources/application-th-prod.yml

@@ -56,7 +56,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://10.168.8.188:3306/xm_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://10.168.8.188:3306/xm_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B7
         username: root
         password: t0psunit
       # 从库数据源
@@ -159,7 +159,7 @@ token:
   # 令牌自定义标识
   header: Authorization
   # 令牌密钥
-  secret: abcdefghijklmnopqrstuvwxyz
+  secret: q8w3Cx9Lr4fT2y6uV5sZ8aE1mN0kP7gH
   # 令牌有效期（默认30分钟）
   expireTime: 1440
 

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

@@ -159,7 +159,7 @@ token:
   # 令牌自定义标识
   header: Authorization
   # 令牌密钥
-  secret: abcdefghijklmnopqrstuvwxyz
+  secret: q8w3Cx9Lr4fT2y6uV5sZ8aE1mN0kP7gH
   # 令牌有效期（默认30分钟）
   expireTime: 1440
 

framework/src/main/java/com/ximai/framework/web/service/TokenService.java

@@ -113,6 +113,7 @@ public class TokenService
 
         Map<String, Object> claims = new HashMap<>();
         claims.put(Constants.LOGIN_USER_KEY, token);
+        claims.put(Constants.JWT_USERNAME, loginUser.getUsername());
         return createToken(claims);
     }
 

mes/src/main/java/com/ximai/mes/kanban/dto/material/ErpDataDto.java

@@ -24,7 +24,7 @@ public class ErpDataDto {
     InventoryTrend inventoryTrend;
 
     @ApiModelProperty("销售出库计划")
-    List<SalesOutboundPlan> salesOutboundPlanList;
+    List<SalesOutboundPlan> salesOutboundPlanList=new ArrayList<>();
 
     @Data
     public static class InventoryTrend{
@@ -42,7 +42,9 @@ public class ErpDataDto {
         String outApplyNo;
         @ApiModelProperty("产品名称")
         String itemName;
-        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty("产品名称")
+        String itemNo;
+        @JsonFormat(pattern = "yyyyMMdd")
         @ApiModelProperty("计划出库时间")
         Date planOutDate;
         @ApiModelProperty("计划数量")

mes/src/main/java/com/ximai/mes/kanban/service/KanbanMaterialService.java

@@ -52,7 +52,11 @@ public class KanbanMaterialService {
     private ErpKanbanService erpKanbanService;
 
     public ErpDataDto getErpData(){
-        return erpKanbanService.getMaterialStat().getData();
+        ErpDataDto rst = erpKanbanService.getMaterialStat().getData();
+        rst.getSalesOutboundPlanList().forEach(s->{
+            s.setItemName(s.getItemNo());
+        });
+        return rst;
     }
 
     public MesDataDto getMesData(){

mes/src/main/java/com/ximai/mes/pro/service/impl/ProFeedbackServiceImpl.java

@@ -604,11 +604,11 @@ public class ProFeedbackServiceImpl implements IProFeedbackService {
                 }
             }
 
-            workTimeSum = proStartWork.getWorkTimeSec() - proStartWork.getBreakTimeSec();
+            workTimeSum = proStartWork.getWorkTimeSec();
 
         } else {
             breakTimeSum = proStartWorks.stream().collect(Collectors.summarizingLong(ProStartWork::getBreakTimeSec)).getSum();
-            workTimeSum = proStartWorks.stream().collect(Collectors.summarizingLong(ProStartWork::getWorkTimeSec)).getSum() - breakTimeSum;
+            workTimeSum = proStartWorks.stream().collect(Collectors.summarizingLong(ProStartWork::getWorkTimeSec)).getSum();
         }
 
         Map<String, Object> map = new HashMap<>();

mes/src/main/java/com/ximai/mes/pro/service/impl/ProStartWorkServiceImpl.java

@@ -237,7 +237,7 @@ public class ProStartWorkServiceImpl implements IProStartWorkService {
         }
 
         startWork.setEndDate(new Date());
-        Map<String, Long> map = computeWorkTime(startWork, proTaskWorkunitMapper.selectListByQw(new QueryWrapper<ProTaskWorkunit>().eq("task_id", proTask.getTaskId())).get(0).getWorkunitId());
+        Map<String, Long> map = this.computeWorkTime(startWork, proTaskWorkunitMapper.selectListByQw(new QueryWrapper<ProTaskWorkunit>().eq("task_id", proTask.getTaskId())).get(0).getWorkunitId());
         startWork.setWorkTimeSec(DataUtil.getNormalData(map.get("workTimeSec"), Long.class));
         startWork.setBreakTimeSec(DataUtil.getNormalData(map.get("breakTimeSec"), Long.class));
 
@@ -252,9 +252,9 @@ public class ProStartWorkServiceImpl implements IProStartWorkService {
         QueryWrapper<CalPlanWorkunit> calPlanWorkunitQueryWrapper = new QueryWrapper<>();
         Date startDate = startWork.getStartDate();
         Date endDate = startWork.getEndDate();
-        calPlanWorkunitQueryWrapper.between("start_date", startDate, endDate).eq("rest_flag", 0).eq("workunit_id", workunitId)
+        calPlanWorkunitQueryWrapper.lt("start_date", startDate).gt("end_date", startDate).eq("rest_flag", 0).eq("workunit_id", workunitId)
                 .or()
-                .between("end_date", startDate, endDate).eq("rest_flag", 0).eq("workunit_id", workunitId);
+                .lt("start_date", endDate).gt("end_date", endDate).eq("rest_flag", 0).eq("workunit_id", workunitId);
         List<CalPlanWorkunit> calPlanWorkunits = calPlanWorkunitService.selectListByQw(calPlanWorkunitQueryWrapper);
         return this.computeWorkTime(startWork, calPlanWorkunits, workunitId);
     }

mes/src/test/java/com/bs/mes/pro/ProStartWorkServiceImplTest.java

 package com.bs.mes.pro;
 
 import cn.hutool.core.date.DateUtil;
+import com.ximai.common.utils.data.DataUtil;
 import com.ximai.mes.cal.domain.CalPlanWorkunit;
 import com.ximai.mes.pro.domain.ProStartWork;
 import com.ximai.mes.pro.schedule.Equipment;
@@ -61,6 +62,21 @@ public class ProStartWorkServiceImplTest {
         Assert.assertEquals((228+240)*60, rst.get("workTimeSec").longValue());
         Assert.assertEquals((proStartWork.getEndDate().getTime()-proStartWork.getStartDate().getTime())/1000-rst.get("workTimeSec").longValue(),
                 rst.get("breakTimeSec").longValue());
+
+        calPlanWorkunits.add(new CalPlanWorkunit(){
+            {
+                setStartDate(DateUtil.parse("2024-12-03 08:00","yyyy-MM-dd HH:mm"));
+                setEndDate(DateUtil.parse("2024-12-03 12:00","yyyy-MM-dd HH:mm"));
+            };
+        });
+
+        //测试3 时间精确到秒
+        proStartWork.setStartDate(DateUtil.parse("2024-12-03 10:19:36","yyyy-MM-dd HH:mm:ss"));
+        proStartWork.setEndDate(DateUtil.parse("2024-12-03 10:20:42","yyyy-MM-dd HH:mm:ss"));
+        rst = (Map) methods.invoke(proStartWorkService, proStartWork, calPlanWorkunits, 0l);
+        Assert.assertEquals(60+6, rst.get("workTimeSec").longValue());
+        Assert.assertEquals(0l,
+                rst.get("breakTimeSec").longValue());
     }
 
 }