Merge remote-tracking branch 'origin/dev' into dev

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

@@ -94,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;
@@ -2690,7 +2691,8 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SRC_STATUS {
         ZMMES("ZMMES", "知明MES"),
-        TBMES("TBMES", "MES接口");
+        TBMES("TBMES", "MES接口"),
+        AMP("AMP","AMP系统");
 
         private String value;
         private String description;
@@ -2709,55 +2711,144 @@ 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 code;
+        private String description;
+
+        STOCK_QUAN_QTY_TYPE(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getValue() {
+            return code;
+        }
+
+        public static STOCK_QUAN_QTY_TYPE codeOf(String code) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    return values()[i];
                 }
             }
             return null;
+        }
+
+        public static String getDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code == code) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * ERP同步标识 10=待同步，20=同步成功，30=同步失败
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    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;
+        }
     }
 }

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-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 = "ORDER_STATUS")
+    @ApiParam(value = "状态")
+    private String orderStatus;
+}

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

@@ -101,4 +101,12 @@ 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;
 }

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,26 @@ 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;
+
+    public WmsCSFactTrans(){}
+
+    public WmsCSFactTrans(Double factQty, String partNo){
+        if(factQty == null) {
+            this.factQty = 0d;
+        }else{
+            this.factQty = factQty;
+        }
+        this.partNo = partNo;
+    }
 }

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

@@ -42,7 +42,7 @@ public class WmsDocFgDetail extends BaseBean {
     public String lineNo;
 
     @Column(name="COMMIT_TIME")
-    @ApiParam("提交日期")
+    @ApiParam("提交时间")
     public String commitTime;
 
     @Column(name="MFG_LOG_NO")
@@ -127,4 +127,8 @@ public class WmsDocFgDetail extends BaseBean {
     @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/WmsMoveToERP.java

@@ -161,6 +161,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/WmsPart.java

@@ -28,103 +28,115 @@ 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")
+    @Column(name = "IQC")
-    @ApiParam(value ="收货检验否",example = "1")
+    @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 +148,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/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;
@@ -89,4 +93,33 @@ public class WmsShipping extends BaseBean {
     @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/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/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/sqlpack/WmsHqlPack.java

@@ -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);
 
@@ -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);
 
@@ -1115,7 +1115,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);
@@ -1434,7 +1434,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);
@@ -2078,4 +2078,25 @@ public class WmsHqlPack {
 
         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;
+    }
 }