Merge branch 'test'

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

@@ -115,7 +115,8 @@ public class DynamicEntity extends BaseBean implements Serializable {
             Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()});
             setMethod.invoke(this, 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/BlockFormEnumUtil.java

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

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

@@ -95,7 +95,7 @@ public class WmsEnumUtil {
         SUB(20, "SUB", "委外采购"),
         TAR(30, "TAR", "多角贸易采购"),
         TAP(40, "TAP", "多角代采购"),
-        AMP(50, "AMP", "AMP拉动");
+        AMP(50, "AMP", "AMP收货");
 
         private int value;
         private String code;
@@ -2442,6 +2442,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拆解领料"),
@@ -2711,56 +2712,111 @@ public class WmsEnumUtil {
         }
     }
 
-    public static  Map<String, Object> getEnumByName(String enumName) throws Exception{
+    public static Map<String, Object> getEnumByName(String enumName) throws Exception {
-            Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
+        Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
-            Class<Enum> clazz;
+        Class<Enum> clazz;
-            Enum[] enumConstants;
+        Enum[] enumConstants;
 
-            Map<String, Object> enumMap;// 枚举类
+        Map<String, Object> enumMap;// 枚举类
-            List<Map<String, Object>> values;// 枚举实例【enumName：{“”：}，{“”：}，{“”：}】
+        List<Map<String, Object>> values;// 枚举实例【enumName：{“”：}，{“”：}，{“”：}】
-            Map<String, Object> value;// 枚举实例属性
+        Map<String, Object> value;// 枚举实例属性
 
-            Method getValue;
+        Method getValue;
-            Method getCode;
+        Method getCode;
-            Method getDescription;
+        Method getDescription;
 
-            // 遍历内部类
+        // 遍历内部类
-            String simpleName;//内部类的类名
+        String simpleName;//内部类的类名
-            for (Class class1 : innerClazz) {
+        for (Class class1 : innerClazz) {
-                //获取内部内的类名
+            //获取内部内的类名
-                simpleName = class1.getSimpleName();
+            simpleName = class1.getSimpleName();
-                if (simpleName.equals(enumName)) {
+            if (simpleName.equals(enumName)) {
-                    // 判断类是不是枚举类
+                // 判断类是不是枚举类
-                    clazz = (Class<Enum>) Class.forName("cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$" + simpleName);
+                clazz = (Class<Enum>) Class.forName("cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$" + simpleName);
 
-                    // 枚举类方法初始化
+                // 枚举类方法初始化
-                    getCode = null;
+                getCode = null;
-                    try {
+                try {
-                        getCode = clazz.getMethod("getCode");
+                    getCode = clazz.getMethod("getCode");
-                    } catch (NoSuchMethodException e) {
+                } catch (NoSuchMethodException e) {
-                    }
+                }
-                    getValue = clazz.getMethod("getValue");
+                getValue = clazz.getMethod("getValue");
-                    getDescription = clazz.getMethod("getDescription");
+                getDescription = clazz.getMethod("getDescription");
-
+
-                    // 获取所有枚举实例
+                // 获取所有枚举实例
-                    enumConstants = clazz.getEnumConstants();
+                enumConstants = clazz.getEnumConstants();
-                    enumMap = new HashMap<>();
+                enumMap = new HashMap<>();
-                    values = new ArrayList<>();
+                values = new ArrayList<>();
-                    for (Enum enum1 : enumConstants) {
+                for (Enum enum1 : enumConstants) {
-                        value = new HashMap<>();
+                    value = new HashMap<>();
-                        value.put("value", getValue.invoke(enum1));
+                    value.put("value", getValue.invoke(enum1));
-                        if (getCode != null) {
+                    if (getCode != null) {
-                            value.put("code", getCode.invoke(enum1));
+                        value.put("code", getCode.invoke(enum1));
-                        }
-                        value.put("description", getDescription.invoke(enum1));
-                        values.add(value);
                     }
-                    enumMap.put("enumName", clazz.getSimpleName());
+                    value.put("description", getDescription.invoke(enum1));
-                    enumMap.put("valuesList", values);
+                    values.add(value);
-                    return enumMap;
+                }
+                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;
+        }
     }
 
     /**

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/wms/WmsTaskInfoModel.java

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

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

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

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/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.Column;
-
+import javax.persistence.Entity;
-import javax.persistence.*;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**

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

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

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

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

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

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

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

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

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

@@ -240,6 +240,7 @@ public class CoreHqlPack {
             HqlPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result);
         }
         HqlPack.getNumEqualPack(dictionary.getParentId(), "parentId", result);
+        HqlPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result);
 
         // 添加默认排序
         HqlPack.getOrderDefault(dictionary);
@@ -256,7 +257,7 @@ public class CoreHqlPack {
         StringBuffer result = new StringBuffer();
 
         // hql拼接
-        HqlPack.getStringLikerPack(toolType.getName(),"name",result);
+        HqlPack.getStringLikerPack(toolType.getName(),"name", result);
 
         // 添加默认排序
         HqlPack.getOrderDefault(toolType);

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

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

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/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/WmsASNMaster.java

@@ -109,4 +109,16 @@ public class WmsASNMaster extends BaseBean {
     @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/WmsMoveToERP.java

@@ -64,8 +64,8 @@ public class WmsMoveToERP extends BaseBean {
     private String carNo;
 
     @Column(name="ITEM")
-    @ApiParam(value = "行号", example = "0")
+    @ApiParam(value = "行号")
-    public Integer item;
+    public String item;
 
     @Column(name="PART_NO")
     @ApiParam("物料编码")

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,6 +5,8 @@ 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;
 
@@ -28,103 +30,116 @@ import javax.persistence.Transient;
 @Table(name = "WMS_PART")
 @Api("物料表")
 public class WmsPart extends BaseBean {
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
-    @ApiParam(value ="物料编码")
+    @ApiParam(value = "物料编码")
     private String partNo;
 
-    @Column(name="PART_NAME")
+    @Column(name = "PART_NAME")
-    @ApiParam(value ="物料名称")
+    @ApiParam(value = "物料名称")
     private String partName;
 
-    @Column(name="PART_SPEC")
+    @Column(name = "PART_SPEC")
-    @ApiParam(value ="物料规格")
+    @ApiParam(value = "物料规格")
     private String partSpec;
 
-    @Column(name="PART_TYPE")
+    @Column(name = "PART_TYPE")
-    @ApiParam(value ="物料类型")
+    @ApiParam(value = "物料类型")
     private String partType;
 
-    @Column(name="PART_TYPE_DESC")
+    @Column(name = "PART_TYPE_DESC")
-    @ApiParam(value ="物料类型描述")
+    @ApiParam(value = "物料类型描述")
     private String partTypeDesc;
 
-    @Column(name="GRAPHI_NO")
+    @Column(name = "GRAPHI_NO")
-    @ApiParam(value ="图号")
+    @ApiParam(value = "图号")
     private String graphiNo;
 
-    @Column(name="VERSION")
+    @Column(name = "VERSION")
-    @ApiParam(value ="版本")
+    @ApiParam(value = "版本")
     private String version;
 
-    @Column(name="COLOR")
+    @Column(name = "COLOR")
-    @ApiParam(value ="颜色")
+    @ApiParam(value = "颜色")
     private String color;
 
-    @Column(name="STOCK_UNIT")
+    @Column(name = "STOCK_UNIT")
-    @ApiParam(value ="库存单位")
+    @ApiParam(value = "库存单位")
     private String stockUnit;
 
-    @Column(name="ABC")
+    @Column(name = "ABC")
-    @ApiParam(value ="分类")
+    @ApiParam(value = "分类")
     private String abc;
 
-    @Column(name="BUY_UNIT")
+    @Column(name = "BUY_UNIT")
-    @ApiParam(value ="采购单位")
+    @ApiParam(value = "采购单位")
     private String buyUnit;
 
-    @Column(name="BU2SU")
+    @Column(name = "BU2SU")
-    @ApiParam(value ="换算率1",example = "1")
+    @ApiParam(value = "换算率1", example = "1")
     private Double bu2su;
 
-    @Column(name="PRICE_UNIT")
+    @Column(name = "PRICE_UNIT")
-    @ApiParam(value ="计价单位")
+    @ApiParam(value = "计价单位")
     private String priceUnit;
 
-    @Column(name="PU2SU")
+    @Column(name = "PU2SU")
-    @ApiParam(value ="换算率2",example = "1")
+    @ApiParam(value = "换算率2", example = "1")
     private Double pu2su;
 
-    @Column(name="SNP")
+    @Column(name = "SNP")
-    @ApiParam(value ="标准包装",example = "1")
+    @ApiParam(value = "标准包装", example = "1")
     private Double snp;
 
-    @Column(name="IQC")
+    @ColumnDefault("2")
-    @ApiParam(value ="收货检验否",example = "1")
+    @Column(name = "IQC")
+    @ApiParam(value = "收货检验否", example = "1")
     private Integer iqc;
 
-    @Column(name="MIN")
+    @Column(name = "MIN")
-    @ApiParam(value ="最低库存",example = "1")
+    @ApiParam(value = "最低库存", example = "1")
     private Double min;
 
-    @Column(name="MAX")
+    @Column(name = "MAX")
-    @ApiParam(value ="最高库存",example = "1")
+    @ApiParam(value = "最高库存", example = "1")
     private Double max;
 
-    @Column(name="PART_GROUP")
+    @Column(name = "PART_GROUP")
-    @ApiParam(value ="物料组")
+    @ApiParam(value = "物料组")
     private String partGroup;
 
-    @Column(name="LOT_CHECK_RULE")
+    @Column(name = "LOT_CHECK_RULE")
-    @ApiParam(value ="批次校验规则")
+    @ApiParam(value = "批次校验规则")
     private String lotCheckRule;
 
-    @Column(name="SN_CONTROL")
+    @Column(name = "SN_CONTROL")
-    @ApiParam(value ="是否条码管理",example = "1")
+    @ApiParam(value = "是否条码管理", example = "1")
     private Integer snControl;
 
-    @Column(name="IN_LOCATE_NO")
+    @Column(name = "VENDOR_NO")
-    @ApiParam(value ="默认入库库位")
+    @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;
 
@@ -136,13 +151,23 @@ public class WmsPart extends BaseBean {
     @ApiParam("库存水平")
     private String stockLevelStatus;
 
-    public WmsPart(){}
 
-    public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty){
+    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/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/WmsTaskDetails.java

@@ -91,9 +91,9 @@ public class WmsTaskDetails extends BaseBean {
     @ApiParam(value = "状态", example = "1")
     private Integer itemStatus;
 
-    public Integer getItemStatus(){
+    public Integer getItemStatus() {
-        if(itemStatus == null) {
+        if (itemStatus == null) {
-            return  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/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

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