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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -2070,6 +2070,7 @@ public class MesEnumUtil {
         MES_REPAIR(320, "repairExcelService", "质量数据处理措施，支持编辑"),
         MES_EQU_TASK_PLAN(330, "equTaskPlanExcelService", "设备作业周期计划，支持编辑"),
         MES_PART_OJBECT(340, "partObjectExcelService", "物料对象"),
+        MES_PART_EXT_OJBECT(341, "PartObjectExtExcelService", "物料对象Ext"),
         MES_ROUTE_PROCESS_WORK_CELL(350, "routeProcessWorkCellExcelService", "工序工作单元"),
         MES_DATASOURCE(360, "datasourceExcelService", "DB地址清单"),
         MES_EQU_TASK_NOTIFY_CFG(370, "equTaskNotifyCfgExcelService", "设备通知配置"),

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java

@@ -170,6 +170,9 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
     @ApiParam("补偿过程条码")
     private String compensateSn;
 
+    @Column(name = "OVERTIME_REASON")
+    @ApiParam("超时原因备注")
+    private String overtimeReason;
 
     @Transient
     @ApiParam("返回信息")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsHealthQueryRecord.java

@@ -1,8 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Index;
+import javax.persistence.FetchType;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.Table;
@@ -34,7 +35,8 @@ public class WmsHealthQueryRecord extends BaseBean {
     @ApiParam(value = "指标代码")
     private String indicatorCode;
 
-    @Column(name = "INDICATOR_VALUE")
+    @Column(name = "INDICATOR_VALUE",columnDefinition="TEXT")
+    @Basic(fetch=FetchType.LAZY)
     @ApiParam(value = "指标结果")
     private String indicatorValue;
    

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsHealthQueryRecordRepository.java

@@ -1,8 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.repository;
 
-import java.util.List;
+import java.util.Optional;
 
-import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
@@ -11,10 +12,13 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsHealthQueryRecord;
 @Repository
 public interface WmsHealthQueryRecordRepository extends BaseRepository<WmsHealthQueryRecord, Long> {
 
-	@Query("from WmsHealthQueryRecord where indicator_code = :indicatorCode and query_time >= :queryTime")
-	List<WmsHealthQueryRecord> queryByCodeAndTime(String indicatorCode, Long queryTime);
-
-	@Query("from WmsHealthQueryRecord where indicator_code = :indicatorCode and query_time between :startTime and :endTime")
-	List<WmsHealthQueryRecord> queryByCodeBetweenTime(String indicatorCode, Long startTime, Long endTime);
+	Page<WmsHealthQueryRecord> findByOrganizeCodeAndIndicatorCodeAndQueryTimeBetween(String organizeCode,String indicatorCode, Long startTime,
+			Long endTime, Pageable page);
+	
+	int countByOrganizeCodeAndIndicatorCodeAndQueryTimeBetween(String organizeCode,String indicatorCode, Long startTime,
+			Long endTime);
+	
+	
+	Optional<WmsHealthQueryRecord> findByOrganizeCodeAndIndicatorCodeOrderByQueryTimeDesc(String organizeCode,String indicatorCode);
 
 }