Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

wangfei

2025-03-13 22a189d37bd7e27ef46ed7e3951202259bf14da0

Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/opctask/entity/LoadGlassDeviceTaskHistory.java

@@ -33,6 +33,14 @@
     */
    private Integer rawGlassHeight;
    /**
     * 原片厚度
     */
    private Integer rawGlassThickness;
    /**
     * 原片膜系
     */
    private String rawGlassFilmsId;
    /**
     * 上片设备编号
     */
    private Integer station;

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-dev.yml

@@ -30,7 +30,7 @@
    password: 123456
kangaroohy:
  milo:
    enabled: false
    enabled: true
    primary: default
    config:
      default:

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml

@@ -15,8 +15,8 @@
      thread-name-prefix: task-cacheVertical
mybatis-plus:
  mapper-locations: classpath*:mapper/*.xml
#  configuration:
#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
  configuration:
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
mes:
  sequence:
    order: true

 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageMapper.xml

@@ -61,8 +61,8 @@
            engineer_id
        ORDER BY
            percent DESC,
            thickness DESC,
            countSlot DESC
            countSlot DESC,
            thickness DESC
    </select>



 hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml

@@ -11,4 +11,6 @@

mybatis-plus:
  mapper-locations: classpath*:mapper/*.xml
#  configuration:
#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl


 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/loadglassdevicetaskhistory/controller/LoadGlassDeviceTaskHistoryController.java

@@ -32,7 +32,6 @@

    @ApiOperation("按照查询条件查询上片历史任务")
    @PostMapping("/queryLoadGlassHistoryTask") //查询现在上片机的玻璃信息
    @ResponseBody
    public Result<Page<LoadGlassDeviceTaskHistory>> queryBigStorageCageHistoryTask(@RequestBody @Validated LoadGlassDeviceTaskHistoryRequest request) {
        return Result.build(200, "查询成功", loadGlassDeviceTaskHistoryService.queryLoadGlassHistoryTask(request));
    }

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml

@@ -9,8 +9,8 @@
    enabled: false
mybatis-plus:
  mapper-locations: classpath*:mapper/*.xml
  configuration:
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#  configuration:
#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
mes:
  width: 2800
  height: 5000

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java

@@ -32,7 +32,7 @@
            request.setEndDate(DateUtil.getEndDate());
        }
        LambdaQueryWrapper<HollowBigStorageCageHistoryTask> wrapper = new LambdaQueryWrapper<HollowBigStorageCageHistoryTask>()
                .like(StringUtils.isBlank(request.getGlassId()), HollowBigStorageCageHistoryTask::getGlassId, request.getGlassId())
                .like(StringUtils.isNotBlank(request.getGlassId()), HollowBigStorageCageHistoryTask::getGlassId, request.getGlassId())
                .eq(request.getStartSlot() != 0, HollowBigStorageCageHistoryTask::getStartSlot, request.getStartSlot())
                .eq(request.getTargetSlot() != 0, HollowBigStorageCageHistoryTask::getTargetSlot, request.getTargetSlot())
                .in(CollectionUtil.isNotEmpty(request.getTaskStateList()), HollowBigStorageCageHistoryTask::getTaskState, request.getTaskStateList())

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/application.yml

@@ -15,8 +15,8 @@
#      thread-name-prefix: task-hollowGlass
mybatis-plus:
  mapper-locations: classpath*:mapper/*.xml
  configuration:
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#  configuration:
#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
mes:
  sequence:
    order: true