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

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java

@@ -40,9 +40,9 @@ public class SysDictionary extends BaseBean {
     private String dictionaryCode;
 
     //枚举 CommonEnumUtil.SOFT_TYPE
-    @Column(name="SOFT_TYPE")
-    @ApiParam(value ="微服务软件类型")
-    private Integer softType;
+    @Column(name="DICTIONARY_SOFT_TYPE")
+    @ApiParam(value ="字典所属模块")
+    private Integer dictionarySoftType;
 
     // 根节点-1
     @Column(name="PARENT_ID")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -32,6 +33,11 @@ public class SysTask extends BaseBean {
     @ApiParam(value ="名称")
     private String name;
 
+    // 软件类型 CommonEnumUtil.SOFT_TYPE
+    @Column(name="TASK_SOFT_TYPE")
+    @ApiParam(value = "软件类型")
+    private Integer taskSoftType;
+
     @Column(name="TASK_PACKAGE")
     @ApiParam(value ="任务包名")
     private String taskPackage;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java

@@ -71,6 +71,10 @@ public class SysTaskPlan extends BaseBean {
     @ApiParam(value ="定时任务名称")
     private String taskNameRdd;
 
+    @Column(name="TASK_SOFT_TYPE_RDD")
+    @ApiParam(value ="任务所属模块")
+    private Integer taskSoftTypeRdd;
+
     @Column(name="TASK_CYCLE_START_DATE_TIME_RDD")
     @ApiParam(value ="任务开始时间")
     private String taskCycleStartDateTimeRdd;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -407,7 +407,7 @@ public class CoreHqlPack {
         // and
         HqlPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result);
         HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
-        HqlPack.getNumEqualPack(dictionary.getSoftType(),"softType",result);
+        HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result);
         // not
         HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
 
@@ -428,7 +428,7 @@ public class CoreHqlPack {
         // and
         HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result);
         HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
-        HqlPack.getNumEqualPack(dictionary.getSoftType(),"softType",result);
+        HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result);
         // not
         HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
 

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

@@ -12,6 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.Date;
 
 /**
@@ -134,4 +135,16 @@ public class WmsStockSn extends BaseBean {
     @Column(name = "CUST_SN")
     @ApiParam(value = "客户条码")
     private String custSn;
+
+    @ApiParam(value = "仓库名称")
+    @Transient
+    public String whNameRdd;
+
+    @ApiParam(value = "存储区名称")
+    @Transient
+    public String zoneNameRdd;
+
+    @ApiParam(value = "库位名称")
+    @Transient
+    public String locateNameRdd;
 }

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

@@ -1320,9 +1320,15 @@ public class WmsHqlPack {
     public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result);
-        HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
+        HqlPack.getNumEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
+        HqlPack.getNumEqualPack(wmsStockSn.getWhNo(), "whNo", result);
+        HqlPack.getNumEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
+        HqlPack.getNumEqualPack(wmsStockSn.getPartNo(), "partNo", result);
+        HqlPack.getNumEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
         HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
         HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
+        HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
+        HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
         getStringBuilderPack(wmsStockSn, result);
         return result.toString();
     }