Merge branch 'test' into ext-dev

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

@@ -2624,7 +2624,7 @@ public class CommonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_STATUS {
         CREATE(10, "创建"),
-        QUALITY_CONTROL(20, "质检中"),
+        (20, "质检中"),
         PRE_INSTOCK(30, "待入库"),
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -69,7 +69,7 @@ public class SoftSwitchHqlPack {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumNOEqualPack(bsSuitCaseParam.getId(),"id",ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean);
+        DdlPreparedPack.getNumEqualwPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean);
 
         return ddlPackBean;

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);
 
 }