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

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

@@ -1713,10 +1713,10 @@ public class BlockFormEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TRIGGER_EVENT {
-        CLICK(10, "CLICK", "单击"),
+        CLICK(10, "CLICK", "单击");
-        DB_LCLICK(20, "DB_LCLICK", "双击"),
+//        DB_LCLICK(20, "DB_LCLICK", "双击"),
-        MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"),
+//        MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"),
-        MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移动入");
+//        MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移入");
 
         private int value;
         private String code;

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

@@ -2764,6 +2764,61 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 库存数量类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOCK_QUAN_QTY_TYPE {
+        QTY("qty", "可用数量"),
+        FAIL_QTY("failQty", "不合格数量"),
+        HOLD_QTY("holdQty", "隔离数量"),
+        QC_QTY("qcQty", "质检中数量"),
+        RIN_QTY("rinQty", "待入库数量"),
+        FREEZE_QTY("freezeQty", "冻结数量"),
+        CONSIGN_QTY("consignQty", "寄售数量"),
+        LOCK_QTY("lockQty", "锁定数量"),
+        SCRAP_QTY("scrapQty", "报废数量");
+
+        private String code;
+        private String description;
+
+        STOCK_QUAN_QTY_TYPE(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getValue() {
+            return code;
+        }
+
+        public static STOCK_QUAN_QTY_TYPE codeOf(String code) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String getDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code == code) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * ERP同步标识 10=待同步，20=同步成功，30=同步失败
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -33,8 +33,8 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam("关联单号")
     public String refSrc;
 
-    @ApiParam(value = "关联单据类型")
+    @ApiParam(value = "关联单据业务类型")
-    private String refType;
+    private String busiTypeDesc;
 
     @Column(name = "ZDATE")
     @ApiParam(value = "计划日期")
@@ -56,13 +56,13 @@ public class WmsTaskInfoModel implements Serializable {
     }
 
     public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
-                            String refType, String zdate, String ztime, String custNo, String vendorNo) {
+                            String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo) {
         this.orderNo = orderNo;
         this.taskStatus = taskStatus;
         this.opTypeName = opTypeName;
         this.transTypeCode = transTypeCode;
         this.refSrc = refSrc;
-        this.refType = refType;
+        this.busiTypeDesc = busiTypeDesc;
         this.zdate = zdate;
         this.ztime = ztime;
         this.custNo = custNo;

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

@@ -83,6 +83,13 @@ public class SysDictionary extends BaseBean {
     @ApiParam(value = "是否默认",example = "2")
     private Integer isDefault;
 
+    public int getIsDefaultVal(){
+        if(this.isDefault == null){
+            return 0;
+        }
+        return isDefault.intValue();
+    }
+
     @Column(name="DICTIONARY_DESCRIPTION")
     @ApiParam(value ="描述")
     private String dictionaryDescription;

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

@@ -9,9 +9,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.hibernate.annotations.Type;
+import javax.persistence.Column;
-
+import javax.persistence.Entity;
-import javax.persistence.*;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogException.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -26,7 +27,12 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_LOG_EXCEPTION")
+@Table(name="SYS_LOG_EXCEPTION",
+        indexes = {
+                @Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"),
+                @Index(columnList = "EXC_MODULE_ID DESC", name = "LOG_INDEX_EXC_MODULE_ID")
+        }
+)
 @Api(value="系统异常表",description = "记录系统出现的异常")
 public class SysLogException extends BaseBean {
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogOperate.java

@@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -29,7 +30,12 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_LOG_OPERATE")
+@Table(name="SYS_LOG_OPERATE",
+        indexes = {
+                @Index(columnList = "CREATE_DATE_TIME DESC", name = "LOG_INDEX_CREATE_DATE_TIME"),
+                @Index(columnList = "OPERATE_MODULE DESC", name = "LOG_INDEX_OPERATE_MODULE"),
+                @Index(columnList = "OPERATE_TYPE DESC", name = "LOG_INDEX_OPERATE_TYPE")
+})
 @Api(value="操作日志表",description = "操作日志表")
 public class SysLogOperate extends BaseBean {
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogSystem.java

@@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -29,7 +30,12 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_LOG_SYSTEM")
+@Table(name="SYS_LOG_SYSTEM",
+        indexes = {
+                @Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"),
+                @Index(columnList = "LOG_LEVEL", name = "LOG_INDEX_LOG_LEVEL"),
+                @Index(columnList = "LOG_MODULE_ID", name = "LOG_INDEX_LOG_MODULE_ID")
+        })
 @Api(value="系统日志表",description = "系统日志表")
 public class SysLogSystem extends BaseBean {
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -26,7 +27,12 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="SYS_LOG_TASK_TIME")
+@Table(name="SYS_LOG_TASK_TIME",
+        indexes = {
+                @Index(columnList = "CREATE_DATE_TIME", name = "LOG_INDEX_CREATE_DATE_TIME"),
+                @Index(columnList = "NAME DESC", name = "LOG_INDEX_LOG_NAME"),
+                @Index(columnList = "GROUP_NAME DESC", name = "LOG_INDEX_LOG_GROUP_NAME")
+        })
 @Api(value="定时任务执行日志",description = "定时任务执行记录")
 public class SysLogTaskTime extends BaseBean {
 

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

@@ -240,6 +240,7 @@ public class CoreHqlPack {
             HqlPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result);
         }
         HqlPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
+        HqlPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result);
 
         // 添加默认排序
         HqlPack.getOrderDefault(dictionary);

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

@@ -39,7 +39,7 @@ public class AmpPart extends BaseBean {
     /**
      * 状态：B汇总库存到AMP系统
      */
-    @Column(name = "ORDER_STATUS")
+    @Column(name = "status")
     @ApiParam(value = "状态")
-    private String orderStatus;
+    private String status;
 }

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

@@ -112,10 +112,22 @@ public class WmsPart extends BaseBean {
     @ApiParam(value = "是否条码管理", example = "1")
     private Integer snControl;
 
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商代码")
+    private String vendorNo;
+
     @Column(name = "IN_LOCATE_NO")
     @ApiParam(value = "默认入库库位")
     private String inLocateNo;
 
+    @Transient
+    @ApiParam("默认入库存储区")
+    private String inZoneNo;
+
+    @Transient
+    @ApiParam("默认入库仓库")
+    private String inWhNo;
+
     @Column(name = "PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
@@ -136,7 +148,9 @@ public class WmsPart extends BaseBean {
     @ApiParam("库存水平")
     private String stockLevelStatus;
 
-    public WmsPart(){}
+
+    public WmsPart() {
+    }
 
     public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty) {
         this.partNo = partNo;
@@ -145,4 +159,12 @@ public class WmsPart extends BaseBean {
         this.min = minQty;
         this.qty = cqty;
     }
+
+    public WmsPart(String partNo, String vendorNo, String inLocateNo, String inZoneNo, String inWhNo) {
+        this.partNo = partNo;
+        this.vendorNo = vendorNo;
+        this.inLocateNo = inLocateNo;
+        this.inZoneNo = inZoneNo;
+        this.inWhNo = inWhNo;
+    }
 }

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

@@ -134,6 +134,14 @@ public class WmsTaskDetails extends BaseBean {
     @ApiParam("目的库存地代码")
     public String destAreaNo;
 
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    public Integer busiType;
+
+    @Column(name = "BUSI_TYPE_DESC")
+    @ApiParam("业务类型描述")
+    public String busiTypeDesc;
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty;
     }

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

@@ -475,7 +475,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //客户编号
-        DdlPreparedPack.getStringEqualPack(basCustomer.getCustNo(), "custNo", result);
+        DdlPreparedPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result);
         //客户简称
         DdlPreparedPack.getStringLikerPack(basCustomer.getCustName(), "custName", result);
         //客户全称
@@ -633,7 +633,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result);
         DdlPreparedPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result);
         DdlPreparedPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result);
         DdlPreparedPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result);
         DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result);