Merge branch 'dev' into test

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java

@@ -7,10 +7,13 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.commons.beanutils.BeanUtils;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -394,4 +397,21 @@ public class AndonManageQueue extends BaseBean {
 
     public AndonManageQueue() {
     }
+
+    public static void main(String[] args) {
+        try {
+            List ds = new ArrayList();
+            ds.add(new AndonManageQueue());
+
+
+
+            System.out.println(BeanUtils.describe(ds));
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
 }

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java

@@ -75,4 +75,11 @@ public class AndonPLC extends BaseBean {
     @Column(name = "IS_ALARM_STATUS")
     @ApiParam(value = "是否按灯状态", example = "1")
     private Integer isAlarmStatus;
+
+    public int getIsAlarmStatusVal(){
+        if(isAlarmStatus == null){
+            return 0;
+        }
+        return isAlarmStatus.intValue();
+    }
 }

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java

@@ -120,7 +120,7 @@ public class AndonHqlPack {
     }
 
     /**
-     * 按条件查询ANDON呼叫原因
+     * 按条件查询ANDON呼叫原因,==
      * @param andonAlarmCause
      * @return
      */
@@ -134,6 +134,22 @@ public class AndonHqlPack {
 
         return result;
     }
+    /**
+     * 按条件模糊查询ANDON呼叫原因,
+     * @param andonAlarmCause
+     * @return
+     */
+    public static DdlPackBean packHqlAndonAlarmCauseLike(AndonAlarmCause andonAlarmCause){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcCode(),"acCode", result);
+        DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcName(),"acName", result);
+
+        getStringBuilderPack(andonAlarmCause, result);
+
+        return result;
+    }
 
     /**
      * 按条件查询ANDON事件处理方法
@@ -180,15 +196,15 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getShiftCode(), "shiftCode", result);
         DdlPreparedPack.getInPackArray(obj, "statusCode", result);
 
-        getStringBuilderPack(andonManageQueue, result);
-
-        if(andonManageQueue.getCallTimeStart() != null || andonManageQueue.getCallTimeEnd() != null){
+        if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){
             DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true);
         }
 
+        getStringBuilderPack(andonManageQueue, result);
         // 根据优先级倒序，序号升序排序
-        DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
-                new String[]{"priorityLevel", "seq"}, result);
+//        DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
+//                new String[]{"priorityLevel", "seq"}, result);
+        result.setOrderByStr(andonManageQueue.orderBy());
 
         return result;
     }
@@ -402,6 +418,23 @@ public class AndonHqlPack {
 
         return result;
     }
+
+    /**
+     * 模糊查询安灯子类型信息
+     * @param andonAlarmDetailType
+     * @return
+     */
+    public static DdlPackBean packAndonAlarmDetailTypeLike(AndonAlarmDetailType andonAlarmDetailType) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringLikerPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result);
+        DdlPreparedPack.getStringLikerPack(andonAlarmDetailType.getAlarmDetailName(), "alarmDetailName", result);
+
+        getStringBuilderPack(andonAlarmDetailType, result);
+
+        return result;
+    }
 //
 //    /**
 //     * 安灯类型查询条件封装
@@ -439,6 +472,11 @@ public class AndonHqlPack {
      */
     public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) {
         DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringLikerPack(andonEventCause.getEcCode(), "ecCode", result);
+        DdlPreparedPack.getStringLikerPack(andonEventCause.getEcName(), "ecName", result);
+
         getStringBuilderPack(andonEventCause, result);
 
         return result;
@@ -487,8 +525,29 @@ public class AndonHqlPack {
      */
     public static DdlPackBean packAndonPLC(AndonPLC plc) {
         DdlPackBean result = new DdlPackBean();
-        getStringBuilderPack(plc, result);
 
+        DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringLikerPack(plc.getTagAddress(),"tagAddress",result);
+        DdlPreparedPack.getStringLikerPack(plc.getTagName(),"tagName",result);
+
+        getStringBuilderPack(plc, result);
         return result;
     }
+
+    /**
+     * 检查安灯记录是否以存在
+     * @param andonManageRecord
+     * @return
+     */
+    public static DdlPackBean packHqlAndonManageRecordIsExist(AndonManageRecord andonManageRecord){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getAndonOrderNo(),"andonOrderNo", result);
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getStatusCode(),"statusCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getAlarmCode(),"alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageRecord.getActionCode(),"actionCode", result);
+
+        getStringBuilderPack(andonManageRecord, result);
+        return  result;
+    }
 }

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

@@ -1,5 +1,8 @@
 package cn.estsh.i3plus.pojo.base.bean;
 
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+
 import java.util.HashMap;
 
 /**
@@ -49,6 +52,30 @@ public class DdlPackBean {
         hqlPreparedMap = new HashMap<>();
     }
 
+    /**
+     * 查询制定组织有效的数据
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getDdlPackBean(String organizeCode){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
+        DdlPreparedPack.getNumEqualPack(organizeCode,"organizeCode",result);
+
+        return result;
+    }
+
+    public static DdlPackBean getDdlPackBean(){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
+
+        return result;
+    }
+
     public boolean isHql() {
         return isHql;
     }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java

@@ -101,6 +101,12 @@ public class Pager {
     }
 
     public int getTotalPages() {
+        if(pageSize > 0 && totalRows > 0){
+            totalPages = totalRows / pageSize;
+            if (totalRows % pageSize > 0) {
+                totalPages++;
+            }
+        }
         return totalPages;
     }
 
@@ -109,6 +115,13 @@ public class Pager {
     }
 
     public int getStartRow() {
+        if(pageSize > 0){
+            if(currentPage >= 1){
+                return currentPage * pageSize - pageSize;
+            }else {
+                return 0;
+            }
+        }
         return startRow;
     }
 
@@ -125,6 +138,13 @@ public class Pager {
     }
 
     public int getEndRow() {
+        if(pageSize > 0){
+            if(currentPage > 1){
+                return currentPage * pageSize;
+            }else {
+                return pageSize;
+            }
+        }
         return endRow;
     }
 

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

@@ -112,10 +112,15 @@ public class DynamicEntity extends BaseBean implements Serializable {
         try {
             val = getValue(propName,val);
 //            LOGGER.error("设置动态对象属性值 attr name:{} -> value:{} ",setMethodName,val);
-            Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()});
-            setMethod.invoke(this, val);
+            if(val != null){
+                Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()});
+                setMethod.invoke(this, val);
+            }else{
+                LOGGER.error("设置动态对象属性值 attr name:{} -> value:{} ",setMethodName,val);
+            }
         } catch (NoSuchMethodException e) {
-            LOGGER.error("没有方法：{}",setMethodName,e);
+//            LOGGER.error("没有方法：{}",setMethodName,e);
+            LOGGER.error("没有方法：{}",setMethodName);
         } catch (IllegalAccessException e) {
             LOGGER.error("入参出错：{}:{}",val,val.getClass(),e);
         } catch (InvocationTargetException e) {

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

@@ -242,25 +242,31 @@ public class AndonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALARM_TYPE {
-        PART("PART_ALARM","物料"),
-        QUALITY("QUALITY_ALARM","质量"),
-        EQUIP("EQUMENT_ALARM","设备"),
-        PROCESS("ROUTING_ALARM","工艺"),
-        CHECK("OTHER_ALARM","其他"),
-        FIX_ERROR("FIX_ERROR", "自动报警");
+        PART("PART_ALARM", 111020005, "物料"),
+        QUALITY("QUALITY_ALARM", 111020006, "质量"),
+        EQUIP("EQUMENT_ALARM", 111020007, "设备"),
+        PROCESS("ROUTING_ALARM", 111020008, "工艺"),
+        CHECK("OTHER_ALARM", 111020009, "其他"),
+        FIX_ERROR("FIX_ERROR", 111020010, "自动报警");
 
         private String value;
+        private Integer code;
         private String description;
 
-        ALARM_TYPE(String value, String description) {
+        ALARM_TYPE(String value, Integer code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
-        public String getValue() {
+         public String getValue() {
             return value;
         }
 
+        public Integer getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }

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

@@ -1162,15 +1162,15 @@ public class BlockFormEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PROPERTY_TYPE {
-        STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE),
-        CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL),
-        INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL),
-        LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL),
-        DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL),
-        FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL),
-        BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL),
-        BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL);
-//        DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME);
+        STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,null),
+        CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null),
+        INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
+        LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
+        DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
+        FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
+        BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null),
+        BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null);
+//        DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,null);
 
         /**
          * 属性类型值
@@ -1202,7 +1202,12 @@ public class BlockFormEnumUtil {
          */
         private SQL_WHERE defaultWhere;
 
-        private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) {
+        /**
+         * 默认查询关系
+         */
+        private String defaultValue;
+
+        private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -1210,6 +1215,7 @@ public class BlockFormEnumUtil {
             this.clzFullName = clzFullName;
             this.controlType = controlType;
             this.defaultWhere = defaultWhere;
+            this.defaultValue = defaultValue;
         }
 
         public int getValue() {
@@ -1707,10 +1713,10 @@ public class BlockFormEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TRIGGER_EVENT {
-        CLICK(10, "CLICK", "单击"),
-        DB_LCLICK(20, "DB_LCLICK", "双击"),
-        MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"),
-        MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移动入");
+        CLICK(10, "CLICK", "单击");
+//        DB_LCLICK(20, "DB_LCLICK", "双击"),
+//        MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"),
+//        MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移入");
 
         private int value;
         private String code;

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

@@ -247,7 +247,9 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum USER_TYPE {
-        USER(1, "user", "普通用户"), ADMIN(2, "admin", "系统管理员"), SA(3, "sa", "超级管理员");
+        USER(1, "user", "普通用户"),
+        ADMIN(2, "admin", "系统管理员"),
+        SA(3, "sa", "超级管理员");
 
         private int value;
         private String code;
@@ -281,6 +283,26 @@ public class CommonEnumUtil {
             return tmp;
         }
 
+        public static USER_TYPE valueOfCode(String code) {
+            USER_TYPE tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
+
+        public static USER_TYPE valueOfDescription(String description) {
+            USER_TYPE tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
@@ -722,20 +744,13 @@ public class CommonEnumUtil {
     }
 
     /**
-     * 客户端操作系统
-     *             return "Windows";
-     *             return "Mac";
-     *             return "Unix";
-     *             return "Android";
-     *             return "IPhone";
+     * 客户端登录标识
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum LOG_LOGIN_PLATFORM {
-        WINDOWS(1, "Windows", "Windows 操作系统"),
-        MAC(2, "Mac", "Mac 操作系统"),
-        UNIX(3, "Unix", "Linux 操作系统"),
-        ANDROID(4, "Android", "Android 操作系统"),
-        IPHONE(5, "IPhone", "IPhone 操作系统");
+        PC_IMPP_CORE(10, "PC-IMPP", "PC后台管理端"),
+        PC_WMS_SWEB(20, "PC-SWEB", "PC SWEB后台管理端"),
+        Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端");
 
         private int value;
         private String name;
@@ -762,11 +777,11 @@ public class CommonEnumUtil {
             return name;
         }
 
-        public static String valueOf(int val) {
-            String tmp = null;
+        public static LOG_LOGIN_PLATFORM valueOf(int val) {
+            LOG_LOGIN_PLATFORM tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
-                    tmp = values()[i].getName();
+                    tmp = values()[i];
                 }
             }
             return tmp;

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

@@ -2,6 +2,12 @@ package cn.estsh.i3plus.pojo.base.enumutil;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description :
  * @Reference :
@@ -88,7 +94,8 @@ public class WmsEnumUtil {
         REG(10, "REG", "原物料采购"),
         SUB(20, "SUB", "委外采购"),
         TAR(30, "TAR", "多角贸易采购"),
-        TAP(40, "TAP", "多角代采购");
+        TAP(40, "TAP", "多角代采购"),
+        AMP(50, "AMP", "AMP收货");
 
         private int value;
         private String code;
@@ -296,6 +303,7 @@ public class WmsEnumUtil {
 
     /**
      * 产品入库，发运状态
+     * WMS_产品报工明细信息 ：单据状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRODUCT_INSTOCK_STATUS {
@@ -494,7 +502,11 @@ public class WmsEnumUtil {
         SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"),
         NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"),
         NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"),
-        LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库");
+        LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"),
+        ASN(190, "ASN", "ASN"),
+        PO(200, "PO", "PO"),
+        QC(210, "QC", "QC"),
+        AMPR(220, "AMPR", "AMPR");
 
 
         private int value;
@@ -601,7 +613,10 @@ public class WmsEnumUtil {
         IN_STOCK("IN_STOCK", "入库单"),
         SHIPPING("SHIPPING", "发运单"),
         QC("QC", "质检"),
-        CS("CS", "盘点");
+        CS("CS", "盘点"),
+        DR("DR", "直送收货"),
+        AMPR("AMPR", "AMP拉动收货");
+
         private String value;
         private String description;
 
@@ -1071,7 +1086,8 @@ public class WmsEnumUtil {
         CREATE(10, "创建"),
         BE_HANDLE(20, "待处理"),
         FINISH(30, "已处理"),
-        HANDLE_ERROR(40, "处理出错");
+        HANDLE_ERROR(40, "处理出错"),
+        TEST(50, "调试");
 
         private int value;
         private String description;
@@ -2216,7 +2232,7 @@ public class WmsEnumUtil {
      */
     public enum LANGUAGE_TYPE {
         GROOVY(1, "Groovy", 10),
-        PYTHON(2, "Python", 20),
+        PYTHON(2, "jython", 20), // "jython" string can not change
         JS(3, "JavaScript", 30);
         // 下面这2种语言没人会写，暂不支持
         //SCALA(40,"scala"),
@@ -2226,7 +2242,7 @@ public class WmsEnumUtil {
         private String description;
         private int value;
 
-        private LANGUAGE_TYPE(int index, String description, int value) {
+        LANGUAGE_TYPE(int index, String description, int value) {
             this.index = index;
             this.description = description;
             this.value = value;
@@ -2245,9 +2261,9 @@ public class WmsEnumUtil {
         }
 
         // 根据枚举编号获取语言代码
-        public static String getCodeByIndex(int index) {
+        public static String getCodeByIndex(Integer index) {
             for (LANGUAGE_TYPE languageType : LANGUAGE_TYPE.values()) {
-                if (languageType.getIndex() == index) {
+                if (languageType.getValue() == index.intValue()) {
                     return languageType.getDescription();
                 }
             }
@@ -2431,6 +2447,7 @@ public class WmsEnumUtil {
     public enum IMPORT_ORDER_TYPE {
         PO("PO", "要货计划"),
         ASN("ASN", "ASN"),
+        INSTRUCTIONS("INSTRUCTIONS", "指令"),
         SCATTERED_OUT("C00", "零星出库指令"),
         SCATTERED_INT("C01", "零星入指令"),
         NC_DISMANTLING_PICKING("C02", "NC拆解领料"),
@@ -2493,7 +2510,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_PART_TYPE {
-        RAW_MATERIAL(1, "原材料"), PARTIALLY_PREPARED_PRODUCTS(2, "半成品"), FINISHED_PRODUCT(3, "成品");
+        RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品");
 
         private int value;
         private String description;
@@ -2563,7 +2580,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_TRANS_QUAN_STATUS {
-        CREATE(1, "创建"), SUCCESS(10, "处理成功"),FAIL(30,"处理失败");
+        CREATE(1, "创建"), SUCCESS(10, "处理成功"), FAIL(30, "处理失败");
 
         private int value;
         private String description;
@@ -2647,4 +2664,267 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 包装类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOCK_LEVEL_STATUS {
+        LOW("LOW", "低于最低库存"),
+        HIGH("HIGH", "高于最高库存"),
+        NORMAL("NORMAL", "安全库存");
+
+        private String value;
+        private String description;
+
+        STOCK_LEVEL_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 外部接口单据来源枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SRC_STATUS {
+        ZMMES("ZMMES", "知明MES"),
+        TBMES("TBMES", "MES接口"),
+        AMP("AMP", "AMP系统");
+
+        private String value;
+        private String description;
+
+        SRC_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    public static Map<String, Object> getEnumByName(String enumName) throws Exception {
+        Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
+        Class<Enum> clazz;
+        Enum[] enumConstants;
+
+        Map<String, Object> enumMap;// 枚举类
+        List<Map<String, Object>> values;// 枚举实例【enumName：{“”：}，{“”：}，{“”：}】
+        Map<String, Object> value;// 枚举实例属性
+
+        Method getValue;
+        Method getCode;
+        Method getDescription;
+
+        // 遍历内部类
+        String simpleName;//内部类的类名
+        for (Class class1 : innerClazz) {
+            //获取内部内的类名
+            simpleName = class1.getSimpleName();
+            if (simpleName.equals(enumName)) {
+                // 判断类是不是枚举类
+                clazz = (Class<Enum>) Class.forName("cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$" + simpleName);
+
+                // 枚举类方法初始化
+                getCode = null;
+                try {
+                    getCode = clazz.getMethod("getCode");
+                } catch (NoSuchMethodException e) {
+                }
+                getValue = clazz.getMethod("getValue");
+                getDescription = clazz.getMethod("getDescription");
+
+                // 获取所有枚举实例
+                enumConstants = clazz.getEnumConstants();
+                enumMap = new HashMap<>();
+                values = new ArrayList<>();
+                for (Enum enum1 : enumConstants) {
+                    value = new HashMap<>();
+                    value.put("value", getValue.invoke(enum1));
+                    if (getCode != null) {
+                        value.put("code", getCode.invoke(enum1));
+                    }
+                    value.put("description", getDescription.invoke(enum1));
+                    values.add(value);
+                }
+                enumMap.put("enumName", clazz.getSimpleName());
+                enumMap.put("valuesList", values);
+                return enumMap;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 库存数量类型
+     */
+    @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 value;
+        private String description;
+
+        STOCK_QUAN_QTY_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public static STOCK_QUAN_QTY_TYPE codeOf(String code) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.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].value == code) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * ERP同步标识 10=待同步，20=同步成功，30=同步失败
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WMS_ERP_SYNC_FLAG {
+        CREATE(10, "待同步"), SUCCESS(20, "同步成功"), FAIL(30, "同步失败");
+
+        private int value;
+        private String description;
+
+        WMS_ERP_SYNC_FLAG(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;
+        }
+    }
+
+    /**
+     * ERP同步标识 10=待同步，20=同步成功，30=同步失败
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WMS_SN_GENERATE_RULE {
+        SOURCE(10, "源"), TARGET(20, "目标"), NON_ASSIGNMENT(30, "不赋值");
+
+        private int value;
+        private String description;
+
+        WMS_SN_GENERATE_RULE(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;
+        }
+    }
+
+    /**
+     * PDA顶级菜单
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PDA_TOP_MENU {
+        RC("RC", "收货"),
+        QC("QC", "质检"),
+        PICK("PICK", "拣货"),
+        OUTSTOCK("OUTSTOCK", "出库"),
+        INSTOCK("INSTOCK", "入库"),
+        MOVESTOCK("MOVESTOCK", "移库"),
+        ASSIST("ASSIST", "辅助"),
+        NC("NC", "NC"),
+        CS("CS", "盘点");
+
+        private String value;
+        private String description;
+
+        PDA_TOP_MENU(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java

@@ -9,6 +9,10 @@ package cn.estsh.i3plus.pojo.base.shirotoken;
  **/
 public class AdminToken extends BaseToken {
 
+    public AdminToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+        super(loginName, loginPwd, languageCode,loginPlatform);
+    }
+
     public AdminToken(String loginName, String loginPwd, String languageCode) {
         super(loginName, loginPwd, languageCode);
     }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java

@@ -14,6 +14,7 @@ public class BaseToken implements AuthenticationToken {
     private String loginName;
     private String loginPwd;
     private String languageCode;
+    private Integer loginPlatform;
 
     public BaseToken(String loginName, String loginPwd, String languageCode) {
         this.loginName = loginName;
@@ -21,6 +22,13 @@ public class BaseToken implements AuthenticationToken {
         this.languageCode = languageCode;
     }
 
+    public BaseToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+        this.loginName = loginName;
+        this.loginPwd = loginPwd;
+        this.languageCode = languageCode;
+        this.loginPlatform = loginPlatform;
+    }
+
     //身份
     @Override
     public Object getPrincipal() {
@@ -56,4 +64,12 @@ public class BaseToken implements AuthenticationToken {
     public void setLanguageCode(String languageCode) {
         this.languageCode = languageCode;
     }
+
+    public Integer getLoginPlatform() {
+        return loginPlatform;
+    }
+
+    public void setLoginPlatform(Integer loginPlatform) {
+        this.loginPlatform = loginPlatform;
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java

@@ -12,4 +12,8 @@ public class SaAdminToken extends BaseToken {
     public SaAdminToken(String loginName, String loginPwd, String languageCode) {
         super(loginName, loginPwd, languageCode);
     }
+
+    public SaAdminToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+        super(loginName, loginPwd, languageCode,loginPlatform);
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java

@@ -12,4 +12,8 @@ public class UserToken extends BaseToken {
     public UserToken(String loginName, String loginPwd, String languageCode) {
         super(loginName, loginPwd, languageCode);
     }
+
+    public UserToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+        super(loginName, loginPwd, languageCode,loginPlatform);
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java

@@ -109,7 +109,6 @@ public class BsonPackTool {
         return list;
     }
 
-
     /**
      * 封装日期
      * @param startDate 开始日期
@@ -161,7 +160,7 @@ public class BsonPackTool {
      * @param showToday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有
      * @param isShowTime 是否包含时分秒
      */
-    public static Bson timeBuilder( String date, String columnName, Bson bson, Boolean showToday,boolean isShowTime) {
+    public static Bson timeBuilder( String date, String columnName, Bson bson, boolean showToday,boolean isShowTime) {
         if(date != null && !"null".equals(date) && date.trim().length() > 0){
             date = getSafeParam(date);
 
@@ -249,6 +248,68 @@ public class BsonPackTool {
     }
 
     /**
+     * 大于日期
+     * @param dateTime 日期
+     * @param columnName HQL里对应的时间字段
+     * @param bson 封装的bson
+     * @param isShowTime 是否包含时分秒
+     */
+    public static Bson timeMore( String dateTime, String columnName, Bson bson, boolean isShowTime) {
+        if (dateTime == null || dateTime.trim().length() == 0) {
+            dateTime = "1900-01-01";
+        } else {
+            dateTime = getSafeParam(dateTime);
+            dateTime = dateTime.trim();
+        }
+        if (isShowTime && dateTime.trim().length()<=11) {
+            dateTime+= " 00:00:00";
+        }
+        if(bson == null) {
+            bson = Filters.and(
+                    Filters.gte(columnName, dateTime)  //大于等于开始日期
+            );
+        }else{
+            bson = Filters.and(
+                    bson,
+                    Filters.gte(columnName, dateTime)  //大于等于开始日期
+            );
+        }
+
+        return bson;
+    }
+
+    /**
+     * 小于日期
+     * @param dateTime 日期
+     * @param columnName HQL里对应的时间字段
+     * @param bson 封装的bson
+     * @param isShowTime 是否包含时分秒
+     */
+    public static Bson timeLess( String dateTime, String columnName, Bson bson, boolean isShowTime) {
+        if (dateTime == null || dateTime.trim().length() == 0) {
+            dateTime = "2100-01-01";
+        } else {
+            dateTime = getSafeParam(dateTime);
+            dateTime = dateTime.trim();
+        }
+        if (isShowTime&& dateTime.trim().length()<=11) {
+            dateTime+= " 23:59:59";
+        }
+        if(bson == null) {
+            bson = Filters.and(
+                    Filters.lte(columnName, dateTime)     //小于等于结束日期
+            );
+        }else{
+            bson = Filters.and(
+                    bson,
+                    Filters.lte(columnName, dateTime)     //小于等于结束日期
+            );
+        }
+
+        return bson;
+    }
+
+    /**
      * 封装String对象成like语句
      * @param str 对象值
      * @param columnName 列名

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java

@@ -50,6 +50,15 @@ public interface BaseRedis {
     Object getObject(Object key);
 
     /**
+     * 普通缓存获取
+     * @param key 键
+     * @param start 开始
+     * @param end 结束  0 到 -1代表所有值
+     * @return 值
+     */
+    Object getObject(Object key, long start, long end);
+
+    /**
      * 普通缓存放入
      * @param key 键
      * @param value 值

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

@@ -78,6 +78,11 @@ public class BfDataObject extends BaseBean {
     private List<BfDataObjectProperty> propertyList;
 
     @Transient
+    @ApiParam(value = "数据对象主键")
+    @AnnoOutputColumn(hidden = true)
+    private BfDataObjectProperty primaryKey;
+
+    @Transient
     @ApiParam(value = "数据对象主键属性")
     @AnnoOutputColumn(hidden = true)
     private List<BfDataObjectProperty> primaryPropertyList;

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

@@ -62,6 +62,10 @@ public class BfDataObjectProperty extends BaseBean {
     @ApiParam(value ="是否主键")
     private Integer isPrimaryKey;
 
+    @Column(name="IS_NULLABLE")
+    @ApiParam(value = "是否允许为空")
+    private Integer isNullable;
+
     // 字段长度
     @ApiParam(value = "字段长度")
     @Column(name="OBJECT_COLUMN_PRECISION")

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

@@ -56,7 +56,7 @@ public class BfElementProperty extends BaseBean {
     private String propertyTypeNameRdd;
 
     @Column(name="PROPERTY_NAME")
-    @ApiParam(value ="元素名称")
+    @ApiParam(value ="元素属性名称")
     private String propertyName;
 
     @Column(name="PROPERTY_CODE_RDD")
@@ -137,6 +137,6 @@ public class BfElementProperty extends BaseBean {
     private BfDataObjectProperty objectProperty;
 
     public Object getFormValue() {
-        return propertyFormValue == null ? propertyDefaultValue: propertyFormValue;
+        return propertyFormValue;
     }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ExportDataModel.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.model.common;
 
 import lombok.Data;
+import java.util.LinkedHashMap;
 
 /**
  * @Description :
@@ -16,4 +17,6 @@ public class ExportDataModel {
 
     private String exportData;
 
+    private String exportCol;
+
 }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.model.form;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.form.bean.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -56,6 +57,9 @@ public class ElementModel{
     @ApiParam(value = "元素类型")
     private Integer elementType;
 
+    @ApiParam(value = "分页信息")
+    private Pager pager;
+
     @ApiParam(value = "排序属性")
     public String orderByParam;
 

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

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMaster;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : JOB返回数据处理模型
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-07-03 15:50
+ * @Modify:
+ **/
+@Data
+public class WmsJOBModel implements Serializable {
+    private List<WmsMoveMasterModel> wmsMoveMasterModelList;
+    private String errorMessage;
+}

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 = "关联单据类型")
-    private String refType;
+    @ApiParam(value = "关联单据业务类型")
+    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/SessionUser.java

@@ -16,8 +16,6 @@ import java.util.List;
 @Data
 public class SessionUser implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     @ApiParam("用户ID")
     private Long userId;
 

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

@@ -43,6 +43,14 @@ public class SysFile extends BaseBean {
     @ApiParam(value ="文件所属模块")
     private Integer fileSoftType;
 
+    public int getFileSoftTypeVal(){
+        if(fileSoftType == null){
+            return 0;
+        }
+
+        return fileSoftType.intValue();
+    }
+
     @Column(name="USER_ID")
     @ApiParam(value ="用户ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -83,5 +91,4 @@ public class SysFile extends BaseBean {
     @Column(name="DOWNLOAD_NUM")
     @ApiParam(value ="下载次数" , example ="0")
     private Integer downloadNum;
-
 }

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

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
@@ -55,7 +56,8 @@ public class SysLocaleResource  extends BaseBean {
     @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档")
     private String resourceKey;
 
-    @Column(name="resource_value",columnDefinition="TEXT")
+    @Lob
+    @Column(name="resource_value")
     @ApiParam(value = "资源Value",example = "通过resourceType，languageId和key获取")
     private String resourceValue;
 

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

@@ -59,6 +59,10 @@ public class SysOrganize extends BaseBean {
     @ApiParam(value ="组织描述")
     private String organizeDescription;
 
+    @Column(name="ORGANIZE_ADDRESS")
+    @ApiParam(value ="组织地址")
+    private String organizeAddress;
+
     @Column(name="ORGANIZE_SORT")
     @ApiParam(value ="排序" , example ="1")
     private Integer organizeSort;

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

@@ -40,10 +40,6 @@ public class SysRole extends BaseBean {
     @ApiParam(value ="资源描述")
     private String roleDescription;
 
-    @Column(name="ROLE_GRADE")
-    @ApiParam(value ="角色等级（待定）" , example ="-1")
-    private Integer roleGrade;
-
     @Column(name="MODULE_NUMBER")
     @ApiParam(value ="权限模块数量" , example ="0" , access ="权限模块数量")
     private Integer moduleNumber;

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.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -142,7 +144,7 @@ public class SysUser extends BaseBean {
     @Transient
     @ApiParam(value ="角色ID" , example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
-    private String roleId;
+    private Long roleId;
 
     @Transient
     @ApiParam(value ="角色ID集合" , example = "0")

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.platform.sqlpack;
 
 import cn.estsh.i3plus.pojo.base.tool.BsonPackTool;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
 import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
 import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
@@ -19,82 +20,97 @@ public class CoreBsonPack {
 
     /**
      * 日志复杂查询
+     *
      * @param logSystem
      * @return
      */
-    public static Bson packBsonByLogSystem(SysLogSystem logSystem){
+    public static Bson packBsonByLogSystem(SysLogSystem logSystem) {
         Bson bson = new BasicDBObject();
 
-        bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(),"logLevel",bson);
-        bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(),"logModuleId",bson);
-        bson = BsonPackTool.timeBuilder(logSystem.getCreateDatetime(),"createDatetime",bson,false,false);
-        bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(),"remoteIp",bson);
-        bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(),"requestUrl",bson);
-        bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(),"logMethod",bson);
+        bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(), "logLevel", bson);
+        bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(), "logModuleId", bson);
+        bson = BsonPackTool.timeBuilder(logSystem.getCreateDatetime(), "createDatetime", bson, false, false);
+        bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(), "remoteIp", bson);
+        bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(), "requestUrl", bson);
+        bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(), "logMethod", bson);
 
         return bson;
     }
 
     /**
      * 系统操作日志
+     *
      * @param logOperate
      * @return
      */
-    public static Bson packBsonByLogOperate(SysLogOperate logOperate){
+    public static Bson packBsonByLogOperate(SysLogOperate logOperate) {
         Bson bson = new BasicDBObject();
 
-        bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(),"operateType",bson);
-        bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(),"operateModule",bson);
-        bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(),"createDatetime",bson,false,false);
-        bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(),"remoteIp",bson);
-        bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(),"operateMessage",bson);
-        bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(),"createUser",bson);
+        bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(), "operateType", bson);
+        bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(), "operateModule", bson);
+        bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(), "createDatetime", bson, false, false);
+        bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(), "remoteIp", bson);
+        bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(), "operateMessage", bson);
+        bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(), "createUser", bson);
 
         return bson;
     }
 
     /**
      * 系统异常日志复杂查询
+     *
      * @param sysLogException
      * @return
      */
-    public static Bson packBsonBySysLogException(SysLogException sysLogException){
+    public static Bson packBsonBySysLogException(SysLogException sysLogException) {
         Bson bson = new BasicDBObject();
 
-        bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(),"excModule",bson);
-        bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(),"excMessage",bson);
-        bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(),"createDatetime",bson,false,false);
+        bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(), "excModule", bson);
+        bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(), "excMessage", bson);
+        bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(), "createDatetime", bson, false, false);
 
         return bson;
     }
 
     /**
      * 定时任务日志复杂查询
+     *
      * @param sysLogTaskTime
      * @return
      */
-    public static Bson packBsonByLogTaskTime(SysLogTaskTime sysLogTaskTime){
+    public static Bson packBsonByLogTaskTime(SysLogTaskTime sysLogTaskTime) {
         Bson bson = new BasicDBObject();
 
-        bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(),"name",bson);
-        bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(),"groupName",bson);
-        bson = BsonPackTool.timeBuilder(sysLogTaskTime.getCreateDatetime(),"createDatetime",bson,false,false);
+        bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(), "name", bson);
+        bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(), "groupName", bson);
+        bson = BsonPackTool.timeBuilder(sysLogTaskTime.getCreateDatetime(), "createDatetime", bson, false, false);
 
         return bson;
     }
 
     /**
      * 区间
+     *
      * @param colName
      * @param min
      * @param max
      * @return
      */
-    public static Bson packBsonByInterval(String colName,Object min,Object max){
+    public static Bson packBsonByInterval(String colName, Object min, Object max) {
         Bson bson = new BasicDBObject();
 
-        bson = BsonPackTool.getNumBiggerPack(min,colName,bson);
-        bson = BsonPackTool.getNumSmallerPack(max,colName,bson);
+        bson = BsonPackTool.getNumBiggerPack(min, colName, bson);
+        bson = BsonPackTool.getNumSmallerPack(max, colName, bson);
 
         return bson;
-    }}
+    }
+
+    /**
+     * 指定日期之后
+     * @param dateTime 日期
+     * @return
+     */
+    public static Bson packBsonByDateTimeAfter(String dateTime){
+        return BsonPackTool.timeLess(dateTime, "createDatetime", null, true);
+    }
+}

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

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.platform.bean.*;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description : 平台对象封装
@@ -96,20 +97,39 @@ public class CoreHqlPack {
      * @param position
      * @return
      */
-    public static String packHqlSysPosition(SysPosition position){
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlSysPosition(SysPosition position){
+        return packHqlSysPosition(position,null);
+    }
+
+    public static DdlPackBean packHqlSysPosition(SysPosition position,List<Long> idList){
+        DdlPackBean result = DdlPackBean.getDdlPackBean(position.getOrganizeCode());
 
         // 查询参数封装
-        HqlPack.getNumEqualPack(position.getParentId(),"parentId",result);
-        HqlPack.getStringLikerPack(position.getName(),"name",result);
-        HqlPack.getStringLikerPack(position.getPositionCode(),"positionCode",result);
+//        DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result);
+        // String Like
+        DdlPreparedPack.getStringLikerPack(position.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result);
+        // In
+        DdlPreparedPack.getInPackList(idList,"id",result);
 
-        // 添加默认排序
-        HqlPack.getOrderDefault(position);
+        return result;
+    }
 
-        return result.toString();
+    /**
+     * 岗位复杂查询
+     * @param position
+     * @return
+     */
+    public static DdlPackBean packHqlSysPositionList(SysPosition position){
+        DdlPackBean result = new DdlPackBean();
+
+        // 查询参数封装
+        DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result);
+
+        return result;
     }
 
+
     /**
      * 组织复杂查询
      * @param organize
@@ -132,6 +152,17 @@ public class CoreHqlPack {
         return result.toString();
     }
 
+    public static DdlPackBean packHqlSysOrganize(SysOrganize organize,List<Long> idList){
+        DdlPackBean result = new DdlPackBean();
+
+        // String Like
+        DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(organize.getName(),"organizeCode",result);
+        // Number In
+        DdlPreparedPack.getInPackList(idList,"id",result);
+        return result;
+    }
+
     public static String packHqlSysOrganize(Long[] ids, Integer typeId){
         StringBuffer result = new StringBuffer();
 
@@ -165,6 +196,17 @@ public class CoreHqlPack {
         return result.toString();
     }
 
+    public static DdlPackBean packDdlBeanSysDepartment(SysDepartment department,List<Long> idList){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(department.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(department.getName(),"departmentCode",result);
+        DdlPreparedPack.getInPackList(idList,"id",result);
+
+        result.setOrderByStr(department.orderBy());
+        return result;
+    }
+
     /**
      * 系统权限复杂查询
      * @param menu
@@ -186,11 +228,27 @@ public class CoreHqlPack {
         return result.toString();
     }
 
+    public static DdlPackBean packDdlBeanSysMenu(SysMenu menu,List<Long> idList){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getInPackList(idList,"id",result);
+        DdlPreparedPack.getNumEqualPack(menu.getParentId(),"parentId",result);
+        DdlPreparedPack.getNumEqualPack(menu.getMenuType(),"menuType",result);
+        DdlPreparedPack.getNumEqualPack(menu.getMenuStatus(),"menuStatus",result);
+        DdlPreparedPack.getStringLikerPack(menu.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(menu.getMenuCode(),"menuCode",result);
+
+        result.setOrderByStr(menu.orderBy());
+
+        return result;
+    }
+
     /**
      * 系统角色复杂查询
      * @param role
      * @return
      */
+    @Deprecated
     public static String packHqlSysRole(SysRole role){
         StringBuffer result = new StringBuffer();
 
@@ -205,6 +263,27 @@ public class CoreHqlPack {
     }
 
     /**
+     * 系统角色复杂查询
+     * @param role
+     * @return
+     */
+    public static DdlPackBean packDdlBeanSysRole(SysRole role){
+        return  packDdlBeanSysRole(role,null);
+    }
+
+    public static DdlPackBean packDdlBeanSysRole(SysRole role,List<Long> idList){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
+        DdlPreparedPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result);
+        DdlPreparedPack.getStringLikerPack(role.getName(),"name",result);
+        DdlPreparedPack.getInPackList(idList,"id",result);
+
+        return  result;
+    }
+
+    /**
      * 系统参数复杂查询
      * @param config
      * @return
@@ -240,6 +319,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);
@@ -256,7 +336,7 @@ public class CoreHqlPack {
         StringBuffer result = new StringBuffer();
 
         // hql拼接
-        HqlPack.getStringLikerPack(toolType.getName(),"name",result);
+        HqlPack.getStringLikerPack(toolType.getName(),"name", result);
 
         // 添加默认排序
         HqlPack.getOrderDefault(toolType);
@@ -380,6 +460,7 @@ public class CoreHqlPack {
 
         // And X = X
         HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
         HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
         HqlPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
         HqlPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
@@ -404,6 +485,21 @@ public class CoreHqlPack {
         return  result.toString();
     }
 
+    public static DdlPackBean packDdlBeanSysUser(SysUser user,List<Long> idList){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
+        DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
+
+        DdlPreparedPack.getInPackList(idList,"id",result);
+        result.setOrderByStr(user.orderBy());
+
+        return result;
+    }
+
     /**
      * 账号复杂查询
      * @param user
@@ -490,6 +586,7 @@ public class CoreHqlPack {
 
         // And
         HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
 //        HqlPack.getNumEqualPack(userInfo.getOrganizeId(),"organizeId",result);
 //        HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result);
         HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);
@@ -510,6 +607,25 @@ public class CoreHqlPack {
         return  result.toString();
     }
 
+    public static DdlPackBean packDdlBeanSysUserInfo(SysUserInfo userInfo,List<Long> idList){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        // And
+        DdlPreparedPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);
+        DdlPreparedPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
+        DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result);
+        DdlPreparedPack.getInPackList(idList,"id",result);
+
+        // Like
+        DdlPreparedPack.getStringLikerPack(userInfo.getName(),"name",result);
+        DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result);
+
+        // 添加默认排序
+        result.setOrderByStr(userInfo.orderBy());
+
+        return  result;
+    }
+
     /**
      * 用户信息 复杂查询拼接
      * @param userInfo
@@ -767,4 +883,46 @@ public class CoreHqlPack {
 
         return ddlPackBean;
     }
+
+    public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref){
+        DdlPackBean result = new DdlPackBean();
+
+        // Number Eq
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
+        DdlPreparedPack.getNumEqualPack(ref.getUserId(),"userId",result);
+        // String Eq
+        DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(),"organizeCode",result);
+
+        return result;
+    }
+
+    public static DdlPackBean packDdlBeanSysRefUserRole(Long userId,Long roleId,String organizeCode){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        // Number Eq
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",result);
+        DdlPreparedPack.getNumEqualPack(userId,"userId",result);
+        DdlPreparedPack.getNumEqualPack(roleId,"roleId",result);
+
+        // String Eq
+        DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
+
+        return result;
+    }
+
+    /**
+     * 查询当前用户所有组织数据
+     * @param sysRefUserDepartments
+     * @return
+     */
+    public static DdlPackBean packHqlSysOrganize(List<SysRefUserDepartment> sysRefUserDepartments){
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(d -> d.getOrganizeId()).collect(Collectors.toList()),"id",packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",packBean);
+
+        return packBean;
+    }
 }

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

@@ -0,0 +1,120 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-28 15:12
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="AMP_JIS_REC")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="AMP_JIS收货",description = "AMP_JIS收货")
+public class AmpJisRec extends BaseBean{
+
+    @Column(name="ORDER_NO")
+    @ApiParam("JIS单号")
+    public String orderNo;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "数量", example = "0")
+    public Double qty;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    /**
+     * 状态:10=新建,20=已处理,30=处理出错
+     */
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value = "状态", example = "10")
+    public Integer orderStatus;
+
+    @Column(name="VENDOR_NO")
+    @ApiParam(value = "供应商编码", example = "10")
+    public String vendorNo;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String remark;
+
+    @Column(name="SRC")
+    @ApiParam("单据来源")
+    public String src;
+
+    @Column(name="SHIPPING_FLAG")
+    @ApiParam("特殊发货标志")
+    public String shippingFlag;
+
+    @Column(name="ERROR_MESSAGE")
+    @ApiParam("错误信息")
+    public String errorMessage;
+
+    @Column(name="AREA_NO")
+    @ApiParam("ERP库存地")
+    public String areaNo;
+
+    @Column(name="CAR_NO")
+    @ApiParam("车号")
+    public String carNo;
+
+    @Column(name="VIN")
+    @ApiParam("VIN号")
+    public String vin;
+
+    @Column(name="SHIPPING_TIME")
+    @ApiParam("发运时间")
+    public String shippingTime;
+
+    @Column(name="SID")
+    @ApiParam("sid")
+    public String sid;
+
+    @Column(name="IS_LOCK")
+    @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" )
+    public Integer isLock;
+
+    @Column(name="ERP_SYNC_FLAG")
+    @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" )
+    public Integer erpSyncFlag;
+
+    public AmpJisRec(Long id,String partNo, String partNameRdd,String vendorNo,Double qty,String unit){
+        this.id= id;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.vendorNo = vendorNo;
+        this.qty = qty;
+        this.unit = unit;
+    }
+}

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : AMP_物料
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-06-28 11:14
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="AMP_PART")
+@Api("AMP_物料")
+public class AmpPart extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam(value = "物料名称")
+    private String partNameRdd;
+
+    /**
+     * 状态：B汇总库存到AMP系统
+     */
+    @Column(name = "status")
+    @ApiParam(value = "状态")
+    private String status;
+}

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

@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : AMP_实时库存表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-06-28 11:09
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="AMP_STOCK_CURRENT")
+@Api("AMP_实时库存表")
+public class AmpStockCurrent extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam(value = "物料名称")
+    private String partNameRdd;
+
+    @Column(name = "UNIT")
+    @ApiParam(value = "单位")
+    private String unit;
+
+    @Column(name = "QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "数量", example = "0")
+    private Double qty;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    public String vendorNo;
+
+    @Column(name = "ZONE_NO")
+    @ApiParam(value = "存储区编号")
+    private String zoneNo;
+
+    @Column(name = "ZONE_NAME")
+    @ApiParam(value = "存储区名称")
+    private String zoneName;
+
+    /**
+     * 状态：10=创建，20=已处理，30=处理出错
+     */
+    @Column(name = "ORDER_STATUS")
+    @ApiParam(value = "状态")
+    private Integer orderStatus;
+}

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

@@ -64,6 +64,18 @@ public class BasVendor extends BaseBean{
     @ApiParam(value = "密码")
     private String password;
 
+    @Column(name = "VENDOR_CALL")
+    @ApiParam("供应商电话")
+    private String vendorCall;
+
+    @Column(name = "VENDOR_FAX")
+    @ApiParam("传真")
+    private String vendorFax;
+
+    @Column(name = "VENDOR_PHONE")
+    @ApiParam("手机")
+    private String vendorPhone;
+
     public BasVendor() {
     }
 

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

@@ -34,7 +34,7 @@ public class SapBase {
     private String rechms;
 
     @ApiParam(value = "同步标志", example = "-1")
-    private String synflg = "Y";
+    private String synflg = "N";
 
     @ApiParam(value = "同步日期", example = "-1")
     private String synymd;
@@ -43,7 +43,7 @@ public class SapBase {
     private String synhms;
 
     @ApiParam(value = "处理标志", example = "-1")
-    private String actflg = "Y";
+    private String actflg = "N";
 
     @ApiParam(value = "处理日期", example = "-1")
     private String actymd;
@@ -52,7 +52,7 @@ public class SapBase {
     private String acthms ="00:00:00";
 
     @ApiParam(value = "状态标志", example = "-1")
-    private String staflg = "Y";
+    private String staflg = "N";
 
     @ApiParam(value = "顺序号", example = "-1")
     private Integer seq = 1;
@@ -62,11 +62,13 @@ public class SapBase {
 
     public String getSynymdTime() {
         SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-DD");
-        return format.format(new Date());
+        //format.format(new Date())
+        return "";
     }
 
     public String getSynhmsTime() {
         SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss");
-        return format.format(new Date());
+        //format.format(new Date())
+        return "";
     }
 }

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

@@ -42,19 +42,19 @@ public class SapCyco extends SapBase{
 
     @ApiParam(value = "库存状态")
     @AnnoOutputColumn
-    private String zstat;
+    private String zstat="";
 
     @ApiParam(value = "特殊库存标识")
     @AnnoOutputColumn
-    private String sobkz;
+    private String sobkz="";
 
     @ApiParam(value = "项目号")
     @AnnoOutputColumn
-    private String zxm;
+    private String zxm="";
 
     @ApiParam(value = "库存账冻结标志")
     @AnnoOutputColumn
-    private String zdjbs;
+    private String zdjbs="";
 
     @ApiParam(value = "删除标识")
     @AnnoOutputColumn

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

@@ -0,0 +1,140 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+/**
+ * @Description :SAP_产品报工汇总表
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-27 15:40
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="SAP_DOC_FG_SUM")
+@Api("SAP_产品报工汇总表")
+public class SapDocFgSum extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("订单号")
+    public String orderNo;
+
+    @Column(name="PART_NO")
+    @ApiParam(value = "物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("单位")
+    public String partNameRdd;
+
+    @Column(name="QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "数量", example = "0")
+    public Double qty;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name="ERP_WORK_CENTER")
+    @ApiParam("ERP_工作中心")
+    public String erpWorkCenter;
+
+    @Column(name="IN_AREA_NO")
+    @ApiParam("入库ERP库存地")
+    public String inAreaNo;
+
+    @Column(name="ITEM_PART_NO")
+    @ApiParam("子物料号")
+    public String itemPartNo;
+
+    @Column(name="ITEM_PART_NAME")
+    @ApiParam("子料物料描述")
+    public String itemPartName;
+
+    @Column(name="ITEM_UNIT")
+    @ApiParam("子计量单位")
+    public String itemUnit;
+
+    @Column(name="ITEM_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "子用量", example = "0")
+    public Double itemQty;
+
+    @Column(name="OUT_AREA_NO")
+    @ApiParam("消耗ERP库存地")
+    public String outAreaNo;
+
+    /**
+     * 状态:10=新建,20=已处理,30=处理出错
+     */
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    public Integer orderStatus;
+
+    /**
+     * 数据来源:ZMMES=知明MES,TBMES=MES接口
+     */
+    @Column(name="SRC")
+    @ApiParam("单据来源")
+    public String src;
+
+    /**
+     * 是否锁定：1=锁定 2=未锁定
+     */
+    @Column(name="IS_LOCK")
+    @ApiParam(value = "是否锁定", example = "2")
+    public Integer isLock;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value = "BOM生效日期")
+    @Column(name = "EFF_START_TIME")
+    private String effStartTime;
+
+    @Transient
+    @ApiParam(value = "备注")
+    private String errorMsg;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @Transient
+    public Long wdfdId;
+
+    public SapDocFgSum(){}
+    public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo,
+                       String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) {
+        this.wdfdId = wdfdId;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.unit = unit;
+        this.erpWorkCenter = erpWorkCenter;
+        this.inAreaNo = inAreaNo;
+        this.itemPartNo = itemPartNo;
+        this.itemPartName = itemPartName;
+        this.itemUnit = itemUnit;
+        this.outAreaNo = outAreaNo;
+        this.itemQty = itemQty;
+        this.src = src;
+        this.isLock = isLock;
+        this.effStartTime = effStartTime;
+    }
+}

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

@@ -22,7 +22,7 @@ public class SapRdn extends SapBase{
 
     @ApiParam(value = "Item",example = "1")
     @AnnoOutputColumn
-    private Integer posnr;
+    private String posnr;
 
     @ApiParam(value = "收货工厂",example = "1")
     @AnnoOutputColumn

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

@@ -36,7 +36,7 @@ public class WmsASNMaster extends BaseBean {
 
     @Column(name = "ASN_TYPE")
     @ApiParam("单据类型")
-    public String asnType;
+    public Integer asnType;
 
     @Column(name = "ASN_STATUS")
     @ApiParam(value = "状态", example = "0")
@@ -101,4 +101,24 @@ public class WmsASNMaster extends BaseBean {
     @Transient
     @ApiParam("供应商名称")
     private String vendorName;
+
+    @Column(name = "ACTION_STATUS")
+    @ApiParam(value = "处理状态", example = "10")
+    public Integer actionStatus;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    public String remark;
+
+    @Transient
+    @ApiParam("供应商电话")
+    private String vendorCall;
+
+    @Transient
+    @ApiParam("传真")
+    private String vendorFax;
+
+    @Transient
+    @ApiParam("手机")
+    private String vendorPhone;
 }

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

@@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
-import java.util.List;
 
 /**
  * @Description : ASN订单明细信息
@@ -43,7 +42,7 @@ public class WmsASNMasterDetails extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name = "QTY")
     @ColumnDefault("0")

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

@@ -90,4 +90,12 @@ public class WmsBom extends BaseBean {
     public Double getItemQty() {
         return this.itemQty == null ? 0 : this.itemQty.doubleValue();
     }
+
+    public WmsBom(){}
+    public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum) {
+        this.itemPartNo = itemPartNo;
+        this.itemPartNam = itemPartNam;
+        this.itemUnit = itemUnit;
+        this.bomNum = bomNum;
+    }
 }

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

@@ -35,7 +35,7 @@ public class WmsCSAdjustRange extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name="IS_ADJUST")
     @ApiParam(value = "调整标识", example = "1")
@@ -62,7 +62,7 @@ public class WmsCSAdjustRange extends BaseBean {
     public String unit;
 
     public WmsCSAdjustRange(){}
-    public WmsCSAdjustRange(String orderNo, Integer item, Integer isAdjust, String partNo, String partNameRdd, String zoneNo, String locateNo, String unit,String organizeCode) {
+    public WmsCSAdjustRange(String orderNo, String item, Integer isAdjust, String partNo, String partNameRdd, String zoneNo, String locateNo, String unit,String organizeCode) {
         this.orderNo = orderNo;
         this.item = item;
         this.isAdjust = isAdjust;

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

@@ -30,17 +30,6 @@ import javax.persistence.Transient;
 @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;
@@ -98,7 +87,50 @@ public class WmsCSFactTrans extends BaseBean {
     @ApiParam(value = "剩余数量", example = "1")
     public Double surplusQty;
 
-    @Transient
+    @Column
     @ApiParam("源库位编号")
     public String srcLocateNo;
+
+    @Column
+    @ApiParam("源存储区编号")
+    public String srcZoneNo;
+
+    @Column
+    @ApiParam("源仓库编号")
+    public String srcWhNo;
+
+    @Column
+    @ApiParam("是否范围内")
+    public Integer isScope;
+
+    public WmsCSFactTrans(){}
+
+    public Integer getIsScopeVal() {
+        return isScope== null ? 0 : this.isScope.intValue();
+    }
+
+    public WmsCSFactTrans(Double factQty, String partNo){
+        if(factQty == null) {
+            this.factQty = 0d;
+        }else{
+            this.factQty = factQty;
+        }
+        this.partNo = partNo;
+    }
+
+    public WmsCSFactTrans(String orderNo, String whNo, String zoneNo, String locateNo,Double factQty, String partNo, String partNameRdd, String sn, Double qty, String unit, String srcLocateNo, String srcZoneNo, String srcWhNo) {
+        this.orderNo = orderNo;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.factQty = factQty;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.sn = sn;
+        this.qty = qty;
+        this.unit = unit;
+        this.srcLocateNo = srcLocateNo;
+        this.srcZoneNo = srcZoneNo;
+        this.srcWhNo = srcWhNo;
+    }
 }

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

@@ -39,7 +39,7 @@ public class WmsCSOrderDetails extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name = "QTY")
     @ColumnDefault("0")

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

@@ -58,14 +58,26 @@ public class WmsCSOrderMaster extends BaseBean {
     @ApiParam(value = "是否允许清点", example = "1")
     public Integer isInventory;
 
-    @Transient
-    @ApiParam(value = "盘点明细集")
-    public List<WmsCSOrderDetails> wmsCSOrderDetailsList;
-
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
     public Integer isTask;
 
+    @Column(name = "IS_PART")
+    @ApiParam(value = "是否散件")
+    public Integer isPart;
+
+    @Column(name = "YEAR")
+    @ApiParam("年度")
+    public String year;
+
+    @Column(name = "IS_SYNC_ERP")
+    @ApiParam("是否同步ERP: 1=已同步，2=未同步")
+    public Integer isSyncErp;
+
+    @Transient
+    @ApiParam(value = "盘点明细集")
+    public List<WmsCSOrderDetails> wmsCSOrderDetailsList;
+
     @Transient
     @ApiParam(value = "盘点物料清单")
     public String[] wmsCSParts;
@@ -78,14 +90,6 @@ public class WmsCSOrderMaster extends BaseBean {
     @ApiParam(value = "盘点库位清单")
     public String[] wmsCSLocates;
 
-    @Column(name = "IS_PART")
-    @ApiParam(value = "是否散件")
-    private Integer isPart;
-
-    @Column(name = "YEAR")
-    @ApiParam("年度")
-    public String year;
-
     public Integer getIsInventoryVal() {
         return this.isInventory == null ? 0 :this.isInventory.intValue();
     }

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

@@ -34,7 +34,7 @@ public class WmsCSRange extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name = "PART_NO")
     @ApiParam("物料编码")

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

@@ -0,0 +1,134 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : WMS_产品报工明细信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-06-26 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_DOC_FG_DETAIL")
+@Api("WMS_产品报工明细信息")
+public class WmsDocFgDetail extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("订单号")
+    public String orderNo;
+
+    @Column(name="WO_NO")
+    @ApiParam("ERP工单号")
+    public String woNo;
+
+    @Column(name="LINE_NO")
+    @ApiParam("生产线")
+    public String lineNo;
+
+    @Column(name="COMMIT_TIME")
+    @ApiParam("提交时间")
+    public String commitTime;
+
+    @Column(name="MFG_LOG_NO")
+    @ApiParam("生产批次")
+    public String mfgLocNo;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    @Column(name="PART_NO")
+    @ApiParam(value = "物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="BOM_UPDATE")
+    @ApiParam("BOM切换标识")
+    public String bomUpdate;
+
+    @Column(name="QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "数量", example = "0")
+    public Double qty;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name="IN_AREA_NO")
+    @ApiParam("入库ERP库存地")
+    public String inAreaNo;
+
+    @Column(name="ITEM_PART_NO")
+    @ApiParam("子物料号")
+    public String itemPartNo;
+
+    @Column(name="ITEM_PART_NAME")
+    @ApiParam("子料物料描述")
+    public String itemPartName;
+
+    @Column(name="ITEM_UNIT")
+    @ApiParam("子计量单位")
+    public String itemUnit;
+
+    @Column(name="ITEM_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "子用量", example = "0")
+    public Double itemQty;
+
+    @Column(name="OUT_AREA_NO")
+    @ApiParam("消耗ERP库存地")
+    public String outAreaNo;
+
+    @Column(name="SID")
+    @ApiParam("SID")
+    public String sid;
+
+    /**
+     * 状态:10=新建,20=已处理,30=处理出错
+     */
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    public Integer orderStatus;
+
+    /**
+     * 数据来源:ZMMES=知明MES,TBMES=MES接口
+     */
+    @Column(name="SRC")
+    @ApiParam("单据来源")
+    public String src;
+
+    /**
+     * 是否锁定：1=锁定 2=未锁定
+     */
+    @Column(name="IS_LOCK")
+    @ApiParam(value = "是否锁定", example = "2")
+    public Integer isLock;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String remark;
+
+    @Column(name="COMMIT_DATE")
+    @ApiParam("提交日期")
+    public String commitDate;
+}

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

@@ -41,7 +41,7 @@ public class WmsDocMovementDetails extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name = "QTY")
     @ColumnDefault("0")
@@ -210,4 +210,16 @@ public class WmsDocMovementDetails extends BaseBean {
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
     public transient Integer lockVersion;
+
+    @Transient
+    @ApiParam("移动类型")
+    public Integer moveType;
+
+    @Transient
+    @ApiParam("业务类型")
+    public Integer busiType;
+
+    @Column(name = "IS_SN")
+    @ApiParam(value = "条码生成状态", example = "1")
+    public Integer isSn;
 }

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

@@ -68,4 +68,18 @@ public class WmsLocatePart extends BaseBean {
     public Integer getIsGeneratePicklist() {
         return this.isGeneratePicklist == null ? 0 : this.isGeneratePicklist;
     }
+
+    public double getPullQtyValue(){
+        return this.pullQty ==null?0d:this.pullQty.doubleValue();
+    }
+
+    public double getMaxValue(){
+        return this.max ==null?0:this.max.doubleValue();
+    }
+
+    public double getMinValue(){
+        return this.min ==null?0:this.min.doubleValue();
+    }
+
+
 }

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

@@ -105,6 +105,10 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam(value = "状态", example = "0")
     public Integer itemStatus;
 
+    @Column(name="REF_ITEM")
+    @ApiParam("关联单据行号")
+    public String refItem;
+
     /**
      * ASN,PO,SO
      */
@@ -124,6 +128,22 @@ public class WmsMoveDetails extends BaseBean {
     @Transient
     private Long finishedCounts;
 
+    @Transient
+    @ApiParam("交易类型")
+    private String transTypeCode;
+
+    @Transient
+    @ApiParam("erp库存地")
+    private String ZoneNo;
+
+    @Transient
+    @ApiParam("条码")
+    private String sn;
+
+    @Transient
+    @ApiParam("交易类型名称")
+    private String transTypeName;
+
     public WmsMoveDetails(){}
 
     public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){
@@ -148,4 +168,31 @@ public class WmsMoveDetails extends BaseBean {
     public Long getFinishedCounts() {
         return finishedCounts == null ? 0L : this.finishedCounts;
     }
+
+    public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode
+            ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,
+                          String srcZoneNo,String srcLocateNo,String destWhNo, String destZoneNo, String destLocateNo,
+                          Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo){
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.orderNo = orderNo;
+        this.item = item;
+        this.partNameRdd = partNameRdd;
+        this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
+        this.itemStatus = itemStatus;
+        this.unit = unit;
+        this.srcWhNo = srcWhNo;
+        this.srcZoneNo = srcZoneNo;
+        this.srcLocateNo = srcLocateNo;
+        this.destWhNo = destWhNo;
+        this.destZoneNo = destZoneNo;
+        this.destLocateNo = destLocateNo;
+        this.transQty = transQty;
+        this.rejectQty = rejectQty;
+        this.refSrc = refSrc;
+        this.vendorNo = vendorNo;
+        this.custNo = custNo;
+
+    }
 }

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

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * @Description : 库存移动单主表信息
@@ -52,6 +49,7 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam(value = "交易类型代码")
     private String transTypeCode;
 
+    @Lob
     @Column(name = "ERROR_MESSAGE")
     @ApiParam(value = "错误信息")
     private String errorMessage;
@@ -63,4 +61,98 @@ public class WmsMoveMaster extends BaseBean {
     @Column(name = "CAR_NO")
     @ApiParam(value = "车牌号")
     private String carNo;
+
+    @Column(name = "BUSI_TYPE_CODE")
+    @ApiParam(value = "业务类型编码")
+    private Integer busiTypeCode;
+
+    @Transient
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Transient
+    @ApiParam("状态")
+    private Integer itemStatus;
+
+    @Transient
+    @ApiParam("erp库存地")
+    private String ZoneNo;
+
+    @Transient
+    @ApiParam("关联单号")
+    private String refSrc;
+
+    @Transient
+    @ApiParam("目标仓库")
+    private String destWhNo;
+
+    @Transient
+    @ApiParam("存储区")
+    private String destZoneNo;
+
+    @Transient
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Transient
+    @ApiParam("条码")
+    private String sn;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Transient
+    @ApiParam("单位")
+    private String unit;
+
+    @Transient
+    @ApiParam("源仓库")
+    private String srcWhNo;
+
+    @Transient
+    @ApiParam("源存储区代码")
+    private String srcZoneNo;
+
+    @Transient
+    @ApiParam("处理数量")
+    private Double transQty;
+
+    @Transient
+    @ApiParam("不合格处理数量")
+    private Double rejectQty;
+
+    @Transient
+    @ApiParam("库位")
+    private String destLocateNo;
+
+    @Transient
+    @ApiParam("交易类型名称")
+    private String transTypeName;
+
+    public WmsMoveMaster(){};
+
+    public WmsMoveMaster(String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
+                         String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty) {
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
+        this.itemStatus = itemStatus;
+        this.unit = unit;
+        this.srcWhNo = srcWhNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destWhNo = destWhNo;
+        this.destZoneNo = destZoneNo;
+        this.transQty = transQty;
+        this.rejectQty = rejectQty;
+
+
+    }
+
+
+
+
+
 }

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

@@ -150,6 +150,33 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("特殊批次")
     public String fixLotNo;
 
+
+
+    @Transient
+    @ApiParam("业务类型编码")
+    private String busiTypeCode;
+
+
+    @Transient
+    @ApiParam(value = "交易类型代码")
+    private String transTypeCode;
+
+    @Transient
+    @ApiParam("关联单号")
+    public String refSrc;
+
+    @Transient
+    @ApiParam("erp库存地")
+    private String ZoneNo;
+
+    @Transient
+    @ApiParam("供应商编码")
+    private String vendorNo;
+
+    @Transient
+    @ApiParam("交易类型名称")
+    private String transTypeName;
+
     public WmsMoveSn(){}
 
     public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){
@@ -165,4 +192,45 @@ public class WmsMoveSn extends BaseBean {
     public Long getFinishedCounts() {
         return finishedCounts == null ? 0L : this.finishedCounts;
     }
+
+    public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String busiTypeCode,  String transTypeCode, String refSrc) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.destQty = destQty;
+        this.busiTypeCode = busiTypeCode;
+        this.transTypeCode = transTypeCode;
+        this.refSrc = refSrc;
+    }
+    public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String transTypeCode, String refSrc) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.destQty = destQty;
+        this.transTypeCode = transTypeCode;
+        this.refSrc = refSrc;
+    }
+    public  WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,
+            String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus,
+            Integer destSnStatus, String lotNo,String dateCode){
+            this.organizeCode=organizeCode;
+            this.orderNo=orderNo;
+            this.item=item;
+            this.partNo=partNo;
+            this.partNameRdd=partNameRdd;
+            this.transTypeCode=transTypeCode;
+            this.transTypeName=transTypeName;
+            this.itemStatus=itemStatus;
+            this.unit=unit;
+            this.srcLocateNo=srcLocateNo;
+            this.destLocateNo=destLocateNo;
+            this.srcQty=srcQty;
+            this.srcQty=srcQty;
+            this.destQty=destQty;
+            this.srcQcStatus=srcQcStatus;
+            this.descQcStatus=descQcStatus;
+            this.srcSnStatus=srcSnStatus;
+            this.destSnStatus=destSnStatus;
+            this.lotNo=lotNo;
+            this.dateCode=dateCode;
+
+}
 }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.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;
@@ -63,8 +64,8 @@ public class WmsMoveToERP extends BaseBean {
     private String carNo;
 
     @Column(name="ITEM")
-    @ApiParam(value = "行号", example = "0")
-    public Integer item;
+    @ApiParam(value = "行号")
+    public String item;
 
     @Column(name="PART_NO")
     @ApiParam("物料编码")
@@ -136,6 +137,26 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("关联单号")
     public String refSrc;
 
+    @Column(name = "SRC_AREA_NO")
+    @ApiParam("来源库存地")
+    public String srcAreaNo;
+
+    @Column(name = "DEST_AREA_NO")
+    @ApiParam("目标库存地")
+    public String destAreaNo;
+
+    @Column(name = "BUSI_TYPE_CODE")
+    @ApiParam("交易类型")
+    public Integer busiTypeCode;
+
+    @Column(name = "IS_SYNC", nullable = false)
+    @ApiParam("是否同步")
+    public Integer isSync = CommonEnumUtil.FALSE;
+
+    @Column(name="REF_ITEM")
+    @ApiParam("关联单据行号")
+    public String refItem;
+
     @ApiParam(value = "待出库数量", example = "0")
     @Transient
     private Long waitingCounts;
@@ -144,6 +165,9 @@ public class WmsMoveToERP extends BaseBean {
     @Transient
     private Long finishedCounts;
 
+    @Transient
+    private Long shippingId;
+
     public Double getRejectQty(){
         return this.rejectQty == null ? 0 : this.rejectQty.doubleValue();
     }

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

@@ -119,4 +119,16 @@ public class WmsPOMaster extends BaseBean {
     @Transient
     @ApiParam("邮箱")
     private String vendorEmail;
+
+    @Transient
+    @ApiParam("供应商电话")
+    private String vendorCall;
+
+    @Transient
+    @ApiParam("传真")
+    private String vendorFax;
+
+    @Transient
+    @ApiParam("手机")
+    private String vendorPhone;
 }

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

@@ -5,12 +5,15 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import net.bytebuddy.implementation.bind.annotation.Default;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :物料实体
@@ -27,103 +30,151 @@ import javax.persistence.Table;
 @Table(name = "WMS_PART")
 @Api("物料表")
 public class WmsPart extends BaseBean {
-    @Column(name="PART_NO")
-    @ApiParam(value ="物料编码")
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
     private String partNo;
 
-    @Column(name="PART_NAME")
-    @ApiParam(value ="物料名称")
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "物料名称")
     private String partName;
 
-    @Column(name="PART_SPEC")
-    @ApiParam(value ="物料规格")
+    @Column(name = "PART_SPEC")
+    @ApiParam(value = "物料规格")
     private String partSpec;
 
-    @Column(name="PART_TYPE")
-    @ApiParam(value ="物料类型")
+    @Column(name = "PART_TYPE")
+    @ApiParam(value = "物料类型")
     private String partType;
 
-    @Column(name="PART_TYPE_DESC")
-    @ApiParam(value ="物料类型描述")
+    @Column(name = "PART_TYPE_DESC")
+    @ApiParam(value = "物料类型描述")
     private String partTypeDesc;
 
-    @Column(name="GRAPHI_NO")
-    @ApiParam(value ="图号")
+    @Column(name = "GRAPHI_NO")
+    @ApiParam(value = "图号")
     private String graphiNo;
 
-    @Column(name="VERSION")
-    @ApiParam(value ="版本")
+    @Column(name = "VERSION")
+    @ApiParam(value = "版本")
     private String version;
 
-    @Column(name="COLOR")
-    @ApiParam(value ="颜色")
+    @Column(name = "COLOR")
+    @ApiParam(value = "颜色")
     private String color;
 
-    @Column(name="STOCK_UNIT")
-    @ApiParam(value ="库存单位")
+    @Column(name = "STOCK_UNIT")
+    @ApiParam(value = "库存单位")
     private String stockUnit;
 
-    @Column(name="ABC")
-    @ApiParam(value ="分类")
+    @Column(name = "ABC")
+    @ApiParam(value = "分类")
     private String abc;
 
-    @Column(name="BUY_UNIT")
-    @ApiParam(value ="采购单位")
+    @Column(name = "BUY_UNIT")
+    @ApiParam(value = "采购单位")
     private String buyUnit;
 
-    @Column(name="BU2SU")
-    @ApiParam(value ="换算率1",example = "1")
+    @Column(name = "BU2SU")
+    @ApiParam(value = "换算率1", example = "1")
     private Double bu2su;
 
-    @Column(name="PRICE_UNIT")
-    @ApiParam(value ="计价单位")
+    @Column(name = "PRICE_UNIT")
+    @ApiParam(value = "计价单位")
     private String priceUnit;
 
-    @Column(name="PU2SU")
-    @ApiParam(value ="换算率2",example = "1")
+    @Column(name = "PU2SU")
+    @ApiParam(value = "换算率2", example = "1")
     private Double pu2su;
 
-    @Column(name="SNP")
-    @ApiParam(value ="标准包装",example = "1")
+    @Column(name = "SNP")
+    @ApiParam(value = "标准包装", example = "1")
     private Double snp;
 
-    @Column(name="IQC")
-    @ApiParam(value ="收货检验否",example = "1")
+    @ColumnDefault("2")
+    @Column(name = "IQC")
+    @ApiParam(value = "收货检验否", example = "1")
     private Integer iqc;
 
-    @Column(name="MIN")
-    @ApiParam(value ="最低库存",example = "1")
+    @Column(name = "MIN")
+    @ApiParam(value = "最低库存", example = "1")
     private Double min;
 
-    @Column(name="MAX")
-    @ApiParam(value ="最高库存",example = "1")
+    @Column(name = "MAX")
+    @ApiParam(value = "最高库存", example = "1")
     private Double max;
 
-    @Column(name="PART_GROUP")
-    @ApiParam(value ="物料组")
+    @Column(name = "PART_GROUP")
+    @ApiParam(value = "物料组")
     private String partGroup;
 
-    @Column(name="LOT_CHECK_RULE")
-    @ApiParam(value ="批次校验规则")
+    @Column(name = "LOT_CHECK_RULE")
+    @ApiParam(value = "批次校验规则")
     private String lotCheckRule;
 
-    @Column(name="SN_CONTROL")
-    @ApiParam(value ="是否条码管理",example = "1")
+    @Column(name = "SN_CONTROL")
+    @ApiParam(value = "是否条码管理", example = "1")
     private Integer snControl;
 
-    @Column(name="IN_LOCATE_NO")
-    @ApiParam(value ="默认入库库位")
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商代码")
+    private String vendorNo;
+
+    @Column(name = "IN_LOCATE_NO")
+    @ApiParam(value = "默认入库库位")
     private String inLocateNo;
 
-    @Column(name="PROD_CFG_TYPE_CODE")
+    @Transient
+    @ApiParam("默认入库存储区")
+    private String inZoneNo;
+
+    @Transient
+    @ApiParam("默认入库仓库")
+    private String inWhNo;
+
+    @Column(name = "PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
 
-    @Column(name="PROD_CFG_TYPE_NAME")
+    @Column(name = "PROD_CFG_TYPE_NAME")
     @ApiParam("项目名称")
     private String prodCfgTypeName;
 
-    @Column(name="OUT_CLOSE_FLAG")
+    @Column(name = "OUT_CLOSE_FLAG")
     @ApiParam("項目结算标识")
-    private String outCloseFlag;
+    private String outCloseFlag = "2";
+
+    @Transient
+    @ApiParam("总数量")
+    private Double qty;
+
+    @Transient
+    @ApiParam("库存水平")
+    private String stockLevelStatus;
+
+    @Column(name = "IS_PROD_LOT")
+    @ApiParam(value = "是否录入生产批次", example = "1")
+    private Integer isProdLot = 2;
+
+    public int getIqcValue(){
+        return this.iqc == null ? 0 : this.iqc.intValue();
+    }
+
+    public WmsPart() {
+    }
+
+    public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty) {
+        this.partNo = partNo;
+        this.partName = partName;
+        this.max = maxQty;
+        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/WmsQCDetails.java

@@ -39,7 +39,7 @@ public class WmsQCDetails extends BaseBean {
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     @Column(name = "QTY")
     @ColumnDefault("0")

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

@@ -35,7 +35,7 @@ public class WmsQCTrans extends BaseBean {
 
     @Column(name="ITEM")
     @ApiParam("行号")
-    public Integer item;
+    public String item;
 
     /**
      * 状态:1=创建,10=已处理

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

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description SAP_单据锁定表
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2019/6/29 18:04
+ * @Modify
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "SAP_ORDER_LOCK")
+@Api("SAP_单据锁定")
+public class WmsSapOrderLock extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("订单号")
+    public String orderNo;
+
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    public String busiType;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    @Column(name = "LOCK_FLAG")
+    @ApiParam("锁定标识")
+    public String lockFlag;
+
+}

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

@@ -78,6 +78,10 @@ public class WmsShipping extends BaseBean {
     @ApiParam("特殊发货标志")
     public String shippingFlag;
 
+    @Column(name="SHIPPING_TIME")
+    @ApiParam("发运时间")
+    public String shippingTime;
+
     @Transient
     @ApiParam(value ="客户简称")
     private String custName;
@@ -85,4 +89,37 @@ public class WmsShipping extends BaseBean {
     @Transient
     @ApiParam(value = "发往地简称")
     private String flagName;
+
+    @Column(name="AREA_NO")
+    @ApiParam("ERP库存地")
+    public String areaNo;
+
+    @Column(name="CAR_NO")
+    @ApiParam("车号")
+    public String carNo;
+
+    @Column(name="ERROR_MESSAGE")
+    @ApiParam("错误信息")
+    public String errorMessage;
+
+    @Column(name="IS_LOCK")
+    @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" )
+    public Integer isLock;
+
+    @Column(name="ERP_SYNC_FLAG")
+    @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" )
+    public Integer erpSyncFlag;
+
+    public WmsShipping(){}
+
+    public WmsShipping(Long id,Double qty, String carNo, String partNo, String partNameRdd, String custNo, String unit,String areaNo) {
+        this.id = id;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.unit = unit;
+        this.custNo = custNo;
+        this.carNo = carNo;
+        this.areaNo = areaNo;
+    }
 }

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description : 库存信息
@@ -122,47 +123,88 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "报废数量", example = "0")
     private Double scrapQty;
 
-    public Double getQty() {
+    @Transient
+    @ApiParam(value = "总数量")
+    private Double totalQty;
+
+    @Transient
+    @ApiParam(value = "项目名称")
+    private String prodCfgTypeName;
+
+    @Transient
+    @ApiParam(value = "箱数", example = "-1")
+    private Integer boxQty;
+
+    @Transient
+    @ApiParam(value = "零件数", example = "-1")
+    private Double partQty;
+
+    @Transient
+    @ApiParam(value = "ERP库存地")
+    private String areaNo;
+
+    @Transient
+    @ApiParam(value = "存储区集合")
+    private List<String> zoneList;
+
+
+    public String getAreaNo() {
+        return areaNo;
+    }
+
+    public Double getQtyVal() {
         return this.qty == null ? 0 : this.qty;
     }
 
-    public Double getFailQty() {
+    public Double getFailQtyVal() {
         return this.failQty == null ? 0 : this.failQty;
     }
 
-    public Double getHoldQty() {
+    public Double getHoldQtyVal() {
         return this.holdQty == null ? 0 : this.holdQty;
     }
 
-    public Double getQcQty() {
+    public Double getQcQtyVal() {
         return this.qcQty == null ? 0 : this.qcQty;
     }
 
-    public Double getRinQty() {
+    public Double getRinQtyVal() {
         return this.rinQty == null ? 0 : this.rinQty;
     }
 
-    public Double getFreezeQty() {
+    public Double getFreezeQtyVal() {
         return this.freezeQty == null ? 0 : this.freezeQty;
     }
 
-    public Double getConsignQty() {
+    public Double getConsignQtyVal() {
         return this.consignQty == null ? 0 : this.consignQty;
     }
 
-    public Double getLockQty() {
+    public Double getLockQtyVal() {
         return this.lockQty == null ? 0 : this.lockQty;
     }
 
-    public Double getScrapQty() {
+    public Double getScrapQtyVal() {
         return this.scrapQty == null ? 0 : this.scrapQty;
     }
 
+    public Double getTotalVal() {
+        return this.totalQty == null ? 0 : this.totalQty;
+    }
+
+    public Double getPartQtyVal() {
+        return this.partQty == null ? 0 : this.partQty;
+    }
+
+    public Integer getBoxQtyVal() {
+        return this.boxQty == null ? 0 : this.boxQty;
+    }
+
     public WmsStockQuan() {
     }
 
     public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName,
-                        Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty) {
+                        Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty,String prodCfgTypeCode ,String prodCfgTypeName) {
         this.whNo = whNo;
         this.zoneNo = zoneNo;
         this.partNo = partNo;
@@ -176,6 +218,8 @@ public class WmsStockQuan extends BaseBean {
         this.freezeQty = freezeQty;
         this.consignQty = consignQty;
         this.lockQty = lockQty;
+        this.prodCfgTypeCode= prodCfgTypeCode;
+        this.prodCfgTypeName = prodCfgTypeName;
     }
     public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
         this.qty = qty;
@@ -188,4 +232,45 @@ public class WmsStockQuan extends BaseBean {
         this.lockQty = lockQty;
         this.scrapQty = scrapQty;
     }
+
+    public WmsStockQuan(String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit,
+                        Double sumQty, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
+        this.locateNo = locateNo;
+        this.boxQty = boxQty;
+        this.partQty = partQty;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.sumQty = sumQty;
+        this.qty = qty;
+        this.failQty = failQty;
+        this.holdQty = holdQty;
+        this.qcQty = qcQty;
+        this.rinQty = rinQty;
+        this.freezeQty = freezeQty;
+        this.consignQty = consignQty;
+        this.lockQty = lockQty;
+        this.scrapQty = scrapQty;
+    }
+
+    public WmsStockQuan(String whNo, String zoneNo, String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit,
+                         Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.boxQty = boxQty;
+        this.partQty = partQty;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.qty = qty;
+        this.failQty = failQty;
+        this.holdQty = holdQty;
+        this.qcQty = qcQty;
+        this.rinQty = rinQty;
+        this.freezeQty = freezeQty;
+        this.consignQty = consignQty;
+        this.lockQty = lockQty;
+        this.scrapQty = scrapQty;
+    }
 }

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

@@ -64,25 +64,25 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "物料名称")
     private String partNameRdd;
 
-    @Column(name = "LOT_NO")
+    @Column(name = "LOT_NO", nullable = false)
     @ApiParam("收货日期（批次编码）")
-    public String lotNo;
+    public String lotNo = "";
 
-    @Column(name = "DATE_CODE")
+    @Column(name = "DATE_CODE", nullable = false)
     @ApiParam(value = "生产日期")
-    public String dateCode;
+    public String dateCode = "";
 
-    @Column(name = "LEFT_CODE")
+    @Column(name = "LEFT_CODE", nullable = false)
     @ApiParam(value = "有效期")
-    private String leftCode;
+    private String leftCode = "";
 
     @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商编码")
     public String vendorNo;
 
-    @Column(name = "FIX_LOT_NO")
+    @Column(name = "FIX_LOT_NO", nullable = false)
     @ApiParam(value = "特殊批次")
-    private String fixLotNo;
+    private String fixLotNo = "";
 
     @Column(name = "CUST_NO")
     @ApiParam(value = "客户编码")
@@ -151,9 +151,9 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "客户条码")
     private String custSn;
 
-    @Column(name = "ERP_ZONE_NO")
-    @ApiParam(value = "ERP库存地")
-    public String erpZoneNo;
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心代码")
+    private String workCenterCode;
 
     @ApiParam(value = "仓库名称")
     @Transient
@@ -223,6 +223,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "ERP库存地集合")
     public List<String> erpZoneNoList;
 
+    @Transient
+    @ApiParam(value = "ERP库存地")
+    public String erpZoneNo;
+
     public WmsStockSn(){}
 
 

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

@@ -91,9 +91,9 @@ public class WmsTaskDetails extends BaseBean {
     @ApiParam(value = "状态", example = "1")
     private Integer itemStatus;
 
-    public Integer getItemStatus(){
-        if(itemStatus == null) {
-            return  null;
+    public Integer getItemStatus() {
+        if (itemStatus == null) {
+            return null;
         }
         return itemStatus.intValue();
     }
@@ -134,11 +134,19 @@ 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;
     }
 
-    public String getQtyTxt(){
+    public String getQtyTxt() {
         return new BigDecimal(getQty() + "").stripTrailingZeros().toPlainString();
     }
 

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

@@ -61,4 +61,15 @@ public class WmsTransType extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long tmId;
 
+    @Column(name = "PDA_ICON")
+    @ApiParam(value = "PDA图标")
+    private String pdaIcon;
+
+    @Transient
+    @ApiParam("菜单URL")
+    private String menuUrl;
+
+    public String getMenuUrl() {
+        return "/handle?transCode=" + this.transTypeCode;
+    }
 }

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

@@ -40,4 +40,8 @@ public class WmsUnit extends BaseBean {
     @ApiParam(value = "单位精度")
     private Integer unitPrecision;
 
+    public int getUnitPrecisionValue(){
+        return this.unitPrecision == null?0:this.unitPrecision.intValue();
+    }
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.wms.engine.rule;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GenerateSnRule {
+    /**
+     * 业务类型  130
+     */
+    private Integer busiType;
+
+    /**
+     * 是否允许生成条码
+     */
+    private Integer isGenerateSn;
+
+    /**
+     * 条码状态
+     */
+    private Integer snStatus;
+
+    /**
+     * 质量状态
+     */
+    private Integer qcStatus;
+
+    /**
+     * 仓库来源
+     */
+    private Integer whSource;
+
+    /**
+     * 存储区来源
+     */
+    private Integer zoneSource;
+
+    /**
+     * 库位来源
+     */
+    private Integer locateSource;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @author Yerik Stone
+ * @description WmsMoveUnfinishedOrderModel
+ * @date 2019/6/26
+ */
+@Data
+@Api("未完成订单模型")
+public class WmsMoveUnfinishedOrderModel extends  BaseBean{
+
+
+
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("未完成数量")
+    private Double destQty;
+
+
+
+    @ApiParam("交易类型")
+    private String transTypeCode;
+
+    @ApiParam("交易类型名称")
+    private String transTypeName;
+
+    @ApiParam("关联单号")
+    private String refSrc;
+
+    public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, String transTypeCode, String transTypeName, String refSrc) {
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.destQty = destQty;
+        this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
+        this.refSrc = refSrc;
+    }
+
+    public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, String transTypeCode,  String refSrc) {
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.destQty = destQty;
+        this.transTypeCode = transTypeCode;
+        this.refSrc = refSrc;
+    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java

@@ -69,7 +69,7 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable<WmsPoAsnRe
 
     @Override
     public int compareTo(WmsPoAsnRecvModel o) {
-        return getLocalTime(this.getPlanTime()).isAfter(getLocalTime(o.getPlanTime()))? 1 : 0;
+        return getLocalTime(this.getPlanTime()).isAfter(getLocalTime(o.getPlanTime()))? 1 : -1;
     }
 
     public static LocalTime getLocalTime(String planTime){

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpJisRecRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.AmpJisRec;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-28 15:17
+ * @Modify:
+ **/
+@Repository
+public interface AmpJisRecRepository extends BaseRepository<AmpJisRec,Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/AmpStockCurrentRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.AmpStockCurrent;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : AMP_实时库存表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-06-28 15:19
+ * @Modify:
+ **/
+@Repository
+public interface AmpStockCurrentRepository extends BaseRepository<AmpStockCurrent,Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java

@@ -15,8 +15,9 @@ import org.springframework.stereotype.Repository;
 public interface IEngineRulePersistenceRepository extends BaseRepository<EngineRulePersistence, Long> {
     /**
      * 按照规则编号查询规则实体
+     * @param organizeCode 工厂代码
      * @param ruleNo 规则编号
      * @return 规则实体
      */
-    EngineRulePersistence findByRuleNo(String ruleNo);
+    EngineRulePersistence findByOrganizeCodeAndRuleNo(String organizeCode, String ruleNo);
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java

@@ -21,12 +21,14 @@ public interface IEngineScriptPersistenceRepository extends BaseRepository<Engin
      * @param scriptNo 脚本编号
      * @return 脚本实体对象
      */
-    EngineScriptPersistence findByScriptNo(String scriptNo);
+    EngineScriptPersistence findByOrganizeCodeAndScriptNo(String organizeCode, String scriptNo);
 
     /**
      * 查找所有的脚本语言类型
      * @return 数据库中已经存在的脚本语言类型
      */
-    @Query("select t.languageType from EngineScriptPersistence t group by t.languageType")
+    @Query("select t.languageType from EngineScriptPersistence t group by t.organizeCode, t.languageType")
     List findGroupByLanguageType();
+
+    EngineScriptPersistence findByScriptNo(String scriptNo);
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SapDocFgSumRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.SapDocFgSum;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-27 20:19
+ * @Modify:
+ **/
+@Repository
+public interface SapDocFgSumRepository extends BaseRepository<SapDocFgSum, Long> {
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java

@@ -11,4 +11,12 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsConfig;
  * @Modify:
  **/
 public interface WmsConfigRepository extends BaseRepository<WmsConfig, Long> {
+
+    /**
+     * 按照工厂代码和配置代码查询配置信息
+     * @param organizeCode 工厂代码
+     * @param configCode 配置代码
+     * @return 配置信息
+     */
+    WmsConfig getFirstByOrganizeCodeAndConfigCode(String organizeCode, String configCode);
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocFgDetailRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.BasCustomer;
+import cn.estsh.i3plus.pojo.wms.bean.WmsDocFgDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :WMS_产品报工明细信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-06-26 16:03
+ * @Modify:
+ **/
+@Repository
+public interface WmsDocFgDetailRepository extends BaseRepository<WmsDocFgDetail,Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSapOrderLockRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsSapOrderLock;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description SAP_单据锁定 DAO层接口
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2019/6/29 18:35
+ * @Modify
+ */
+@Repository
+public interface WmsSapOrderLockRepository extends BaseRepository<WmsSapOrderLock, Long> {
+}

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

@@ -118,7 +118,7 @@ public class WmsHqlPack {
         DdlPackBean packBean = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
@@ -247,7 +247,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
         DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
-        DdlPreparedPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
+        DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result);
         DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result);
 
         getStringBuilderPack(wmsPart, result);
@@ -329,7 +329,7 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsOpType(WmsOpType wmsOpType) {
         DdlPackBean result = new DdlPackBean();
 
-        DdlPreparedPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
+        DdlPreparedPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
         DdlPreparedPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
         DdlPreparedPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result);
 
@@ -412,7 +412,11 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result);
         DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
         DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result);
+        if(wmsLocate.getZoneNo() != null){
+            DdlPreparedPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsLocate.getZoneNo().split(","))),","),"",result);
+        }
+
+       // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result);
         DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result);
 
         getStringBuilderPack(wmsLocate, result);
@@ -475,7 +479,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);
         //客户全称
@@ -517,7 +521,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result);
+        DdlPreparedPack.getNumEqualPack(wmsASNMaster.getAsnType(), "asnType", result);
         DdlPreparedPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result);
@@ -633,7 +637,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);
 
@@ -803,6 +807,9 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
+
         getStringBuilderPack(wmsStockSn, result);
 
         return result;
@@ -817,9 +824,9 @@ public class WmsHqlPack {
     public static DdlPackBean packWmsStockQuan(WmsStockQuan wmsStockQuan) {
         DdlPackBean result = new DdlPackBean();
 
+        DdlPreparedPack.getInPackList(wmsStockQuan.getZoneList(),"zoneNo",result);
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result);
@@ -1010,6 +1017,8 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsMoveSn.getItem(), "item", result);
+        DdlPreparedPack.getNumEqualPack(wmsMoveSn.getItemStatus(), "itemStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsMoveSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result);
@@ -1115,7 +1124,7 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsStockSnReportByPager(WmsStockSn wmsStockSn) {
         DdlPackBean result = new DdlPackBean();
 
-        DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
+        DdlPreparedPack.getStringLikerPack(wmsStockSn.getRefSrc(), "refSrc", result);
 
         // 物料编码支持多选
         DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result);
@@ -1129,12 +1138,25 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
-
+        if(wmsStockSn.getIsValid()!= null){
+            DdlPreparedPack.getNumEqualPack(wmsStockSn.getIsValid(), "isValid", result);
+        }
         getStringBuilderPack(wmsStockSn, result);
 
         return result;
     }
 
+    public static DdlPackBean packHqlcheckSNInLocate(WmsStockQuan wmsStockQuan) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
+
+        result.setWhereAppend(result.getWhereAppend()+" and qty  > 0 ");
+        getStringBuilderPack(wmsStockQuan, result);
+
+        return result;
+    }
+
     /**
      * 质检单明细信息 查询条件封装
      *
@@ -1399,7 +1421,7 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsStockSn(WmsStockSn wmsStockSn) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result);
+        DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
@@ -1421,7 +1443,7 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result);
+        DdlPreparedPack.getStringLikerPack(wmsSnPrintRcd.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result);
         DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result);
         DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result);
@@ -1929,8 +1951,10 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsProdCfgType(WmsProdCfgType wmsProdCfgType) {
         DdlPackBean result = new DdlPackBean();
         //查询参数封装
-        DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result);
-        DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result);
+        if(wmsProdCfgType != null){
+            DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result);
+            DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result);
+        }
         DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(),"isValid",result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
 //        getStringBuilderPack(wmsProdCfgType, result);
@@ -1981,8 +2005,9 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsUnit(WmsUnit wmsUnit) {
         DdlPackBean result = new DdlPackBean();
 
-        DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitCode(), "unitCode", result);
-        DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitName(), "unitName", result);
+        DdlPreparedPack.getStringEqualPack(wmsUnit.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringLikerPack(wmsUnit.getUnitCode(), "unitCode", result);
+        DdlPreparedPack.getStringLikerPack(wmsUnit.getUnitName(), "unitName", result);
         DdlPreparedPack.getNumEqualPack(wmsUnit.getUnitPrecision(), "unitPrecision", result);
         getStringBuilderPack(wmsUnit, result);
 
@@ -2049,4 +2074,39 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 根据id集合查询生产报工明细表的数据
+     *
+     * @param ids
+     * @return
+     */
+    public static DdlPackBean packHqlWmsDocFgDetail(List<Long> ids) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getInPackList(ids,"id",result);
+
+        return result;
+    }
+
+    /**
+     * 根据id集合查询生产报工明细表的数据
+     *
+     * @param statusList
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean packHqlWmsASNMasterByStatus(List<Integer> statusList,String organizeCode) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getInPackList(statusList,"asnStatus",result);
+        DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(),"actionStatus",result);
+        DdlPreparedPack.getStringEqualPack(String.valueOf(WmsEnumUtil.ORDER_TYPE.AMP.getValue()),"asnType",result);
+        DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+
+        return result;
+    }
 }