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

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

@@ -127,8 +127,8 @@ public class AndonHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcCode(),"acCode", result);
-//        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
-//        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
         getStringBuilderPack(andonAlarmCause, result);
 
         return result;
@@ -394,7 +394,7 @@ public class AndonHqlPack {
     public static DdlPackBean packAndonAlarmDetailType(AndonAlarmDetailType andonAlarmDetailType) {
         DdlPackBean result = new DdlPackBean();
 
-//        DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
         DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result);
 
         getStringBuilderPack(andonAlarmDetailType, result);

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

@@ -246,7 +246,8 @@ public class AndonEnumUtil {
         QUALITY("QUALITY_ALARM","质量"),
         EQUIP("EQUMENT_ALARM","设备"),
         PROCESS("ROUTING_ALARM","工艺"),
-        CHECK("OTHER_ALARM","其他");
+        CHECK("OTHER_ALARM","其他"),
+        FIX_ERROR("FIX_ERROR", "设备故障");
 
         private String value;
         private String description;

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

@@ -896,12 +896,15 @@ public class WmsEnumUtil {
         }
 
         public static STOCK_SN_QC_STATUS codeOf(Integer value) {
-            int tmp = 1;
+            if (value == null) {
+                return null;
+            } else {
                 for (int i = 0; i < values().length; i++) {
                     if (values()[i].value == value) {
                         return values()[i];
                     }
                 }
+            }
             return null;
         }
     }
@@ -1724,7 +1727,8 @@ public class WmsEnumUtil {
         WAREHOUSE(10, "WAREHOUSE", "仓库对象"),
         ZONE(20, "ZONE", "存储区对象"),
         LOCATE(30, "LOCATE", "库位对象"),
-        MATERIAL(40, "MATERIAL", "物料对象");
+        MATERIAL(40, "MATERIAL", "物料对象"),
+        TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象");
 
         private String code;
         private String description;
@@ -2376,4 +2380,171 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 几步法
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STEP {
+        ONE_STEP(1, "一步法"), TWO_STEP(2, "两步法");
+
+        private int value;
+        private String description;
+
+        STEP(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;
+        }
+    }
+
+    /**
+     * 外部单据：关联单据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IMPORT_ORDER_TYPE {
+        PO("PO", "要货计划"),
+        ASN("ASN", "ASN"),
+        SCATTERED_OUT("C00", "零星出库指令"),
+        SCATTERED_INT("C01", "零星入指令"),
+        NC_DISMANTLING_PICKING("C02", "NC拆解领料"),
+        NC_DISMANTLING_RETURN("C03", "NC拆解退料"),
+        NC_SCRAPPED("C04", "NC报废指令"),
+        NOT_JIS("NOTJIS", "非JIS指令"),
+        STOCK_DUMP("D00", "库存转储指令"),
+        NC_INSTOCK("D01", "NC入库指令"),
+        SMRR("B00", "SMRR退货"),
+        DMR("B01", "DMR退货"),
+        OUT_SOURCING("A00", "委外发料指令"),
+        OUT_REBACK("A01", "委外退料指令"),
+        OUT_RETURN_SOURCING("A02", "委外返工发料指令"),
+        OUT_RETURN_("A03", "委外返工退料指令"),
+        SALES_RETURN_REBACK("SALES_RETURN", "销售退货指令"),
+        CS("CS", "盘点指令"),
+        CS_ADUJUST("CS_ADUJUST", "盘点调差指令");
+        private String value;
+        private String description;
+
+        IMPORT_ORDER_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 IMPORT_ORDER_TYPE codeOf(String value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String getDes(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 物料类型（用于物料）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WMS_PART_TYPE {
+        RAW_MATERIAL(1, "原材料"), PARTIALLY_PREPARED_PRODUCTS(2, "半成品"), FINISHED_PRODUCT(3, "成品");
+
+        private int value;
+        private String description;
+
+        WMS_PART_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+    }
+
+    /**
+     * 任务数据来源：检查子数据
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TRUE_OR_FALSE {
+        TRUE(1, "是"), FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        TRUE_OR_FALSE(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/common/ExportDataModel.java

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.model.common;
+
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-06-20 18:50
+ * @Modify:
+ **/
+@Data
+public class ExportDataModel {
+
+    private String className;
+
+    private String exportData;
+
+}

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

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Random;
 import java.util.UUID;
 
 /**
@@ -22,7 +23,7 @@ public class SapBase {
     private String actusr = "导入";
 
     @ApiParam(value = "SID", example = "-1")
-    private String sid = UUID.randomUUID().toString() + UUID.randomUUID().toString();
+    private String sid = new Random().nextInt() + "";
 
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiParam(value = "接收数据日期", example = "-1")
@@ -48,16 +49,16 @@ public class SapBase {
     private String actymd;
 
     @ApiParam(value = "处理时间", example = "-1")
-    private String acthms;
+    private String acthms ="00:00:00";
 
     @ApiParam(value = "状态标志", example = "-1")
-    private String staflg;
+    private String staflg = "Y";
 
     @ApiParam(value = "顺序号", example = "-1")
-    private Integer seq;
+    private Integer seq = 1;
 
     @ApiParam(value = "GUID", example = "-1")
-    private String guid;
+    private String guid = UUID.randomUUID().toString();
 
     public String getSynymdTime() {
         SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-DD");

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

@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 非JIS发运
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-20 13:24
+ * @Modify:
+ **/
+@Data
+@Api(value="非JIS发运",description = "非JIS发运")
+public class SapDn extends SapBase{
+
+    @ApiParam(value = "销售交货单号",example = "1")
+    @AnnoOutputColumn
+    private String vbeln;
+
+    @ApiParam(value = "行项目",example = "1")
+    @AnnoOutputColumn
+    private Integer posnr;
+
+    @ApiParam(value = "发货工厂",example = "1")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "发货库存地",example = "1")
+    @AnnoOutputColumn
+    private String lgort;
+
+    @ApiParam(value = "计划交货日期",example = "1")
+    @AnnoOutputColumn
+    private String lfdat;
+
+    @ApiParam(value = "客户编码",example = "1")
+    @AnnoOutputColumn
+    private String kunnr;
+
+    @ApiParam(value = "物料号",example = "1")
+    @AnnoOutputColumn
+    private String matnr;
+
+    @ApiParam(value = "客户物料号",example = "1")
+    @AnnoOutputColumn
+    private String kdmat;
+
+    @ApiParam(value = "交货数量",example = "1")
+    @AnnoOutputColumn
+    private String lfimg;
+
+    @ApiParam(value = "单位",example = "1")
+    @AnnoOutputColumn
+    private String meins;
+
+}

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

@@ -1,17 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-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 org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Column;
-import java.util.UUID;
 
 /**
  * @Description :
@@ -22,9 +14,9 @@ import java.util.UUID;
  **/
 @Data
 @Api(value="要货计划",description = "要货计划")
-public class SapDspo {
+public class SapDspo extends SapBase{
 
-    @ApiParam(value = "SA编号（或PO号）",example = "1")
+    @ApiParam(value = "SA_PO编号",example = "1")
     @AnnoOutputColumn
     private String ebeln;
 
@@ -32,18 +24,18 @@ public class SapDspo {
     @AnnoOutputColumn
     private String revno;
 
-    @ApiParam(value = "SAitem或PO item",example = "-1")
+    @ApiParam(value = "行项目",example = "-1")
     @AnnoOutputColumn
     private Integer evrtp;
 
-    @ApiParam(value = "供应商代码",example = "-1")
-    @AnnoOutputColumn
-    private String lifnr;
-
     @ApiParam(value = "物料编码",example = "-1")
     @AnnoOutputColumn
     private String matnr;
 
+    @ApiParam(value = "供应商代码",example = "-1")
+    @AnnoOutputColumn
+    private String lifnr;
+
     @ApiParam(value = "计量单位",example = "-1")
     @AnnoOutputColumn
     private String unit;
@@ -68,7 +60,7 @@ public class SapDspo {
     @AnnoOutputColumn
     private String werks;
 
-    @ApiParam(value = "收货库存地点",example = "-1")
+    @ApiParam(value = "收货库存地",example = "-1")
     @AnnoOutputColumn
     private String lgort;
 
@@ -76,12 +68,12 @@ public class SapDspo {
     @AnnoOutputColumn
     private String zpzps;
 
-    @ApiParam(value = "状态",example = "-1")
+    @ApiParam(value = "行项目状态",example = "-1")
     @AnnoOutputColumn
     private String zstas;
 
     @ApiParam(value = "状态",example = "-1")
-    @AnnoOutputColumn
+    @AnnoOutputColumn(hidden = true)
     private String loekz;
 
     @ApiParam(value = "最小包装数量",example = "-1")
@@ -89,61 +81,61 @@ public class SapDspo {
     private Double bstrf;
 
     @ApiParam(value = "条码已打印的数量",example = "-1")
-    @AnnoOutputColumn
+    @AnnoOutputColumn(hidden = true)
     private Double prnnum;
 
-    //公共字段 ++++++++++++++++++++++++++++++++++++++++++
+//    //公共字段 ++++++++++++++++++++++++++++++++++++++++++
-    @ApiParam(value = "处理人",example = "-1")
+//    @ApiParam(value = "处理人",example = "-1")
-    @AnnoOutputColumn
+//    @AnnoOutputColumn
-    private String actusr = "导入";
+//    private String actusr = "导入";
-
+//
-    @ApiParam(value = "SID",example = "-1")
+//    @ApiParam(value = "SID",example = "-1")
-    @AnnoOutputColumn
+//    @AnnoOutputColumn
-    private String sid = UUID.randomUUID().toString()+UUID.randomUUID().toString();
+//    private String sid = UUID.randomUUID().toString()+UUID.randomUUID().toString();
-
+//
-    /*@ApiParam(value = "接收数据日期",example = "-1")
+//    /*@ApiParam(value = "接收数据日期",example = "-1")
-    @AnnoOutputColumn
+//    @AnnoOutputColumn
-    private String recymd;
+//    private String recymd;
-
+//
-    @ApiParam(value = "接收数据时间",example = "-1")
+//    @ApiParam(value = "接收数据时间",example = "-1")
-    @AnnoOutputColumn
+//    @AnnoOutputColumn
-    private String rechms;
+//    private String rechms;
-
+//
-    @ApiParam(value = "同步标志",example = "-1")
+//    @ApiParam(value = "同步标志",example = "-1")
-    @AnnoOutputColumn
+//    @AnnoOutputColumn
-    private String synflg;*/
+//    private String synflg;*/
-
+//
-    @ApiParam(value = "同步日期",example = "-1")
+//    @ApiParam(value = "同步日期",example = "-1")
-    @AnnoOutputColumn
+//    @AnnoOutputColumn
-    private String synymd;
+//    private String synymd;
-
+//
-    @ApiParam(value = "同步时间",example = "-1")
+//    @ApiParam(value = "同步时间",example = "-1")
-    @AnnoOutputColumn
+//    @AnnoOutputColumn
-    private String synhms;
+//    private String synhms;
-
+//
-    /*@ApiParam(value = "处理标志",example = "-1")
+//    /*@ApiParam(value = "处理标志",example = "-1")
-    @AnnoOutputColumn
+//    @AnnoOutputColumn
-    private String actflg;*/
+//    private String actflg;*/
-
+//
-    @ApiParam(value = "处理日期",example = "-1")
+//    @ApiParam(value = "处理日期",example = "-1")
-    @AnnoOutputColumn
+//    @AnnoOutputColumn
-    private String actymd;
+//    private String actymd;
-
+//
-    @ApiParam(value = "处理时间",example = "-1")
+//    @ApiParam(value = "处理时间",example = "-1")
-    @AnnoOutputColumn
+//    @AnnoOutputColumn
-    private String acthms;
+//    private String acthms;
-
+//
-    @ApiParam(value = "状态标志",example = "-1")
+//    @ApiParam(value = "状态标志",example = "-1")
-    @AnnoOutputColumn
+//    @AnnoOutputColumn
-    private  String staflg;
+//    private  String staflg;
-
+//
-    @ApiParam(value = "顺序号",example = "-1")
+//    @ApiParam(value = "顺序号",example = "-1")
-    @AnnoOutputColumn
+//    @AnnoOutputColumn
-    private Integer seq;
+//    private Integer seq;
-
+//
-    @ApiParam(value = "GUID",example = "-1")
+//    @ApiParam(value = "GUID",example = "-1")
-    @AnnoOutputColumn
+//    @AnnoOutputColumn
-    private String guid;
+//    private String guid;
 
 
 }

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

@@ -0,0 +1,74 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-19 13:21
+ * @Modify:
+ **/
+@Data
+@Api(value="零星领料(退)料结果",description = "零星领料(退)料结果")
+public class SapMiscr extends SapBase{
+
+    @ApiParam(value = "编号",example = "1")
+    @AnnoOutputColumn
+    private String zinstno;
+
+    @ApiParam(value = "行号",example = "1")
+    @AnnoOutputColumn
+    private Integer zeile;
+
+    @ApiParam(value = "工厂",example = "1")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "发出库存地点（退回库存地点）",example = "1")
+    @AnnoOutputColumn
+    private String lgort;
+
+    @ApiParam(value = "物料编码",example = "1")
+    @AnnoOutputColumn
+    private String matnr;
+
+    @ApiParam(value = "数量",example = "1")
+    @AnnoOutputColumn
+    private Double erfmg;
+
+    @ApiParam(value = "计量单位",example = "1")
+    @AnnoOutputColumn
+    private String erfme;
+
+    @ApiParam(value = "特殊库存标识",example = "1")
+    @AnnoOutputColumn
+    private String sobkz;
+
+    @ApiParam(value = "特殊库存描述",example = "1")
+    @AnnoOutputColumn
+    private String htext;
+
+    @ApiParam(value = "状态",example = "1")
+    @AnnoOutputColumn
+    private String zzlzt;
+
+    @ApiParam(value = "业务类型",example = "1")
+    @AnnoOutputColumn
+    private String zaction;
+
+    @ApiParam(value = "领料单号",example = "1")
+    @AnnoOutputColumn(hidden = true)
+    private String sgtxt;
+
+    public Double getZeileVal() {
+        return zeile== null ? 0D : this.zeile.doubleValue();
+    }
+
+    public Double getErfmgVal() {
+        return  erfmg== null ? 0D : this.erfmg.doubleValue();
+    }
+}

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

@@ -0,0 +1,79 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-21 13:13
+ * @Modify:
+ **/
+@Data
+@Api(value="库存转储",description = "库存转储")
+public class SapMovo extends SapBase{
+
+    @ApiParam(value = "编号",example = "1")
+    @AnnoOutputColumn
+    private String refid;
+
+    @ApiParam(value = "业务类型",example = "1")
+    @AnnoOutputColumn
+    private String action;
+
+    @ApiParam(value = "行号",example = "1")
+    @AnnoOutputColumn
+    private Integer zeile;
+
+    @ApiParam(value = "工厂",example = "1")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "发出库存地点",example = "1")
+    @AnnoOutputColumn
+    private String lgort;
+
+    @ApiParam(value = "接收库存地点",example = "1")
+    @AnnoOutputColumn
+    private String umlgo;
+
+    @ApiParam(value = "物料编码",example = "1")
+    @AnnoOutputColumn
+    private String matnr;
+
+    @ApiParam(value = "旧物料编码（针对物料号切换）",example = "1")
+    @AnnoOutputColumn
+    private String ummat;
+
+    @ApiParam(value = "数量",example = "1")
+    @AnnoOutputColumn
+    private String erfmg;
+
+    @ApiParam(value = "计量单位",example = "1")
+    @AnnoOutputColumn
+    private String erfme;
+
+    @ApiParam(value = "库存状态",example = "1")
+    @AnnoOutputColumn
+    private String zstat;
+
+    @ApiParam(value = "特殊库存标识",example = "1")
+    @AnnoOutputColumn
+    private String sobkz;
+
+    @ApiParam(value = "特殊库存描述",example = "1")
+    @AnnoOutputColumn
+    private String htext;
+
+    @ApiParam(value = "状态",example = "1")
+    @AnnoOutputColumn
+    private String zzlzt;
+
+    @ApiParam(value = "不合格单据号",example = "1")
+    @AnnoOutputColumn
+    private String sgtxt;
+
+}

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

@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 销售退货
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-20 13:32
+ * @Modify:
+ **/
+@Data
+@Api(value="销售退货",description = "销售退货")
+public class SapRdn extends SapBase{
+
+    @ApiParam(value = "退货交货单",example = "1")
+    @AnnoOutputColumn
+    private String vbeln;
+
+    @ApiParam(value = "Item",example = "1")
+    @AnnoOutputColumn
+    private Integer posnr;
+
+    @ApiParam(value = "收货工厂",example = "1")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "收货库存地",example = "1")
+    @AnnoOutputColumn
+    private String lgort;
+
+    @ApiParam(value = "收货日期",example = "1")
+    @AnnoOutputColumn
+    private String lfdat;
+
+    @ApiParam(value = "客户编码",example = "1")
+    @AnnoOutputColumn
+    private String kunnr;
+
+    @ApiParam(value = "物料号",example = "1")
+    @AnnoOutputColumn
+    private String matnr;
+
+    @ApiParam(value = "收货数量",example = "1")
+    @AnnoOutputColumn
+    private String lfimg;
+
+    @ApiParam(value = "物料单位",example = "1")
+    @AnnoOutputColumn
+    private String meins;
+
+
+}

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

@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-21 13:56
+ * @Modify:
+ **/
+@Data
+@Api(value="供应商退货",description = "供应商退货")
+public class SapReto extends SapBase{
+
+    @ApiParam(value = "业务类型",example = "1")
+    @AnnoOutputColumn
+    private String zaction;
+
+    @ApiParam(value = "编号",example = "1")
+    @AnnoOutputColumn
+    private String zinstno;
+
+    @ApiParam(value = "行号",example = "1")
+    @AnnoOutputColumn
+    private String zeile;
+
+    @ApiParam(value = "供应商",example = "1")
+    @AnnoOutputColumn
+    private String lifnr;
+
+    @ApiParam(value = "工厂",example = "1")
+    @AnnoOutputColumn
+    private String umwrk;
+
+    @ApiParam(value = "物料编码",example = "1")
+    @AnnoOutputColumn
+    private String matnr;
+
+    @ApiParam(value = "库存地点",example = "1")
+    @AnnoOutputColumn
+    private String lgort;
+
+    @ApiParam(value = "退货数量",example = "1")
+    @AnnoOutputColumn
+    private String erfmg;
+
+    @ApiParam(value = "计量单位",example = "1")
+    @AnnoOutputColumn
+    private String erfme;
+
+    @ApiParam(value = "退货原因",example = "1")
+    @AnnoOutputColumn
+    private String bktxt;
+
+    @ApiParam(value = "SMRR号（或DMR号）",example = "1")
+    @AnnoOutputColumn
+    private String zqmd;
+
+    @ApiParam(value = "状态",example = "1")
+    @AnnoOutputColumn
+    private String zzlzt;
+
+}

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

@@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description :
@@ -63,6 +62,10 @@ public class WmsBom extends BaseBean {
     @ApiParam(value = "子用量")
     private Double itemQty;
 
+    @Column(name = "BOM_NUM")
+    @ApiParam(value = "BOM编号")
+    private String bomNum;
+
     @Column(name = "BOM_VERSION")
     @ApiParam(value = "BOM版本号")
     private String bomVersion;

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

@@ -0,0 +1,81 @@
+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 全量BOM
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2019/6/19 21:23
+ * @Modify
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_BOM_TOTAL")
+@Api("全量BOM")
+public class WmsBomTotal extends BaseBean {
+    @Column(name = "PART_NO")
+    @ApiParam("父物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("父物料描述")
+    private String partName;
+
+    @Column(name = "UNIT")
+    @ApiParam("计量单位")
+    private String UNIT;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "ITEM_PART_NO")
+    @ApiParam(value = "子物料号")
+    private String itemPartNo;
+
+    @Column(name = "ITEM_PART_NAME")
+    @ApiParam(value = "子料物料描述")
+    private String itemPartName;
+
+    @Column(name = "ITEM_UNIT")
+    @ApiParam(value = "子计量单位")
+    private String itemUnit;
+
+    @Column(name = "ITEM_QTY")
+    @ApiParam(value = "子用量")
+    private Double itemQty;
+
+    @Column(name = "BOM_NUM")
+    @ApiParam(value = "BOM编号")
+    private String bomNum;
+
+    @Column(name = "BOM_VERSION")
+    @ApiParam(value = "BOM版本号")
+    private String bomVersion;
+
+    @Column(name = "EFF_START_TIME")
+    @ApiParam(value = "有效起始日期")
+    private String effStartTime;
+
+    @Column(name = "EFF_END_TIME")
+    @ApiParam(value = "有效截止日期")
+    private String effEndTime;
+
+    @Column(name = "SID")
+    @ApiParam(value = "SID")
+    private String sid;
+}

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

@@ -0,0 +1,63 @@
+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;
+import javax.persistence.Transient;
+
+/**
+ * @Description : 盘点调差范围信息
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-06-17 12:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_CS_ADJUST_RANGE")
+@Api("盘点调差范围信息")
+public class WmsCSAdjustRange extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public Integer item;
+
+    @Column(name="IS_ADJUST")
+    @ApiParam(value = "调整标识", example = "1")
+    public Integer isAdjust;
+
+    @Transient
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Transient
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Transient
+    @ApiParam("存储区编号")
+    public String zoneNo;
+
+    @Transient
+    @ApiParam("库位编号")
+    public String locateNo;
+
+    @Transient
+    @ApiParam("单位")
+    public String unit;
+}

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

@@ -82,6 +82,10 @@ public class WmsCSOrderMaster extends BaseBean {
     @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

@@ -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.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 盘点范围信息
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-06-17 11:57
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_CS_RANGE")
+@Api("盘点范围信息")
+public class WmsCSRange extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public Integer item;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name = "ZONE_NO")
+    @ApiParam("存储区编号")
+    public String zoneNo;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam("库位编号")
+    public String locateNo;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    public WmsCSRange(){}
+
+    public WmsCSRange(String zoneNo,String partNo,String partNameRdd){
+        this.zoneNo = zoneNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+    }
+
+}

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

@@ -56,4 +56,8 @@ public class WmsDataAuth extends BaseBean {
     @ApiParam(value = "查询操作", example = "0")
     private Integer queryOp;
 
+    @Column(name = "ROLE_NAME_RDD")
+    @ApiParam(value = "角色名称")
+    private String roleNameRdd;
+
 }

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 库位物料表
@@ -56,6 +57,10 @@ public class WmsLocatePart extends BaseBean {
     @ApiParam(value = "是否生成领料单", example = "2")
     private Integer isGeneratePicklist;
 
+    @Transient
+    @ApiParam("库位类型")
+    private Integer locateType;
+
     public Double getMin() {
         return this.min == null ? 0 : this.min;
     }

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

@@ -0,0 +1,162 @@
+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.*;
+
+/**
+ * @Description : 库存移动单处理成功后的记录，通过监听交易成功队列写入
+ * @Reference :
+ * @Author : Rock.Yu
+ * @CreateDate : 2019-06-20 14:09
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_MOVE_TO_ERP", indexes = {
+        @Index(columnList = "TRANS_TYPE_CODE"),
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "PART_NO")
+})
+@Api("库存移动单主表信息")
+public class WmsMoveToERP extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name = "ORDER_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer orderStatus;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    public String remark;
+
+    @Column(name = "TRANS_TYPE_CODE")
+    @ApiParam(value = "交易类型代码")
+    private String transTypeCode;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam(value = "错误信息")
+    private String errorMessage;
+
+    @Column(name="IS_URGENT")
+    @ApiParam(value = "是否紧急", example = "0")
+    public Integer isUrgent;
+
+    @Column(name = "CAR_NO")
+    @ApiParam(value = "车牌号")
+    private String carNo;
+
+    @Column(name="ITEM")
+    @ApiParam(value = "行号", example = "0")
+    public Integer item;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="VENDOR_NO")
+    @ApiParam("供应商编号")
+    public String vendorNo;
+
+    @Column(name="CUST_NO")
+    @ApiParam("客户编号")
+    public String custNo;
+
+    @Column(name="TRANS_QTY")
+    @ApiParam(value = "处理数量", example = "0")
+    public Double transQty;
+
+    @Column(name="REJECT_QTY")
+    @ApiParam(value = "不合格处理数量", example = "0")
+    public Double rejectQty;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name="SRC_WH_NO")
+    @ApiParam("源仓库代码")
+    public String srcWhNo;
+
+    @Column(name="SRC_ZONE_NO")
+    @ApiParam("源存储区代码")
+    public String srcZoneNo;
+
+    @Column(name="SRC_LOCATE_NO")
+    @ApiParam("源库位代码")
+    public String srcLocateNo;
+
+    @Column(name="DEST_WH_NO")
+    @ApiParam("目标仓库代码")
+    public String destWhNo;
+
+    @Column(name="DEST_ZONE_NO")
+    @ApiParam("目标存储区代码")
+    public String destZoneNo;
+
+    @Column(name="DEST_LOCATE_NO")
+    @ApiParam("目标库位代码")
+    public String destLocateNo;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    @Column(name="ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer itemStatus;
+
+    /**
+     * ASN,PO,SO
+     */
+    @Column(name="REF_TYPE")
+    @ApiParam("关联单据类型")
+    public String refType;
+
+    @Column(name="REF_SRC")
+    @ApiParam("关联单号")
+    public String refSrc;
+
+    @ApiParam(value = "待出库数量", example = "0")
+    @Transient
+    private Long waitingCounts;
+
+    @ApiParam(value = "已出库数量", example = "0")
+    @Transient
+    private Long finishedCounts;
+
+    public Double getRejectQty(){
+        return this.rejectQty == null ? 0 : this.rejectQty.doubleValue();
+    }
+
+    public Double getTransQty(){
+        return this.transQty == null ? 0 : this.transQty.doubleValue();
+    }
+
+    public Long getWaitingCounts() {
+        return waitingCounts == null ? 0L : this.waitingCounts;
+    }
+
+    public Long getFinishedCounts() {
+        return finishedCounts == null ? 0L : this.finishedCounts;
+    }
+}

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

@@ -3,8 +3,6 @@ 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;
@@ -16,8 +14,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description : 作业类型
@@ -61,7 +57,7 @@ public class WmsOpType extends BaseBean {
 
     @Column(name = "LAST_TRANS_TIME")
     @ApiParam(value = "末次处理时间")
-    public String lastTransTime;
+    private String lastTransTime;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -75,7 +71,7 @@ public class WmsOpType extends BaseBean {
 
     @Column(name = "SPLIT_RULE")
     @ApiParam(value = "拆分规则")
-    public String splitRule;
+    private String splitRule;
 
     @Column(name = "IS_MERGE")
     @ApiParam(value = "是否合并单据", example = "0")
@@ -83,7 +79,7 @@ public class WmsOpType extends BaseBean {
 
     @Column(name = "MERGE_RULE")
     @ApiParam(value = "合并规则")
-    public String mergeRule;
+    private String mergeRule;
 
     @Column(name = "IS_AUTO_CLOSE")
     @ApiParam(value = "任务未完是否关闭", example = "0")

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

@@ -0,0 +1,51 @@
+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 生产版本
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2019/6/19 21:23
+ * @Modify
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PRODUCT_VERSION")
+@Api("生产版本")
+public class WmsProductVersion extends BaseBean {
+
+    @Column(name = "ERP_WORK_CENTER")
+    @ApiParam("ERP工作中心")
+    private String erpWorkCenter;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "PV_CODE")
+    @ApiParam("生产版本")
+    private String pvCode;
+
+    @Column(name = "PV_NAME")
+    @ApiParam("生产版本描述")
+    private String pvName;
+
+    @Column(name = "BOM_NUM")
+    @ApiParam(value = "BOM编号")
+    private String bomNum;
+
+}

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

@@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
 
 /**
  * @Description : 库存信息
@@ -62,6 +59,24 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "客户编码")
     private String custNo;
 
+    @Transient
+    @ApiParam(value = "项目代码")
+    private String prodCfgTypeCode;
+
+    @Transient
+    @ApiParam(value = "含0库存显示")
+    private Boolean includeZeroStock = false;
+
+    @Transient
+    @ColumnDefault("0")
+    @ApiParam(value = "库存数量总和")
+    private Double sumQty;
+
+    @Transient
+    @ApiParam(value = "库位信息")
+    private WmsLocate wmsLocate;
+
+
     @Column(name = "QTY")
     @ColumnDefault("0")
     @ApiParam(value = "可用数量", example = "0")
@@ -146,6 +161,22 @@ public class WmsStockQuan extends BaseBean {
     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) {
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.partNo = partNo;
+        this.partNameRdd = partName;
+        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;
+    }
     public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
         this.qty = qty;
         this.failQty = failQty;

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -110,6 +111,7 @@ public class WmsStockSn extends BaseBean {
     @ColumnDefault("0")
     @ApiParam(value = "数量", example = "0")
     private Double qty;
+
     /**
      * 质量状态:10=合格,20=不合格,30=隔离
      */
@@ -206,7 +208,9 @@ public class WmsStockSn extends BaseBean {
         this.partNo = partNo;
     }
 
-    public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); }
+    public Double getQty() {
+        return qty == null ? 0L : qty.doubleValue();
+    }
 
     public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();}
 }

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

@@ -139,4 +139,9 @@ public class WmsTransQuan extends BaseBean {
     @ColumnDefault("0")
     @ApiParam(value = "锁定数量", example = "0")
     private Double lockQty;
+
+    @Column(name = "SCRAP_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "报废数量", example = "0")
+    private Double scrapQty;
 }

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

@@ -30,7 +30,7 @@ public class WmsUnit extends BaseBean {
 
     @Column(name = "UNIT_CODE")
     @ApiParam(value = "单位代码")
-    private String vendorNo;
+    private String unitCode;
 
     @Column(name = "UNIT_NAME")
     @ApiParam(value = "单位名称")
@@ -38,6 +38,6 @@ public class WmsUnit extends BaseBean {
 
     @Column(name = "UNIT_PRECISION")
     @ApiParam(value = "单位精度")
-    private String unitPrecision;
+    private Integer unitPrecision;
 
 }

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 供应商零件关系
@@ -36,4 +37,13 @@ public class WmsVendorPart extends BaseBean {
     @ApiParam(value = "物料号")
     private String partNo;
 
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partName;
+
+
+    @Transient
+    @ApiParam("供应商名称")
+    private String vendorName;
 }

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 工作中心线边库区关系
@@ -35,4 +36,12 @@ public class WmsWorkCenterZone extends BaseBean {
     @Column(name = "ZONE_NO")
     @ApiParam(value = "线边库区")
     private String zoneNo;
+
+    @Transient
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @Transient
+    @ApiParam("线边库区名称")
+    private String zoneName;
 }

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

@@ -47,7 +47,7 @@ public class WmsZones extends BaseBean {
     private String zoneName;
 
     @Column(name = "PARENT_ZONE_NO")
-    @ApiParam(value = "父级存储区", example ="1")
+    @ApiParam(value = "父级存储区", example ="-1")
     private String parentZoneNo;
 
     @Column(name = "IS_SON_NODE")

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

@@ -40,6 +40,9 @@ public class WmsDataAuthModel extends BaseBean {
     @ApiParam("存储区列表")
     private List<String> zoneList;
 
+    @ApiParam("交易代码列表")
+    private List<String> transTypeList;
+
     @ApiParam(
             value = "新增操作",
             example = "0"
@@ -63,4 +66,7 @@ public class WmsDataAuthModel extends BaseBean {
             example = "0"
     )
     private Integer queryOp;
+
+    @ApiParam("角色名称")
+    private String roleNameRdd;
 }

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsCSAdjustRange;
+
+/**
+ * @Description : 对象持久层仓用方法控制(盘点调差范围信息)
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-06-17 15:13
+ * @Modify:
+ **/
+public interface WmsCSAdjustRangeRepository extends BaseRepository<WmsCSAdjustRange, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsCSRange;
+
+/**
+ * @Description : 对象持久层仓用方法控制(盘点范围信息)
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-06-17 15:12
+ * @Modify:
+ **/
+public interface WmsCSRangeRepository extends BaseRepository<WmsCSRange, Long> {
+}

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

@@ -17,6 +17,14 @@ import java.util.List;
 public interface WmsMoveDetailsRepository extends BaseRepository<WmsMoveDetails, Long> {
 
     /**
+     * 根据工厂代码和单据编号查询库存移动单明细表
+     * @param organizeCode 工厂代码
+     * @param orderNo 单据编号
+     * @return 库存移动单明细表
+     */
+    List<WmsMoveDetails> findByOrganizeCodeAndOrderNo(String organizeCode, String orderNo);
+
+    /**
      * 获取item最大值
      * @param organizeCode
      * @param isValid

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

@@ -13,4 +13,12 @@ import org.springframework.stereotype.Repository;
  **/
 @Repository
 public interface WmsMoveMasterRepository extends BaseRepository<WmsMoveMaster, Long> {
+
+    /**
+     * 根据工厂代码和单据编号查询库存移动单主表数据
+     * @param organizeCode 工厂代码
+     * @param orderNo 单据编号
+     * @return 库存移动单主表
+     */
+    WmsMoveMaster getFirstByOrganizeCodeAndOrderNo(String organizeCode, String orderNo);
 }

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

@@ -6,6 +6,8 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @Description : 库存移动单条码信息
  * @Reference :
@@ -15,4 +17,13 @@ import org.springframework.stereotype.Repository;
  **/
 @Repository
 public interface WmsMoveSnRepository extends BaseRepository<WmsMoveSn, Long> {
+
+    /**
+     * 根据工厂代码、单据编号、物料编号查询库存移动单条码表
+     * @param organizeCode 工厂代码
+     * @param orderNo 单据编号
+     * @param partNo 物料编号
+     * @return 库存移动单条码表
+     */
+    List<WmsMoveSn> findByOrganizeCodeAndOrderNoAndPartNo(String organizeCode, String orderNo, String partNo);
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveToERPRepository.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.WmsMoveToERP;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : WMS 同步给 ERP 的交易信息
+ * @Reference :
+ * @Author : Rock.Yu
+ * @CreateDate : 2019-06-20 14:14
+ * @Modify:
+ **/
+@Repository
+public interface WmsMoveToERPRepository extends BaseRepository<WmsMoveToERP, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProdCfgTypeRepository.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.WareHouse;
+import cn.estsh.i3plus.pojo.wms.bean.WmsProdCfgType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制
+ * @Reference :
+ * @Author : sky.meng
+ * @CreateDate : 2018-11-06 9:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsProdCfgTypeRepository extends BaseRepository<WmsProdCfgType, Long> {
+}

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
+import org.springframework.data.jpa.repository.Query;
 
 /**
 * @Description : 库存条码dao层
@@ -17,4 +18,16 @@ public interface WmsStockSnRepository extends BaseRepository<WmsStockSn, Long> {
      * @return 库存条码实体
      */
     WmsStockSn findFirstBySn(String sn);
+
+
+    /**
+     * 按照存储区代码查询最早批次的物料条码
+     * 按照 特殊批次、生产日期、收货日期 优先级从高到低依次排序
+     * @return 最早批次的条码
+     */
+    @Query(value = "select sn from WmsStockSn " +
+            "where organizeCode=?1 and isValid=?2 and isDeleted=?3 " +
+            "and zoneNo=?4 and partNo=?5 " +
+            "order by fixLotNo, dateCode, lotNo")
+    WmsStockSn findFirstFifoSNByZoneNo(String organizeCode, int isValid, int isDeleted, String zoneNo, String partNo);
 }

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

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsUnitConvert;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface WmsUnitConvertReposity  extends BaseRepository<WmsUnitConvert, Long> {
+}

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

@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsUnit;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by Administrator on 2019/6/19.
+ */
+@Repository
+public interface WmsUnitRepository extends BaseRepository<WmsUnit,Long> {
+}

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

@@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsVendorPart;
+import org.springframework.stereotype.Repository;
 
+@Repository
 public interface WmsVendorPartRepository extends BaseRepository<WmsVendorPart, Long>{
 }

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenter;
+
+/**
+ * @Description : 产线信息管理(工作中心)
+ * @Reference :
+ * @Author : sky.meng
+ * @CreateDate : 2019-06-19 16:20
+ * @Modify:
+ **/
+public interface WmsWorkCenterRepository extends BaseRepository<WmsWorkCenter, Long> {
+
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsWorkCenterZone;
+
+/**
+ * @Description : 产线(工作中心)-存储区信息管理
+ * @Reference :
+ * @Author : sky.meng
+ * @CreateDate : 2019-06-20 14:55
+ * @Modify:
+ **/
+public interface WmsWorkCenterZoneRepository extends BaseRepository<WmsWorkCenterZone, Long> {
+}

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

@@ -438,6 +438,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
+        //DdlPreparedPack.getStringLikerPack(wmsLocatePart.getLocateType().toString(), "locateType", result);
         DdlPreparedPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result);
         DdlPreparedPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result);
@@ -858,7 +859,57 @@ public class WmsHqlPack {
 
         return result;
     }
+    /**
+     * 业务：库存表报查询封装
+     *
+     * @param wmsStockQuan
+     * @return
+     */
+    public static String packWmsStoreQuanForReport(WmsStockQuan wmsStockQuan) {
+
+        StringBuffer findWhere = new StringBuffer();
+        HqlPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", findWhere);
+        HqlPack.getStringEqualPack(wmsStockQuan.getProdCfgTypeCode(), "prodCfgTypeCode", findWhere);
+        HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", findWhere);
+        if(wmsStockQuan.getZoneNo() != null){
+            HqlPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsStockQuan.getZoneNo().split(","))),","),"",findWhere);
+            //DdlPreparedPack.getInPackArray(wmsStockQuan.getZoneNo().split(","), "zoneNo", result);
+        }
+        if(wmsStockQuan.getPartNo() != null){
+            HqlPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsStockQuan.getPartNo().split(","))),","),"partNo",findWhere);
+        }
+        if(!wmsStockQuan.getIncludeZeroStock()){
+            //含0库存显示，默认为否
+            //自定义条件，各汇总数量相加。为否时添加>0的条件判断
+            findWhere.append("  and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 ");
+        }
+        return findWhere.toString();
+    }
+
+    public static DdlPackBean packWmsStoreQuanForReport1(WmsStockQuan wmsStockQuan) {
+
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getProdCfgTypeCode(), "prodCfgTypeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
+
+        if(wmsStockQuan.getZoneNo() != null){
+            DdlPreparedPack.getInPackList(Arrays.asList(wmsStockQuan.getZoneNo().split(",")), "zoneNo", result);
+        }
+        if(wmsStockQuan.getPartNo() != null){
+            DdlPreparedPack.getInPackList(Arrays.asList(wmsStockQuan.getPartNo().split(",")), "partNo", result);
+        }
+        if(!wmsStockQuan.getIncludeZeroStock()){
+            //含0库存显示，默认为否
+            //自定义条件，各汇总数量相加。为否时添加>0的条件判断
+            result.setWhereAppend(result.getWhereAppend()+" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 ");
+        }
 
+        getStringBuilderPack(wmsStockQuan, result);
+
+        return result;
+    }
     /**
      * 业务：物料包装查询封装
      *
@@ -1384,7 +1435,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(),"organizeCode",result);
 //        String data = String.join(",", roleIds);
         DdlPreparedPack.getInPackList(roleIds, "roleCode", result);
-        getStringBuilderPack(new WmsDataAuth(), result);
+        getStringBuilderPack(dataAuth, result);
         return result;
     }
 
@@ -1409,31 +1460,31 @@ public class WmsHqlPack {
             String data = String.join(",", vList);
 
             if (StringUtils.isNotBlank(data)) {
-
                 List<Map> mapList = JSONObject.parseArray(data, Map.class);
-
                 if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", key)) {
-
+                    DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"WH_CODE"), "destWhNo", result);
-                    packMutilConditionHql(mapList, "WH_CODE", "destWhNo", result);
+                    //packMutilConditionHql(mapList, "WH_CODE", "destWhNo", result);
-
+                }/* else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", key)) {
-                } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", key)) {
+                    DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"LOCATE_NO"), "destLocateNo", result);
-
+                    //packMutilConditionHql(mapList, "LOCATE_NO", "destLocateNo", result);
-                    packMutilConditionHql(mapList, "LOCATE_NO", "destLocateNo", result);
+                }*/ else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", key)) {
-
+                    DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"ZONE_CODE"), "destZoneNo", result);
-                } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", key)) {
+                    //packMutilConditionHql(mapList, "ZONE_CODE", "destZoneNo", result);
-
+                } /*else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) {
-                    packMutilConditionHql(mapList, "ZONE_CODE", "destZoneNo", result);
+                    DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"PART_NO"), "partNo", result);
-
+                    //packMutilConditionHql(mapList, "PART_NO", "partNo", result);
-                } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) {
+                }*/
-
-                    packMutilConditionHql(mapList, "PART_NO", "partNo", result);
-                }
             }
         }
 
-        String hqlString = " and ( 1=1 " +  result.getPackedHql() + ") ";
+        //转换封装后的hql
+        /*String packedHql = result.getPackedHql();
+        if(packedHql.startsWith(" or")){
+            packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") ";
+            System.out.println(packedHql);
+        }
 
-        result.setWhereAppend(hqlString);
+        result.setWhereAppend(packedHql);*/
         // 通用数据拼接
         WmsDataAuth wmsDataAuth = new WmsDataAuth();
         wmsDataAuth.setOrganizeCode(organizeCode);
@@ -1442,20 +1493,36 @@ public class WmsHqlPack {
     }
 
     /**
+     * 把 List<Map> 中的一组数据重新封装到List<String>中
+     * @param mapList
+     * @param keyName
+     */
+    private static List<String> cyclicTraversal(List<Map> mapList,String keyName) {
+        List<String> list = new ArrayList<String>();
+        for(int i=0;i<mapList.size();i++){
+            Map<String,String> map = mapList.get(i);
+            list.add(map.get(keyName));
+        }
+        return list;
+    }
+
+    /**
      * 把 List<Map> 中的一组查询条件封装成 HQL
      * @param mapList
      * @param keyName
      * @param columnName
      * @param packBean
      */
-    private static void packMutilConditionHql(List<Map> mapList, String keyName,
+    private static void packMutilConditionHql(List<Map> mapList, String keyName,String columnName, DdlPackBean packBean) {
-                                              String columnName, DdlPackBean packBean) {
+        int index  = 1;
-        Integer index  = 1;
+        String columnParam = null;
-
         for (Map item : mapList) {
-            packBean.addColumnQuery(columnName," or model." +
+            columnParam = columnName + String.valueOf(index);
-                            columnName + " = :m_" + columnName + (index++).toString(),
+            packBean.addColumnQuery(columnParam,
+                    " or model." + columnName + " = :m_" + columnParam,
                     item.get(keyName).toString());
+
+            index++;
         }
     }
 
@@ -1466,8 +1533,33 @@ public class WmsHqlPack {
      * @param orderList
      * @return
      */
-    public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList) {
+    public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList,Map<String, List<WmsDataAuth>> groupDataAuth) {
         DdlPackBean packBean = new DdlPackBean();
+        Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
+        //拼sql
+        entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey()));
+        for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
+            String key = map.getKey();
+            List<WmsDataAuth> valueList = map.getValue();
+            List<String> vList = valueList.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList());
+            String data = String.join(",", vList);
+            if (StringUtils.isNotBlank(data)) {
+                List<Map> mapList = JSONObject.parseArray(data, Map.class);
+                if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.TRANS_TYPE.getValue() + "", key)) {
+                    DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"TRANS_TYPE_CODE"), "transTypeCode", packBean);
+                    //packMutilConditionHql(mapList, "TRANS_TYPE_CODE", "transTypeCode", packBean);
+                    break;
+                }
+            }
+        }
+        //转换封装后的hql
+        /*String packedHql = packBean.getPackedHql();
+        if(packedHql.startsWith(" or")){
+            packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") ";
+            System.out.println(packedHql);
+        }
+
+        packBean.setWhereAppend(packedHql);*/
         DdlPreparedPack.getInPackList(orderList, columnName, packBean);
         DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean);
@@ -1694,6 +1786,41 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 库存条码 查询条件封装
+     *
+     * @param wmsStockSn
+     * @return
+     */
+    public static DdlPackBean packHqlWmsStockSnReport(WmsStockSn wmsStockSn) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
+        DdlPreparedPack.getStringNotNullPack("locateNo", result);
+        result.setWhereAppend(result.getWhereAppend()+" and locateNo != ''");
+
+        getStringBuilderPack(wmsStockSn, result);
+
+        return result;
+    }
+
+    public static DdlPackBean packWmsStoreQuanForLocateReport(WmsStockQuan wmsStockQuan) {
+
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result);
+        result.setWhereAppend(result.getWhereAppend()+" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 ");
+        getStringBuilderPack(wmsStockQuan, result);
+
+        return result;
+    }
+
 
     /**
      * 线边库物料信息 分页查询
@@ -1711,6 +1838,28 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsLineLocatePart, result);
         return result;
     }
+
+    /**
+     * 任务数据来源唯一校验
+     *
+     * @param wmsTaskSrc
+     * @return
+     */
+    public static DdlPackBean packHqlWmsTaskSrcIsUniq(WmsTaskSrc wmsTaskSrc) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(wmsTaskSrc.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsTaskSrc.getDataSrc(), "dataSrc", result);
+        DdlPreparedPack.getNumEqualPack(wmsTaskSrc.getBusiType(), "busiType", result);
+        DdlPreparedPack.getNumEqualPack(wmsTaskSrc.getPriority(), "priority", result);
+        DdlPreparedPack.getNumEqualPack(wmsTaskSrc.getIsSn(), "isSn", result);
+        DdlPreparedPack.getNumEqualPack(wmsTaskSrc.getIsOneStep(), "isOneStep", result);
+        getStringBuilderPack(wmsTaskSrc, result);
+        return result;
+    }
+
     /**
      * 任务数据来源 分页查询
      *
@@ -1725,6 +1874,7 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsTaskSrc, result);
         return result;
     }
+
     /**
      * 供应商零件 分页查询
      *
@@ -1739,4 +1889,72 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsVendorPart, result);
         return result;
     }
+    /**
+     * 主数据信息 分页查询
+     *
+     * @param wmsProdCfgType
+     * @return
+     */
+    public static DdlPackBean packHqlWmsProdCfgType(WmsProdCfgType wmsProdCfgType) {
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        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);
+        return result;
+    }
+
+    /**
+     * 盘点范围 条件封装
+     *
+     * @param wmsCSRange
+     * @return
+     */
+    public static DdlPackBean packHqlWmsCSRange(WmsCSRange wmsCSRange) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsCSRange.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSRange.getPartNo(), "partNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result);
+
+        getStringBuilderPack(wmsCSRange, result);
+
+        return result;
+    }
+
+    /**
+     * 物料 条件封装
+     *
+     * @param wmsPart
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,List<WmsStockSn> partNoList) {
+
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getInPackList(partNoList.stream().map(part -> part.getPartNo()).collect(Collectors.toList()),"partNo",packBean);
+        DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(),"organizeCode",packBean);
+        getStringBuilderPack(wmsPart, packBean);
+
+        return packBean;
+    }
+
+    /**
+     * 单位定义
+     *
+     * @param wmsUnit
+     * @return
+     */
+    public static DdlPackBean packHqlWmsUnit(WmsUnit wmsUnit) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitCode(), "unitCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitName(), "unitName", result);
+        DdlPreparedPack.getNumEqualPack(wmsUnit.getUnitPrecision(), "unitPrecision", result);
+        getStringBuilderPack(wmsUnit, result);
+
+        return result;
+    }
 }