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/WmsEnumUtil.java

@@ -184,7 +184,7 @@ public class WmsEnumUtil {
     }
 
     /**
-     * 订单明细状态，PO条码状态
+     * 订单明细状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ORDER_DETAILS_STATUS {
@@ -237,6 +237,59 @@ public class WmsEnumUtil {
     }
 
     /**
+     * PO条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PO_SN_STATUS {
+        CREATE(10, "N", "创建"),
+        RECEIPTED(20, "R", "已完成"),
+        CANCEL(30, "C", "行取消"),
+        PRINTED(40, "C", "已打印");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PO_SN_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;
+        }
+    }
+
+    /**
      * 产品入库，发运状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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/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-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-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/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);
@@ -166,7 +166,6 @@ public class WmsHqlPack {
         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);

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>