Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java

@@ -12,5 +12,5 @@ import lombok.Data;
 @Data
 public class RuleGroupProgress {
     private String message;
-    private Long progress;
+    private Integer progress;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java

@@ -24,4 +24,7 @@ public class WmsSearchGroupModel {
 
     @ApiParam(value = "分页组件")
     private Pager pager;
+
+    @ApiParam(value = "实体类名")
+    private String objClassName;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java

@@ -35,7 +35,7 @@ public class PtlBom extends BaseBean implements Serializable {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partNo;
 
-    @Column(name = "PART_NAME", columnDefinition = "varchar(20) default '1'", nullable = false)
+    @Column(name = "PART_NAME", columnDefinition = "varchar(255) default '1'", nullable = false)
     @ApiParam("父物料描述")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partName;

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

@@ -295,6 +295,14 @@ public class WmsStockSn extends BaseBean {
     private String parentReturnPart;
 
     @Transient
+    @ApiParam("保质期开始时间")
+    private String qualityDateTimeStart;
+
+    @Transient
+    @ApiParam("保质期结束时间")
+    private String qualityDateTimeEnd;
+
+    @Transient
     @ApiParam(value = "预计完成时间")
     private String planCompleteTime;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1301,6 +1301,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
+        DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart(),
+                wmsStockSn.getQualityDateTimeEnd(), "qualityDate", result, false);
         if (wmsStockSn.getIsValid() != null) {
             DdlPreparedPack.getNumEqualPack(wmsStockSn.getIsValid(), "isValid", result);
         }