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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -36,7 +36,7 @@ public abstract class BaseBean implements Serializable {
     @Id
     @GeneratedValue(generator = "IDGenerator")
     @GenericGenerator(name = "IDGenerator", strategy = "assigned")
-    @Column(name="id")
+    @Column(name="ID")
     @ApiParam(value = "主键",example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
     @AnnoOutputColumn(hidden = true)
@@ -65,34 +65,34 @@ public abstract class BaseBean implements Serializable {
     @AnnoOutputColumn(hidden = true)
     public String organizeCode;
 
-    @Column(name="is_valid")
+    @Column(name="IS_VALID")
     @ApiParam(value = "有效性",example = "1")
     @AnnoOutputColumn(hidden = true)
     //启用停用
     public Integer isValid;    //CommonEnumUtil.IS_VAILD;
 
-    @Column(name="is_deleted")
+    @Column(name="IS_DELETED")
     @ApiParam(value = "是否已删除",example = "2")
     @AnnoOutputColumn(hidden = true)
     //逻辑删除，软删除
     public Integer isDeleted;    //CommonEnumUtil.TRUE_OR_FALSE
 
-    @Column(name="create_user",updatable = false)
+    @Column(name="CREATE_USER",updatable = false)
     @ApiParam(value = "创建用户")
     @AnnoOutputColumn(hidden = true)
     public String createUser;
 
-    @Column(name="create_date",updatable = false)
+    @Column(name="CREATE_DATE_TIME",updatable = false)
     @ApiParam(value = "创建日期")
     @AnnoOutputColumn(hidden = true)
     public String createDatetime;
 
-    @Column(name="modify_user")
+    @Column(name="MODIFY_USER")
     @ApiParam(value = "修改人")
     @AnnoOutputColumn(hidden = true)
     public String modifyUser;
 
-    @Column(name="modify_date")
+    @Column(name="MODIFY_DATE_TIME")
     @ApiParam(value = "修改日期")
     @AnnoOutputColumn(hidden = true)
     public String modifyDatetime;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicBean.java

@@ -13,7 +13,9 @@ import org.springframework.cglib.beans.BeanMap;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @Description : 动态转换对象，用于配合dynamicEntity进行动态属性添加
@@ -83,6 +85,13 @@ public class DynamicBean {
         if(null != superclass) {
             generator.setSuperclass(superclass);
         }
+
+        /*Set keySet = propertyMap.keySet();
+        for (Iterator i = keySet.iterator(); i.hasNext(); ) {
+            String key = (String) i.next();
+            generator.addProperty(key, (Class) propertyMap.get(key));
+        }*/
+
         BeanGenerator.addProperties(generator, propertyMap);
         return generator.create();
     }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java

@@ -160,9 +160,9 @@ public class DynamicEntity extends BaseBean implements Serializable {
                     } else if (f.getType() == Double.class) {
                         fieldVal = 0.0d;
                     } else if (f.getType() == String.class) {
-                        fieldVal = "";
+                        fieldVal = "1";
                     }else if (f.getType() == Character.class) {
-                        fieldVal = "";
+                        fieldVal = "1";
                     }else if (f.getType() == Boolean.class) {
                         fieldVal = true;
                     }else if (f.getType() == Byte.class) {
@@ -170,7 +170,7 @@ public class DynamicEntity extends BaseBean implements Serializable {
                     }else if (f.getType() == Date.class) {
                         fieldVal = new Date();
                     }else {
-                        fieldVal = "";
+                        fieldVal = "1";
                     }
                 }
 

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

@@ -959,6 +959,16 @@ public class BlockFormEnumUtil {
             return tmp;
         }
 
+        public static int codeOfClzFullName(Class clzFullName) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].clzFullName.equals(clzFullName)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
         public static int codeOfClassPath(String classPath) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {

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

@@ -302,7 +302,7 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum USER_STATUS {
-//        NORMAL(1, "fa fa-success cell-fa fa-check", "正常"),
+//        EMPTY(1, "fa fa-success cell-fa fa-check", "正常"),
 //        FREEZE(2, "冻结", "冻结_FREEZE"),
 //        ABERRANT(3, "异常", "异常_ABERRANT"),
 //        RESIGNATION(4, "离职", "离职_RESIGNATION"),

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

@@ -11,54 +11,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  **/
 public class WmsEnumUtil {
 
-    /**
-     * 拆分规则
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum SPLIT_OR_MERGE_RULE {
-        WH(10, "WH", "仓库"), ZONE(20, "ZONE", "存储区"), PART(30, "PART", "物料");
-        private int value;
-        private String code;
-        private String description;
-
-        SPLIT_OR_MERGE_RULE(int value, String code, String description) {
-            this.value = value;
-            this.code = code;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        public static String valueOf(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-
-        public static int descOf(String desc) {
-            int tmp = 1;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].description.equals(desc)) {
-                    tmp = values()[i].value;
-                }
-            }
-            return tmp;
-        }
-    }
 
     /**
      * 订单明细信息 是否免费
@@ -127,57 +79,7 @@ public class WmsEnumUtil {
         }
     }
 
-    /**
-     * 订单明细信息 状态
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum ORDER_DETAILS_STATUS {
-        NORMAL(10, "N", "正常"),
-        RECEIPTED(20, "R", "已完成"),
-        ANCEL(30, "C", "行取消");
-
-        private int value;
-        private String code;
-        private String description;
-
-        ORDER_DETAILS_STATUS(int value, String code, String description) {
-            this.value = value;
-            this.code = code;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public String getCode() {
-            return code;
-        }
 
-        public static String valueOf(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-
-        public static int descOf(String desc) {
-            int tmp = 1;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].description.equals(desc)) {
-                    tmp = values()[i].value;
-                }
-            }
-            return tmp;
-        }
-    }
 
     /**
      * 主表信息 单据类型
@@ -232,14 +134,15 @@ public class WmsEnumUtil {
         }
     }
 
+
     /**
-     * 移库单主表状态；质检单主表状态
+     * 单据主表状态(ASN,PO,MOVE,QC)
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MASTER_ORDER_STATUS {
         CREATE(10, "新建"),
         RECEIPT(20, "处理中"),
-        RECEIPT_FINISH(30, "已完成"),
+        RECEIPT_FINISH(30, "已处理"),
         CLOSED(40, "已关闭"),
         CANCELLED(50, "已取消");
 
@@ -281,21 +184,22 @@ public class WmsEnumUtil {
     }
 
     /**
-     * 收货主表信息 状态
+     * 订单明细状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum RC_ORDER_STATUS {
+    public enum ORDER_DETAILS_STATUS {
-        CREATE(10, "新建"),
+        CREATE(10, "N", "创建"),
-        RECEIPT(20, "收货中"),
+        RECEIPTED(20, "R", "已完成"),
-        RECEIPT_FINISH(30, "收货完成"),
+        CANCEL(30, "C", "行取消"),
-        CLOSED(40, "已关闭"),
+        PRINTED(40, "C", "已打印");
-        CANCELLED(50, "已取消");
 
         private int value;
+        private String code;
         private String description;
 
-        RC_ORDER_STATUS(int value, String description) {
+        ORDER_DETAILS_STATUS(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -307,6 +211,10 @@ public class WmsEnumUtil {
             return description;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -329,19 +237,22 @@ public class WmsEnumUtil {
     }
 
     /**
-     * PO条码状态信息
+     * PO条码状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum SN_DETAILS_STATUS {
+    public enum PO_SN_STATUS {
-        CREATE(10, "新建"),
+        CREATE(10, "N", "创建"),
-        WAREHOUSING(30, "已打印"),
+        RECEIPTED(20, "R", "已完成"),
-        RECEIPT_FINISH(20, "已收货");
+        CANCEL(30, "C", "行取消"),
+        PRINTED(40, "C", "已打印");
 
         private int value;
+        private String code;
         private String description;
 
-        SN_DETAILS_STATUS(int value, String description) {
+        PO_SN_STATUS(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -353,6 +264,10 @@ public class WmsEnumUtil {
             return description;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -374,9 +289,8 @@ public class WmsEnumUtil {
         }
     }
 
-
     /**
-     * 产品入库的产品状态
+     * 产品入库，发运状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRODUCT_INSTOCK_STATUS {
@@ -471,7 +385,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum LOCATE_STATUS {
-        CREATE(10, "空库位"), FINISH(20, "非空"), FAIL(30, "已满");
+        EMPTY(10, "空库位"), NOT_EMPTY(20, "非空"), FULL(30, "已满");
 
         private int value;
         private String description;
@@ -501,7 +415,7 @@ public class WmsEnumUtil {
     }
 
     /**
-     * 外部单据：移库单移动类型
+     * 移库单移动类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OUT_MOVEMENT_MOVE_TYPE {
@@ -666,54 +580,10 @@ public class WmsEnumUtil {
     }
 
     /**
-     * 外部单据：移库单单据类型
+     * 外部单据：关联单据类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum OUT_MOVEMENT_MASTER_ORDER_TYPE {
-        ORDER_PULL_PART(1, "工单配料");
-
-        private int value;
-        private String description;
-
-        OUT_MOVEMENT_MASTER_ORDER_TYPE(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOf(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-
-        public static int descOf(String desc) {
-            int tmp = 1;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].description.equals(desc)) {
-                    tmp = values()[i].value;
-                }
-            }
-            return tmp;
-        }
-    }
-
-    /**
-     * 外部单据：移库单关联单据类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE {
+    public enum LINK_ORDER_TYPE {
         ASN(10, "ASN", "ASN"),
         PO(20, "PO", "PO"),
         SO(30, "SO", "SO"),
@@ -726,7 +596,7 @@ public class WmsEnumUtil {
         private String code;
         private String description;
 
-        OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE(int value, String code, String description) {
+        LINK_ORDER_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -764,7 +634,7 @@ public class WmsEnumUtil {
             return tmp;
         }
 
-        public static OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE codeOf(String code) {
+        public static LINK_ORDER_TYPE codeOf(String code) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].code.equals(code)) {
@@ -843,45 +713,6 @@ public class WmsEnumUtil {
         }
     }
 
-    /**
-     * ASN单据状态 10=新建,20=收货中,30=收货完成，40=已关闭,50=已取消
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum ASN_STATUS {
-
-        CREATE(10, "新建"),
-        RECEIPT(20, "收货中"),
-        RECEIPT_FINISH(30, "收货完成"),
-        CLOSED(40, "已关闭"),
-        CANCELLED(50, "已取消");
-
-        private int value;
-        private String description;
-
-        ASN_STATUS(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOf(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
-
 
     /**
      * 业务表：库存条码状态
@@ -889,14 +720,14 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_STATUS {
-        CREATE(1, "创建"),
+        CREATE(10,"创建"),
-        QUALITY_CONTROL(10, "质检中"),
+        QUALITY_CONTROL(20, "质检中"),
-        PRE_INSTOCK(20, "待入库"),
+        PRE_INSTOCK(30, "待入库"),
-        INSTOCKED(30, "入库"),
+        INSTOCKED(40, "入库"),
-        PICKED(40, "配料"),
+        PICKED(50, "配料"),
-        OUT_STOCK(50, "出库"),
+        OUT_STOCK(60, "出库"),
-        FRAZE(60, "报废"),
+        FRAZE(70, "报废"),
-        COMMING(70, "在途");
+        COMMING(80, "在途");
 
         private int value;
         private String description;
@@ -940,7 +771,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_QC_STATUS {
-        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离");
+        NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离");
 
         private int value;
         private String code;
@@ -983,6 +814,7 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
         public static STOCK_SN_QC_STATUS codeOf(Integer value) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
@@ -1113,7 +945,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CS_ITEM_STATUS {
-        CREATE(1, "创建"), FINISH(10, "已处理");
+        CREATE(10, "创建"), FINISH(20, "已处理");
 
         private int value;
         private String description;
@@ -1256,12 +1088,12 @@ public class WmsEnumUtil {
     }
 
     /**
-     * 质检明细转态
+     * 质检明细状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QC_ITEM_STATUS {
-        NORMAL(1, "正常"),
+        NORMAL(10, "创建"),
-        CANCELLATION(10, "行取消");
+        CANCELLATION(20, "行取消");
 
         private int value;
         private String description;
@@ -1543,42 +1375,6 @@ public class WmsEnumUtil {
         }
     }
 
-    /**
-     * PO条码表条码状态
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PO_SN_STATUS {
-
-        FOUND(10, "创建"),
-        PRINTED(20, "已打印"),
-        RECEIPTED(30, "已收货");
-
-        private int value;
-        private String description;
-
-        PO_SN_STATUS(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOf(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
 
     /**
      * 组件类型
@@ -1961,17 +1757,17 @@ public class WmsEnumUtil {
         private String description;
         private String code;
 
-        DATA_STATUS(int value, String code, String description){
+        DATA_STATUS(int value, String code, String description) {
             this.value = value;
             this.description = description;
             this.code = code;
         }
 
-        public int getValue () {
+        public int getValue() {
             return value;
         }
 
-        public String getDescription () {
+        public String getDescription() {
             return description;
         }
 
@@ -1979,7 +1775,7 @@ public class WmsEnumUtil {
             return code;
         }
 
-        public static String valueOf (int val){
+        public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
@@ -2003,17 +1799,17 @@ public class WmsEnumUtil {
         private String code;
         private String description;
 
-        PRINT_TEMPLATE(int value, String code, String description){
+        PRINT_TEMPLATE(int value, String code, String description) {
             this.value = value;
             this.description = description;
             this.code = code;
         }
 
-        public int getValue () {
+        public int getValue() {
             return value;
         }
 
-        public String getDescription () {
+        public String getDescription() {
             return description;
         }
 
@@ -2021,7 +1817,7 @@ public class WmsEnumUtil {
             return code;
         }
 
-        public static String valueOf (int val){
+        public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
@@ -2043,17 +1839,17 @@ public class WmsEnumUtil {
         private String code;
         private String description;
 
-        VERSION(int value, String code, String description){
+        VERSION(int value, String code, String description) {
             this.value = value;
             this.description = description;
             this.code = code;
         }
 
-        public int getValue () {
+        public int getValue() {
             return value;
         }
 
-        public String getDescription () {
+        public String getDescription() {
             return description;
         }
 
@@ -2061,7 +1857,7 @@ public class WmsEnumUtil {
             return code;
         }
 
-        public static String valueOf (int val){
+        public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
@@ -2077,16 +1873,16 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PACKAGE_TYPE {
-        BOX(10 , "BOX", "BOX（盒）"),
+        BOX(10, "BOX", "BOX（盒）"),
-        CARTON(20 , "CARTON", "CARTON（箱）"),
+        CARTON(20, "CARTON", "CARTON（箱）"),
-        PALLET(30 , "PALLET", "PALLET（栈板）"),
+        PALLET(30, "PALLET", "PALLET（栈板）"),
-        CONTAINER(40 , "PALLET", "PALLET（集装箱）");
+        CONTAINER(40, "PALLET", "PALLET（集装箱）");
 
         private String code;
         private String description;
         int value;
 
-        PACKAGE_TYPE(int value , String code, String description) {
+        PACKAGE_TYPE(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -2157,4 +1953,38 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 盘点物料 是否调差
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CS_IS_ADJUST {
+        IS_ADJUST(1, "是调差"), ADJUST(2, "否调差");
+
+        private int value;
+        private String description;
+
+        CS_IS_ADJUST(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -40,6 +42,7 @@ public class BfButton extends BaseBean {
     // 关联表单功能表id
     @Column(name="METHOD_ID")
     @ApiParam(value ="表单功能id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long methodId;
 
     @Column(name="METHOD_NAME_RDD")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java

@@ -36,7 +36,7 @@ public class BfDataObject extends BaseBean {
     private String objectName;
 
     @Column(name="OBJECT_CLASS_NAME")
-    @ApiParam(value ="中文名称")
+    @ApiParam(value ="类名称")
     private String objectClassName;
 
     @Column(name="OBJECT_TABLE_NAME")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,9 +36,11 @@ public class BfIntercept extends BaseBean {
 
     @Column(name="EXECUTE_MODE")
     @ApiParam(value ="执行方式")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Integer executeMode;
 
     @Column(name="EXECUTE_CONTENT")
     @ApiParam(value ="执行内容")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Integer executeContent;
 }

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -30,6 +32,7 @@ public class BfInterceptDetail extends BaseBean {
 
     @Column(name="INTERCEPT_ID")
     @ApiParam(value ="拦截器id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long interceptId;
 
     @Column(name="INTERCEPT_NAME_RDD")
@@ -46,6 +49,7 @@ public class BfInterceptDetail extends BaseBean {
 
     @Column(name="INTERCEPT_TARGET_ID")
     @ApiParam(value ="拦截目标id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long interceptTargetId;
 
     @Column(name="INTERCEPT_TARGET_NAME_RDD")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java

@@ -49,6 +49,13 @@ public class BfLayout extends BaseBean {
     @ApiParam(value = "列数")
     private Integer layoutColumnCount;
 
+    public Integer getLayoutColumnCount(){
+        if(this.layoutColumnCount == null) {
+            return null;
+        }
+        return layoutColumnCount.intValue();
+    }
+
     @Column(name = "LAYOUT_REPORT_COUNT")
     @ApiParam(value = "引用报表数量")
     private Integer layoutReportCount;

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,6 +36,7 @@ public class BfMenu extends BaseBean {
 
     @Column(name="PARENT_ID")
     @ApiParam(value ="父级菜单id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long parentId;
 
     @Column(name="PARENT_NAME_RDD")
@@ -62,6 +65,7 @@ public class BfMenu extends BaseBean {
 
     @Column(name="METHOD_ID")
     @ApiParam(value ="功能id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long methodId;
 
     @Column(name = "MENU_STATUS")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -34,6 +36,7 @@ public class BfMethod extends BaseBean {
 
     @Column(name="LAYOUT_ID")
     @ApiParam(value ="布局id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long layoutId;
 
     @Column(name="LAYOUT_NAME_RDD")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -30,10 +32,12 @@ public class BfMethodDetail extends BaseBean {
 
     @Column(name="METHOD_ID")
     @ApiParam(value ="功能id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long methodId;
 
     @Column(name="layout_column_id")
     @ApiParam(value ="布局列id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long layoutColumnId;
 
     @Column(name="METHOD_DETAIL_NAME")
@@ -42,6 +46,7 @@ public class BfMethodDetail extends BaseBean {
 
     @Column(name="ELEMENT_ID")
     @ApiParam(value ="表单元素id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long elementId;
 
     @Column(name="ELEMENT_NAME_RDD")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -30,11 +32,13 @@ public class BfMethodDetailProperty extends BaseBean {
 
     @Column(name="METHOD_ID")
     @ApiParam(value ="功能id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long methodId;
 
     // 关联功能明细表id
     @Column(name="PRI_METHOD_DETAIL_ID")
     @ApiParam(value ="主功能明细id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long priMethodDetailId;
 
     @Column(name="PRI_METHOD_DETAIL_NAME_RDD")
@@ -43,6 +47,7 @@ public class BfMethodDetailProperty extends BaseBean {
 
     @Column(name="PRI_ELEMENT_ID")
     @ApiParam(value ="主对象元素id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long priElementId;
 
     @Column(name="PRI_ELEMENT_NAME_RDD")
@@ -61,6 +66,7 @@ public class BfMethodDetailProperty extends BaseBean {
 
     @Column(name="SEC_METHOD_DETAIL_ID")
     @ApiParam(value ="关联功能明细id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long secMethodDetailId;
 
     @Column(name="SEC_METHOD_DETAIL_NAME_RDD")
@@ -69,6 +75,7 @@ public class BfMethodDetailProperty extends BaseBean {
 
     @Column(name="SEC_ELEMENT_ID")
     @ApiParam(value ="关联对象元素id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long secElementId;
 
     @Column(name="sec_element_name_rdd")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -30,6 +32,7 @@ public class BfRefButtonMethod extends BaseBean {
 
     @Column(name="BUTTON_ID")
     @ApiParam(value ="按钮id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long buttonId;
 
     @Column(name="BUTTON_NAME_RDD")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -30,6 +32,7 @@ public class BfRefMethodRole extends BaseBean {
 
     @Column(name="METHOD_ID")
     @ApiParam(value ="表单功能id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long methodId;
 
     @Column(name="METHOD_NAME_RDD")
@@ -38,6 +41,7 @@ public class BfRefMethodRole extends BaseBean {
 
     @Column(name="ROLE_ID")
     @ApiParam(value ="角色id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
 
     @Column(name="ROLE_NAME_RDD")

modules/i3plus-pojo-model/pom.xml

@@ -31,6 +31,11 @@
 
         <dependency>
             <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-form</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-wms</artifactId>
         </dependency>
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/SqlCreateDllModel.java

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.model.form;
 
+import cn.estsh.i3plus.pojo.form.bean.BfDataObject;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 import java.util.Objects;
@@ -28,4 +30,5 @@ public class SqlCreateDllModel {
     private String refGeneration;
 
     List<SqlColumnModel> columnlist ;
+
 }

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

@@ -7,7 +7,7 @@ import lombok.Data;
  * @Description : 邮件配置信息
  * @Reference :
  * @Author : yunhao
- * @CreateDate : 2019-01-27 10:53
+ * @CreateDate : 2019-01-27 10:54
  * @Modify:
  **/
 @Data

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

@@ -57,6 +57,14 @@ public class SysTaskPlan extends BaseBean {
     @ApiParam(value ="定时任务运行次数" , example ="0")
     private Integer taskPlanExecNum;
 
+    public int getTaskPlanExecNumValue(){
+        if(taskPlanExecNum == null){
+            return 0;
+        }else{
+            return taskPlanExecNum.intValue();
+        }
+    }
+
     // 枚举 ImppEnumUtil.TASK_METHOD_TYPE.CLASS_METHOD
     @Column(name="TASK_METHOD_TYPE")
     @ApiParam(value ="任务执行类型" ,example = "-1")

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

@@ -38,7 +38,7 @@ public class WmsASNMaster extends BaseBean {
     @ApiParam("单据类型")
     public String asnType;
 
-    @Column(name = "ASN_STATUS")
+    @Column(name = "MASTER_ORDER_STATUS")
     @ApiParam(value = "状态", example = "0")
     public Integer asnStatus;
 

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

@@ -29,6 +29,17 @@ import javax.persistence.Table;
 @Api("盘点实盘信息")
 public class WmsCSFactTrans extends BaseBean {
 
+    public WmsCSFactTrans(){}
+
+    public WmsCSFactTrans(Double factQty, String partNo){
+        if(factQty == null) {
+            this.factQty = 0d;
+        }else{
+            this.factQty = factQty;
+        }
+        this.partNo = partNo;
+    }
+
     @Column(name="ORDER_NO")
     @ApiParam("单号")
     public String orderNo;
@@ -81,11 +92,4 @@ public class WmsCSFactTrans extends BaseBean {
     @Column(name="REMARK")
     @ApiParam(value = "备注")
     public String reMark;
-
-    public WmsCSFactTrans(){}
-
-    public WmsCSFactTrans(double factQty, String partNo){
-        this.factQty = factQty;
-        this.partNo = partNo;
-    }
 }

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

@@ -95,11 +95,12 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam(value = "处理状态", example = "1")
     public Integer transStatus;
 
-    //虚拟字段（实盘数量、剩余数量）
     @Transient
+    @ApiParam(value = "实盘数量", example = "1")
     public Double factQty;
 
     @Transient
+    @ApiParam(value = "剩余数量", example = "1")
     public Double surplusQty;
 
     public Double getQty() {
@@ -108,8 +109,24 @@ public class WmsCSOrderDetails extends BaseBean {
 
     public WmsCSOrderDetails(){}
 
-    public WmsCSOrderDetails(double qty, String partNo){
+    public WmsCSOrderDetails(Double qty, String partNo,String orderNo,String whNo,String zoneNo,String locateNo,String partName){
         this.qty = qty;
         this.partNo = partNo;
+        this.orderNo = orderNo;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.partNameRdd = partName;
+    }
+
+    public WmsCSOrderDetails(Double qty, String partNo,String orderNo,String whNo,String zoneNo,String locateNo,String partName,String sn){
+        this.qty = qty;
+        this.partNo = partNo;
+        this.orderNo = orderNo;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.partNameRdd = partName;
+        this.sn = sn;
     }
 }

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

@@ -77,4 +77,8 @@ public class WmsCSOrderMaster extends BaseBean {
     @Transient
     @ApiParam(value = "盘点库位清单")
     public String[] wmsCSLocates;
+
+    @Column(name = "IS_PART")
+    @ApiParam(value = "是否散件")
+    private Integer isPart;
 }

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

@@ -120,12 +120,4 @@ public class WmsDocMovementMaster extends BaseBean {
     @Transient
     @ApiParam(value = "打印时间")
     private String printDate;
-
-    @Transient
-    @ApiParam(value = "发货人")
-    private String sendUser;
-
-    @Transient
-    @ApiParam(value = "发货日期")
-    private String sendDate;
 }

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

@@ -101,7 +101,7 @@ public class WmsPOMasterDetails extends BaseBean {
      */
     @Column(name = "ITEM_STATUS")
     @ApiParam("状态")
-    public String itemStatus;
+    public Integer itemStatus;
 
     @Column(name = "SNP")
     @ApiParam("标准包装")
@@ -118,6 +118,10 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam(value = "散件收货输入数量", example = "0")
     public Double inputRcQty;
 
+    @Transient
+    @ApiParam(value = "供应商批次")
+    public String dateCode;
+
 
     public Double getInputRcQty(){ return this.inputRcQty == null ? 0 : this.inputRcQty; }
 }

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

@@ -166,6 +166,10 @@ public class WmsStockSn extends BaseBean {
     @Transient
     public String barCode;
 
+    @ApiParam(value = "散件质检输入不良数量")
+    @Transient
+    public Double inputNCQty;
+
     public WmsStockSn(){}
 
     public WmsStockSn(String partNo){

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

@@ -60,7 +60,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
         HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result);
         HqlPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
         HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
@@ -161,12 +161,11 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getInPack(String.join(",", WmsEnumUtil.RC_ORDER_STATUS.CREATE.getValue() + "",
+        HqlPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "",
-                WmsEnumUtil.RC_ORDER_STATUS.RECEIPT.getValue() + ""),"poStatus",result);
+                WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""),"poStatus",result);
         HqlPack.getNumEqualPack(wmsPOMaster.getIsPart(),"isPart", result);
         HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result);
         HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
-        HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result);
         HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         HqlPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
         HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
@@ -748,6 +747,7 @@ public class WmsHqlPack {
 
         HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result);
         HqlPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result);
+        HqlPack.getNumEqualPack(wmsCSPart.getIsAdjust(), "isAdjust", result);
         HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result);
 
         getStringBuilderPack(wmsCSPart, result);
@@ -1022,6 +1022,35 @@ public class WmsHqlPack {
     }
 
     /**
+     * 散件质检单信息 查询条件封装
+     *
+     * @param wmsQCMaster
+     * @return
+     */
+    public static String packHqlWmsQCMasterPart(WmsQCMaster wmsQCMaster) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getInPack(String.join(",", WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() + "",
+                WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue() + ""),"orderStatus",result);
+        HqlPack.getNumEqualPack(wmsQCMaster.getIsPart(),"isPart",result);
+        //单号
+        HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
+        //业务类型
+        HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
+        //关联单据类型
+        HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result);
+        //关联单据号
+        HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result);
+        //入库单号
+        HqlPack.getStringEqualPack(wmsQCMaster.getIbNo(), "ibNo", result);
+
+        getStringBuilderPack(wmsQCMaster, result);
+
+        return result.toString();
+    }
+
+    /**
      * 质检单明细信息 查询条件封装
      *
      * @param wmsQCDetails
@@ -1104,6 +1133,7 @@ public class WmsHqlPack {
 
         //查询参数封装
         HqlPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result);
 
         getStringBuilderPack(wmsCSFactTrans, result);
 

pom.xml

@@ -115,6 +115,12 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>i3plus.pojo</groupId>
+                <artifactId>i3plus-pojo-form</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <!-- spring-json转换 -->
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>