1、下片表新增日期字段 2、修改磨边前进片玻璃尺寸限制参数调整

zhoushihao

2024-08-06 1633607df83faf13255091474a9cbfe791ea2d4b

1、下片表新增日期字段
2、修改磨边前进片玻璃尺寸限制参数调整

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java

@@ -161,6 +161,7 @@
    public static final List<Integer> G06_WORK_STATION = Arrays.asList(1, 2, 3);
    public static final List<Integer> G11_WORK_STATION = Arrays.asList(4, 5, 6);
    public static final int G13_WORK_STATION = 7;
    public static final List<Integer> WORK_STATION_ALL = Arrays.asList(1, 2, 3, 4, 5, 6, 7);

    /**
     * 启用 1

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

@@ -18,11 +18,11 @@
    secondLength: 2500
  min:
    one: #第一条磨边线的最小尺寸信息
      firstLength: 600
      secondLength: 350
      firstLength: 500
      secondLength: 400
    two: #第二条磨边线的最小尺寸信息
      firstLength: 400
      secondLength: 300
      secondLength: 400
  sequence:
    order: false


 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassInfo.java

@@ -7,6 +7,7 @@
import org.springframework.stereotype.Component;

import java.io.Serializable;
import java.util.Date;

/**
 * <p>
@@ -79,5 +80,10 @@
     */
    private String glassId;

    /**
     * 创建时间
     */
    private Date gmtCreate;


}

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/Downpush.java

@@ -115,7 +115,7 @@
        }

        log.info("发送当前正在执行工程已落架的玻璃信息");

        LambdaQueryWrapper<DownGlassInfo> wrapper = new LambdaQueryWrapper<DownGlassInfo>()

                .between(null != request.getBeginDate(), DownGlassInfo::getEngineerId, request.getBeginDate(), request.getEndDate())

                .between(null != request.getBeginDate(), DownGlassInfo::getGmtCreate, request.getBeginDate(), request.getEndDate())

                .eq(StringUtils.isNotBlank(request.getEngineerId()), DownGlassInfo::getEngineerId, request.getEngineerId());

        if (null == request.getWorkStationId() || 0 == request.getWorkStationId()) {

            wrapper.in(DownGlassInfo::getWorkStationId, Const.WORK_STATION_ALL);