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

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.getAlarmCode(), "alarmCode", result);
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", 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

@@ -193,10 +193,10 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ORDER_DETAILS_STATUS {
-        CREATE(10, "N", "创建"),
-        RECEIPTED(20, "R", "已完成"),
-        CANCEL(30, "C", "行取消"),
-        PRINTED(40, "C", "已打印");
+        CREATE(10, "CREATE", "创建"),
+        RECEIPTED(20, "FINISHED", "已完成"),
+        CANCEL(30, "CANCLE", "行取消"),
+        PRINTED(40, "PRINTED", "已打印");
 
         private int value;
         private String code;
@@ -492,9 +492,9 @@ public class WmsEnumUtil {
         OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"),
         NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库"),
         SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"),
-        NC_DISMANTLING_PICKING(160,"NC_DISMANTLING_PICKING","NC拆解领料"),
-        NC_DISMANTLING_RETREAT(170,"NC_DISMANTLING_RETREAT","NC拆解退料"),
-        LINE_EDGE_SCRAPPING_OUT(180,"LINE_EDGE_SCRAPPING_OUT","线边报废出库");
+        NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"),
+        NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"),
+        LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库");
 
 
         private int value;
@@ -851,7 +851,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_QC_STATUS {
-        NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40,"ISOLATED", "报废");
+        NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "ISOLATED", "报废");
 
         private int value;
         private String code;
@@ -896,10 +896,13 @@ public class WmsEnumUtil {
         }
 
         public static STOCK_SN_QC_STATUS codeOf(Integer value) {
-            int tmp = 1;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == value) {
-                    return values()[i];
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
                 }
             }
             return null;
@@ -919,7 +922,7 @@ public class WmsEnumUtil {
         private int value;
         private String description;
 
-        CS_ORDER_TYPE(int value,String description) {
+        CS_ORDER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -948,12 +951,12 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CS_ORDER_STATUS {
-        CREATE(10,"CREATE", "创建"),
-        STARTING_INVENTORY(20,"STARTING_INVENTORY", "开启盘点"),
-        IN_INVENTORY(30,"IN_INVENTORY", "盘点中"),
-        INVENTORY_FINISH(40,"INVENTORY_FINISH", "盘点完成"),
-        THAWING(50,"THAWING", "已解冻"),
-        CLOSED(60, "CLOSED","已关闭");
+        CREATE(10, "CREATE", "创建"),
+        STARTING_INVENTORY(20, "STARTING_INVENTORY", "开启盘点"),
+        IN_INVENTORY(30, "IN_INVENTORY", "盘点中"),
+        INVENTORY_FINISH(40, "INVENTORY_FINISH", "盘点完成"),
+        THAWING(50, "THAWING", "已解冻"),
+        CLOSED(60, "CLOSED", "已关闭");
 
         private int value;
         private String code;
@@ -1725,7 +1728,7 @@ public class WmsEnumUtil {
         ZONE(20, "ZONE", "存储区对象"),
         LOCATE(30, "LOCATE", "库位对象"),
         MATERIAL(40, "MATERIAL", "物料对象"),
-        TRANS_TYPE(50,"TRANS_TYPE","交易代码对象");
+        TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象");
 
         private String code;
         private String description;
@@ -2476,12 +2479,12 @@ public class WmsEnumUtil {
         }
     }
 
-  /**
+    /**
      * 物料类型（用于物料）
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_PART_TYPE {
-        RAW_MATERIAL(1,"原材料"), PARTIALLY_PREPARED_PRODUCTS(2,"半成品"), FINISHED_PRODUCT(3,"成品");
+        RAW_MATERIAL(1, "原材料"), PARTIALLY_PREPARED_PRODUCTS(2, "半成品"), FINISHED_PRODUCT(3, "成品");
 
         private int value;
         private String description;

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

@@ -26,7 +26,7 @@ public class SapAsn extends SapBase {
 
     @ApiParam(value = "ASN item")
     @AnnoOutputColumn
-    private Double zrnum;
+    private Integer zrnum;
 
     @ApiParam(value = "物料编码")
     @AnnoOutputColumn

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

@@ -23,7 +23,7 @@ public class SapBase {
     private String actusr = "导入";
 
     @ApiParam(value = "SID", example = "-1")
-    private String sid = new Random().nextInt() + "";
+    private String sid = "";
 
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiParam(value = "接收数据日期", example = "-1")
@@ -55,7 +55,7 @@ public class SapBase {
     private String staflg = "Y";
 
     @ApiParam(value = "顺序号", example = "-1")
-    private Integer seq = new Random().nextInt();
+    private Integer seq = 1;
 
     @ApiParam(value = "GUID", example = "-1")
     private String guid = UUID.randomUUID().toString();

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCgio.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 : 委外材料发运
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-22 10:03
+ * @Modify:
+ **/
+@Data
+@Api(value = "委外材料发运", description = "委外材料发运")
+public class SapCgio extends SapBase{
+
+    @ApiParam(value = "编号")
+    @AnnoOutputColumn
+    private String zinstno;
+
+    @ApiParam(value = "行号")
+    @AnnoOutputColumn
+    private String zeile;
+
+    @ApiParam(value = "工厂")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "发（退）料库存地点")
+    @AnnoOutputColumn
+    private String lgort;
+
+    @ApiParam(value = "供应商代码")
+    @AnnoOutputColumn
+    private String zlifnr;
+
+    @ApiParam(value = "物料编码")
+    @AnnoOutputColumn
+    private String matnr;
+
+    @ApiParam(value = "发(退）料数量")
+    @AnnoOutputColumn
+    private String erfmg;
+
+    @ApiParam(value = "计量单位")
+    @AnnoOutputColumn
+    private String erfme;
+
+    @ApiParam(value = "状态")
+    @AnnoOutputColumn
+    private String zzlzt;
+
+    @ApiParam(value = "业务类型")
+    @AnnoOutputColumn
+    private String zaction;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.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-22 10:16
+ * @Modify:
+ **/
+@Data
+@Api(value="盘点",description = "盘点")
+public class SapCyco extends SapBase{
+
+    @ApiParam(value = "盘点凭证号")
+    @AnnoOutputColumn
+    private String iblnr;
+
+    @ApiParam(value = "行号")
+    @AnnoOutputColumn
+    private Integer zeili;
+
+    @ApiParam(value = "物料编码")
+    @AnnoOutputColumn
+    private String matnr;
+
+    @ApiParam(value = "计量单位")
+    @AnnoOutputColumn
+    private String meins;
+
+    @ApiParam(value = "工厂")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "库存地点")
+    @AnnoOutputColumn
+    private String lgort;
+
+    @ApiParam(value = "库存状态")
+    @AnnoOutputColumn
+    private String zstat;
+
+    @ApiParam(value = "特殊库存标识")
+    @AnnoOutputColumn
+    private String sobkz;
+
+    @ApiParam(value = "项目号")
+    @AnnoOutputColumn
+    private String zxm;
+
+    @ApiParam(value = "库存帐冻结标识")
+    @AnnoOutputColumn
+    private String zdjbs;
+
+    @ApiParam(value = "删除标识")
+    @AnnoOutputColumn
+    private String xloek;
+
+    @ApiParam(value = "年度")
+    @AnnoOutputColumn
+    private Integer gjahr;
+
+    public Integer getZeilVal() {
+        return zeili== null ? 0 : this.zeili.intValue();
+    }
+
+    public Integer getGjahrVal() {
+        return gjahr== null ? 0 : this.gjahr.intValue();
+    }
+}

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

@@ -0,0 +1,39 @@
+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-22 10:27
+ * @Modify:
+ **/
+@Data
+@Api(value="盘点调差",description = "盘点调差")
+public class SapDifo extends SapBase{
+
+    @ApiParam(value = "工厂")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "盘点凭证号")
+    @AnnoOutputColumn
+    private String iblnr;
+
+    @ApiParam(value = "行号")
+    @AnnoOutputColumn
+    private String zeili;
+
+    @ApiParam(value = "调整")
+    @AnnoOutputColumn
+    private String ztzbs;
+
+    @ApiParam(value = "年度")
+    @AnnoOutputColumn
+    private String gjahr;
+
+}

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

@@ -22,7 +22,7 @@ public class SapMiscr extends SapBase{
 
     @ApiParam(value = "行号",example = "1")
     @AnnoOutputColumn
-    private Double zeile;
+    private Integer zeile;
 
     @ApiParam(value = "工厂",example = "1")
     @AnnoOutputColumn
@@ -64,8 +64,8 @@ public class SapMiscr extends SapBase{
     @AnnoOutputColumn(hidden = true)
     private String sgtxt;
 
-    public Double getZeileVal() {
-        return zeile== null ? 0D : this.zeile.doubleValue();
+    public Integer getZeileVal() {
+        return zeile== null ? 0 : this.zeile.intValue();
     }
 
     public Double getErfmgVal() {

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

@@ -16,7 +16,7 @@ import lombok.Data;
 @Api(value="销售退货",description = "销售退货")
 public class SapRdn extends SapBase{
 
-    @ApiParam(value = "销售交货单",example = "1")
+    @ApiParam(value = "退货交货单",example = "1")
     @AnnoOutputColumn
     private String vbeln;
 

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

@@ -29,7 +29,7 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     public Map<String, Obj> barCode;
 
     @ApiParam("进度")
-    public String percent ="消息提示：";
+    public String percent = "消息提示：";
 
     @ApiParam("当前步骤")
     public Integer currentStep;
@@ -97,6 +97,9 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam(value = "是否完成流程操作")
     public Boolean isComplete = false;
 
+    @ApiParam(value = "交易类型信息")
+    public WmsTransType wmsTransType;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPart.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 : 客户零件关系表
@@ -40,4 +41,11 @@ public class WmsCustomerPart extends BaseBean {
     @ApiParam(value = "客户零件号")
     private String customerPartNo;
 
+    @Transient
+    @ApiParam(value = "客户全称")
+    private String custDesc;
+
+    @Transient
+    @ApiParam(value ="物料名称")
+    private String partName;
 }

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

@@ -182,6 +182,14 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value ="余数",example = "1")
     private Double restQty;
 
+    @Transient
+    @ApiParam("任务状态")
+    private Integer isTask;
+
+    @Transient
+    @ApiParam("主表单据状态")
+    private Integer orderMasterStatus;
+
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
     }
@@ -194,6 +202,10 @@ public class WmsDocMovementDetails extends BaseBean {
 
     public Double getActualQty() {return actualQty == null ? 0D : this.actualQty.doubleValue(); }
 
+    public Integer getIsTaskVal() {return isTask == null ? 0 : this.isTask.intValue();}
+
+    public Integer getOrderMasterStatus() { return orderMasterStatus== null ? 0 : this.orderMasterStatus.intValue(); }
+
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")

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

@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api(value="线边库物料信息",description = "线边库物料信息")
+@Deprecated
 public class WmsLineLocatePart extends BaseBean {
 
     @Column(name="LOCATE_NO")

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

@@ -30,125 +30,130 @@ import javax.persistence.*;
 })
 @Api("PO订单明细信息")
 public class WmsPOMasterDetails extends BaseBean {
+
+    private static final long serialVersionUID = -677572691809622129L;
+
     @Column(name = "PART_NO")
     @ApiParam("物料编码")
-    public String partNo;
+    private String partNo;
 
-    @Column(name = "BOX_QTY" )
+    @Column(name = "BOX_QTY")
     @ColumnDefault("0")
-    @ApiParam(value ="箱数", example = "0")
-    public Integer boxQty;
+    @ApiParam(value = "箱数", example = "0")
+    private Integer boxQty;
 
     @Column(name = "PART_NAME_RDD")
     @ApiParam("物料名称")
-    public String partNameRdd;
+    private String partNameRdd;
 
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public Integer item;
+    private Integer item;
 
     @Column(name = "QTY")
     @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
-    public Double qty;
+    private Double qty;
 
-    public Double getQty(){ return this.qty == null ? 0 : this.qty; }
+    // 不可能为 null 值
+    // Rock.Yu at 2019-06-22 20:03
+    //private Double getQty(){ return this.qty == null ? new Double(0) : this.qty; }
 
     @Column(name = "UNIT")
     @ApiParam("单位")
-    public String unit;
+    private String unit;
 
     @Column(name = "ORDER_NO")
     @ApiParam("订单号")
-    public String orderNo;
+    private String orderNo;
 
     @Column(name = "PRINT_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "条码打印数量", example = "0")
-    public Double printQty;
+    private Double printQty;
 
-    public Double getPrintQty(){ return this.printQty == null ? 0 : this.printQty; }
+    //private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; }
 
     @Column(name = "RC_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "收货数量", example = "0")
-    public Double rcQty;
+    private Double rcQty;
 
-    public Double getRcQty(){ return this.rcQty == null ? 0 : this.rcQty; }
+    //private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; }
 
     @Column(name = "PASS_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "质检合格数量", example = "0")
-    public Double passQty;
+    private Double passQty;
 
-    public Double getPassQty(){ return this.passQty == null ? 0 : this.passQty; }
+    //private Double getPassQty(){ return this.passQty == null ? new Double(0) : this.passQty; }
 
     @Column(name = "NG_QTY")
     @ColumnDefault("0")
     @ApiParam(value = "质检不合格数量", example = "0")
-    public Double ngQty;
+    private Double ngQty;
 
-    public Double getNgQty(){ return this.ngQty == null ? 0 : this.ngQty; }
+    //private Double getNgQty(){ return this.ngQty == null ? new Double(0) : this.ngQty; }
 
     @Column(name = "PLAN_DATE")
     @ApiParam("计划交货日期")
-    public String planDate;
+    private String planDate;
 
     @Column(name = "PLAN_TIME")
     @ApiParam("计划交货时间")
-    public String planTime;
+    private String planTime;
 
     @Column(name = "ERP_AREA_NO")
     @ApiParam("默认收货库存地")
-    public String erpAreaNo;
+    private String erpAreaNo;
 
     /**
      * 状态:10 N=正常,20 C=行取消
      */
     @Column(name = "ITEM_STATUS")
     @ApiParam("状态")
-    public Integer itemStatus;
+    private Integer itemStatus;
 
     @Column(name = "SNP")
     @ApiParam("标准包装")
-    public Double snp;
+    private Double snp;
 
     /**
      * 是否免费:0=计费,1=免费
      */
     @Column(name = "IS_FREE")
     @ApiParam(value = "是否免费", example = "1")
-    public Integer isFree;
+    private Integer isFree;
 
     @Transient
     @ApiParam(value = "散件收货输入数量", example = "0")
-    public Double inputRcQty;
+    private Double inputRcQty;
 
     @Transient
     @ApiParam(value = "供应商批次")
-    public String dateCode;
+    private String dateCode;
 
     @Transient
     @ApiParam("前端表格编辑使用")
-    public Boolean isSet = false;
+    private Boolean isSet = false;
 
     @Transient
     @ApiParam("供应商批次字段是否可编辑")
-    public Boolean isDateCodeEdit = true;
+    private Boolean isDateCodeEdit = true;
 
-    public Double getInputRcQty(){ return this.inputRcQty == null ? 0 : this.inputRcQty; }
+    //private Double getInputRcQty(){ return this.inputRcQty == null ? new Double(0) : this.inputRcQty; }
 
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public transient int lockVersion;
+    private transient int lockVersion;
 
     @Transient
     @ApiParam("PO条码总箱数")
-    public Integer totalBoxes;
+    private Integer totalBoxes;
 
     @Transient
     @ApiParam("差异")
-    public Double difference;
+    private Double difference;
 
 }

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=隔离
      */
@@ -215,7 +217,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/WmsTaskDetails.java

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
+import java.math.BigDecimal;
 
 /**
  * @Description : 作业任务明细信息
@@ -137,6 +138,10 @@ public class WmsTaskDetails extends BaseBean {
         return this.qty == null ? 0 : this.qty;
     }
 
+    public String getQtyTxt(){
+        return new BigDecimal(getQty() + "").stripTrailingZeros().toPlainString();
+    }
+
     public Double getTransQty() {
         return this.transQty == null ? 0 : this.transQty;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.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.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * @Description : 库存交易条码信息 （移库类的交易需要记录2笔交易数据，正负各一笔）
@@ -144,4 +141,16 @@ public class WmsTransQuan extends BaseBean {
     @ColumnDefault("0")
     @ApiParam(value = "报废数量", example = "0")
     private Double scrapQty;
+
+    @Transient
+    @ApiParam("交易类型")
+    private String transTypeName;
+
+    @Transient
+    @ApiParam("仓库名称")
+    private String warehouseName;
+
+    @Transient
+    @ApiParam("存储区名称")
+    private String zoneName;
 }

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

@@ -89,4 +89,11 @@ public class WmsZones extends BaseBean {
     @Transient
     @ApiParam(value ="子存储区列表")
     private List<WmsZones> childList;
+
+    public WmsZones(String zoneNo){
+        this.zoneNo = zoneNo;
+    }
+
+    public WmsZones(){}
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -96,4 +96,11 @@ public class WmsInterfaceDataMapper extends BaseBean {
      */
     @Column(name = "GROUP_NAME")
     public String groupName;
+
+    /**
+     * 业务的路由规则
+     * 一表对多表时需要配置路由规则
+     */
+    @Column(name = "BUSI_ROUTE")
+    public String busiRoute;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java

@@ -0,0 +1,74 @@
+package cn.estsh.i3plus.pojo.wms.dbinterface;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+public class WmsInterfaceEnumUtil {
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DIRECTION_TYPE {
+        SAP2WMS(10, "SAP2WMS", "SAP --> WMS"),
+        WMS2SAP(20, "WMS2SAP", "WMS --> SAP"),
+        MES2WMS(30, "MES2WMS", "MES --> WMS"),
+        WMS2MES(40, "WMS2MES", "WMS --> MES");
+
+        private int value;
+        private String name;
+        private String description;
+
+        DIRECTION_TYPE() {
+        }
+
+        DIRECTION_TYPE(int value, String name, String description) {
+            this.value = value;
+            this.name = name;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        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].getName();
+                }
+            }
+            return tmp;
+        }
+
+        public static int nameOf(String val) {
+            int tmp = -1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name.equals(val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        /**
+         * -1 不在范围内
+         * @param desc
+         * @return
+         */
+        public static int descOf(String desc) {
+            int tmp = -1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+}

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

@@ -66,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/WmsCustomerPartRepository.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.WmsCustomerPart;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制(客户零件号关系)
+ * @Reference :
+ * @Author : sky.meng
+ * @CreateDate : 2019-06-21 20:22
+ * @Modify:
+ **/
+@Repository
+public interface WmsCustomerPartRepository extends BaseRepository<WmsCustomerPart, Long> {
+
+}

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

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

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransQuanRepository.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.WmsTransQuan;
+import org.springframework.stereotype.Repository;
 
 /**
 * @Description : 库存业务dao层
@@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTransQuan;
 * @CreateDate : 2018-11-17 15:57
 * @Modify:
 **/
+@Repository
 public interface WmsTransQuanRepository extends BaseRepository<WmsTransQuan, 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/sqlpack/WmsHqlPack.java

@@ -77,8 +77,14 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result);
+
+        DdlPreparedPack.timeBuilder(wmsDocMovementDetails.getCreateDateTimeStart(),
+                wmsDocMovementDetails.getCreateDateTimeEnd(),"createDatetime",result,true);
         getStringBuilderPack(wmsDocMovementDetails, result);
 
         return result;
@@ -1447,12 +1453,11 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc, String organizeCode) {
         DdlPackBean result = new DdlPackBean();
-        int i = 1;
         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) {
+        /*for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
 
             String key = map.getKey();
             List<WmsDataAuth> valueList = map.getValue();
@@ -1463,19 +1468,19 @@ public class WmsHqlPack {
                 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);
-                }/* else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", key)) {
+                    packMutilConditionHql(mapList, "WH_CODE", "destWhNo", result);
+                } 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);
-                }*/ else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", key)) {
+                    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);
-                    //packMutilConditionHql(mapList, "ZONE_CODE", "destZoneNo", result);
-                } /*else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) {
+                    packMutilConditionHql(mapList, "ZONE_CODE", "destZoneNo", result);
+                } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) {
                     DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"PART_NO"), "partNo", result);
-                    //packMutilConditionHql(mapList, "PART_NO", "partNo", result);
-                }*/
+                    packMutilConditionHql(mapList, "PART_NO", "partNo", result);
+                }
             }
-        }
+        }*/
 
         //转换封装后的hql
         /*String packedHql = result.getPackedHql();
@@ -1941,4 +1946,81 @@ public class WmsHqlPack {
         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;
+    }
+
+    //库层交易报表packHqlWmsTransQuan
+
+
+    public static DdlPackBean packHqlWmsTransQuan(WmsTransQuan wmsTransQuan) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransNo(), "transNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNameRdd(), "partNameRdd", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getUnit(), "unit", result);
+        DdlPreparedPack.getNumEqualPack(wmsTransQuan.getTransStatus(), "transStatus", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getRefSrc(), "refSrc", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getRefType(), "refType", result);
+        DdlPreparedPack.getNumEqualPack(wmsTransQuan.getBusiType(), "busiType", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransCode(), "transCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getVendorNo(), "vendorNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getCustNo(), "custNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getErrorMessage(), "errorMessage", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getQty().toString(), "qty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getFailQty().toString(), "failQty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getHoldQty().toString(), "holdQty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getQcQty().toString(), "qcQty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getRinQty().toString(), "rinQty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getFreezeQty().toString(), "freezeQty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getConsignQty().toString(), "consignQty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLockQty().toString(), "lockQty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransNo(), "scrapQty", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getScrapQty().toString(), "transTypeName", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWarehouseName(), "warehouseName", result);
+//        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneName(), "zoneName", result);
+//
+
+        getStringBuilderPack(wmsTransQuan, result);
+
+        return result;
+    }
+
+    /**
+     * 根据存储区编号集合、库位类型查询库位信息
+     *
+     * @param zoneNoList
+     *@param wmsZones
+     * @param locateType
+     * @return
+     */
+    public static DdlPackBean packLocateNoByZoneNo(List<String> zoneNoList , WmsZones wmsZones , Integer locateType) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getInPackList(zoneNoList, "zoneNo", result);
+        DdlPreparedPack.getNumEqualPack(locateType, "locateType", result);
+        getStringBuilderPack(wmsZones, result);
+
+        return result;
+    }
+
 }