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

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

@@ -1168,6 +1168,7 @@ public class BlockFormEnumUtil {
         LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
         DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
         FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
+        BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null),
         BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null),
         BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null);
 //        DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,null);
@@ -1320,7 +1321,7 @@ public class BlockFormEnumUtil {
         public static PROPERTY_TYPE valueOfClassPath(String classPath) {
             PROPERTY_TYPE tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].classPath == classPath) {
+                if (values()[i].classPath.equals(classPath)) {
                     tmp = values()[i];
                 }
             }

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

@@ -304,6 +304,7 @@ public class WmsEnumUtil {
     /**
      * 产品入库，发运状态
      * WMS_产品报工明细信息 ：单据状态
+     * WMS_发泡打箱包装
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRODUCT_INSTOCK_STATUS {
@@ -2699,7 +2700,8 @@ public class WmsEnumUtil {
     public enum SRC_STATUS {
         ZMMES("ZMMES", "知明MES"),
         TBMES("TBMES", "MES接口"),
-        AMP("AMP", "AMP系统");
+        AMP("AMP", "AMP系统"),
+        ZSLD("ZSLD", "直送拉动");
 
         private String value;
         private String description;
@@ -2962,4 +2964,144 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 库位校验源库位目标库位参数
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SRC_DEST_LOCATE {
+        SRC(10, "SRC", "源库位"),
+        DEST(20, "DEST", "目标库位");
+
+        private int value;
+        private String code;
+        private String description;
+
+        SRC_DEST_LOCATE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public static SRC_DEST_LOCATE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == (value)) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * 物料结算标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OUT_CLOSE_FLAG {
+        INTERNAL_SETTLEMENT("1", "内部结算"),
+        NOMAL_SETTLEMENT("2", "正常结算");
+
+        private String value;
+        private String description;
+
+        OUT_CLOSE_FLAG(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 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 OUT_CLOSE_TYPE {
+        OFF_LINE_SETTLEMENT("10", "下线结算"),
+        PICK_SETTLEMENT("20", "配料结算");
+
+        private String value;
+        private String description;
+
+        OUT_CLOSE_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 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;
+        }
+    }
 }

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

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 定时任务参数解析Model
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2019/7/17 16:25
+ * @Modify
+ */
+@Data
+public class WmsJobParamModel implements Serializable {
+    private String organizeCode;
+    private List<String> zonesNoList;
+    private Integer snType;
+}

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

@@ -24,6 +24,9 @@ public class SessionUser implements Serializable {
     @ApiParam("用户ID")
     private Long userId;
 
+    @ApiParam("设备ID")
+    private String deviceId;
+
     @ApiParam("用户工号")
     private String userCode;
 

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

@@ -103,6 +103,14 @@ public class WmsCSFactTrans extends BaseBean {
     @ApiParam("是否范围内")
     public Integer isScope;
 
+    @Transient
+    @ApiParam(value = "实盘箱数", example = "1")
+    public Long countBoxQty;
+
+    @Transient
+    @ApiParam(value = "物料数量", example = "1")
+    public Double sumPartQty;
+
     public WmsCSFactTrans(){}
 
     public Integer getIsScopeVal() {
@@ -133,4 +141,12 @@ public class WmsCSFactTrans extends BaseBean {
         this.srcZoneNo = srcZoneNo;
         this.srcWhNo = srcWhNo;
     }
+
+    public WmsCSFactTrans(Long countBoxQty,Double sumPartQty,String zoneNo, String partNo, String partNameRdd) {
+        this.countBoxQty = countBoxQty;
+        this.sumPartQty = sumPartQty;
+        this.zoneNo = zoneNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+    }
 }

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

@@ -130,10 +130,14 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam("交易类型名称")
     private String transTypeName;
 
+    @Column(name="FIX_ID")
+    @ApiParam(value = "设备编号")
+    public String fixId;
+
     public WmsMoveMaster(){};
 
     public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
-                         String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty) {
+                         String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId) {
         this.id = id;
         this.orderNo = orderNo;
         this.organizeCode = organizeCode;
@@ -149,7 +153,7 @@ public class WmsMoveMaster extends BaseBean {
         this.destZoneNo = destZoneNo;
         this.transQty = transQty;
         this.rejectQty = rejectQty;
-
+        this.fixId = fixId;
 
     }
 

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

@@ -0,0 +1,76 @@
+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 : WMS_包装箱条码表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-07-17 11:32
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_PACK_SN")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="包装箱条码表",description = "包装箱条码表")
+public class WmsPackSn extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "订单号")
+    private String orderNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME_ADD")
+    @ApiParam(value = "物料名称")
+    private String partNameAdd;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "SID")
+    @ApiParam("SID")
+    private Double sId;
+
+    @Column(name = "COMMIT_DATE")
+    @ApiParam(value = "提交日期")
+    private String commitDate;
+
+    @Column(name = "COMMIT_TIME")
+    @ApiParam(value = "提交时间")
+    private String commitTime;
+
+    @Column(name = "SN")
+    @ApiParam(value = "条码")
+    private String sn;
+
+    /**
+     * 状态:10=新建,20=已处理,30=处理出错 PRODUCT_INSTOCK_STATUS
+     */
+    @Column(name = "ORDER_STATUS")
+    @ApiParam(value = "状态")
+    private Integer orderStatus;
+
+    /**
+     * 数据来源:ZMMES=知明MES,TBMES=MES接口 SRC_STATUS
+     */
+    @Column(name = "SRC")
+    @ApiParam(value = "单据来源")
+    private String src;
+}

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

@@ -134,6 +134,10 @@ public class WmsPart extends BaseBean {
     @ApiParam("項目结算标识")
     private String outCloseFlag = "2";
 
+    @Column(name = "OUT_CLOSE_TYPE")
+    @ApiParam("结算方式")
+    private String outCloseType;
+
     @Transient
     @ApiParam("总数量")
     private Double qty;

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

@@ -147,6 +147,10 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "存储区集合")
     private List<String> zoneList;
 
+    @Transient
+    @ApiParam(value = "移动单条码集合")
+    private List<WmsMoveSn> wmsMoveSnList;
+
 
     public String getAreaNo() {
         return areaNo;
@@ -204,7 +208,7 @@ public class WmsStockQuan extends BaseBean {
     }
 
     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,String prodCfgTypeCode ,String prodCfgTypeName, Double scrapQty) {
+                        Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
         this.whNo = whNo;
         this.zoneNo = zoneNo;
         this.partNo = partNo;
@@ -218,10 +222,11 @@ public class WmsStockQuan extends BaseBean {
         this.freezeQty = freezeQty;
         this.consignQty = consignQty;
         this.lockQty = lockQty;
-        this.prodCfgTypeCode= prodCfgTypeCode;
+        this.prodCfgTypeCode = prodCfgTypeCode;
         this.prodCfgTypeName = prodCfgTypeName;
         this.scrapQty = scrapQty;
     }
+
     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;
@@ -234,7 +239,7 @@ public class WmsStockQuan extends BaseBean {
         this.scrapQty = scrapQty;
     }
 
-    public WmsStockQuan(String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit,
+    public WmsStockQuan(String locateNo, Integer boxQty, Double partQty, String partNo, String partNameRdd, String unit,
                         Double sumQty, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
         this.locateNo = locateNo;
         this.boxQty = boxQty;
@@ -254,8 +259,8 @@ public class WmsStockQuan extends BaseBean {
         this.scrapQty = scrapQty;
     }
 
-    public WmsStockQuan(String whNo, String zoneNo, String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit,
-                         Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
+    public WmsStockQuan(String whNo, String zoneNo, String locateNo, Integer boxQty, Double partQty, String partNo, String partNameRdd, String unit,
+                        Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
         this.whNo = whNo;
         this.zoneNo = zoneNo;
         this.locateNo = locateNo;

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

@@ -230,8 +230,11 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "ERP库存地")
     public String erpZoneNo;
 
-    public WmsStockSn(){}
+    @Transient
+    @ApiParam(value = "目标数量")
+    public Double destQty;
 
+    public WmsStockSn(){}
 
     public WmsStockSn(String partNo){
         this.partNo = partNo;

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

@@ -24,4 +24,6 @@ public class IQ {
 
     public  String ACTHMS="";
 
+    public  String WERKS="";
+
 }

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

@@ -24,4 +24,6 @@ public class OQ {
 
     public  String ACTHMS="";
 
+    public  String WERKS="";
+
 }

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

@@ -17,18 +17,24 @@ import java.util.List;
 @Repository
 public interface IEngineScriptPersistenceRepository extends BaseRepository<EngineScriptPersistence, Long> {
     /**
-     * 按照脚本编号查询脚本实体对象
+     * 按照工厂代码和脚本编号查询脚本实体对象
+     * @param organizeCode 工厂代码
      * @param scriptNo 脚本编号
      * @return 脚本实体对象
      */
     EngineScriptPersistence findByOrganizeCodeAndScriptNo(String organizeCode, String scriptNo);
 
     /**
+     * 按照脚本编号查询脚本实体对象
+     * @param scriptNo 脚本编号
+     * @return 脚本实体对象
+     */
+    EngineScriptPersistence findByScriptNo(String scriptNo);
+
+    /**
      * 查找所有的脚本语言类型
      * @return 数据库中已经存在的脚本语言类型
      */
     @Query("select t.languageType from EngineScriptPersistence t group by t.organizeCode, t.languageType")
     List findGroupByLanguageType();
-
-    EngineScriptPersistence findByScriptNo(String scriptNo);
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.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.WmsPackSn;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-07-17 13:36
+ * @Modify:
+ **/
+@Repository
+public interface WmsPackSnRepository extends BaseRepository<WmsPackSn, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingRepository.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.WmsShipping;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description 对象持久层仓用方法控制(产品发运表)
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2019/7/17 15:54
+ * @Modify
+ */
+@Repository
+public interface WmsShippingRepository extends BaseRepository<WmsShipping, Long> {
+}

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

@@ -59,7 +59,7 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
-        DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
+        DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanTime(), "planTime", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanDate(), "planDate", result);
 
@@ -80,12 +80,12 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result);
-        DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(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);
+                wmsDocMovementDetails.getCreateDateTimeEnd(), "createDatetime", result, true);
         getStringBuilderPack(wmsDocMovementDetails, result);
 
         return result;
@@ -119,9 +119,10 @@ public class WmsHqlPack {
         DdlPackBean packBean = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
+        DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
+        DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
 
         getStringBuilderPack(wmsDocMovementMaster, packBean);
@@ -139,7 +140,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
         DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
@@ -177,6 +178,7 @@ public class WmsHqlPack {
 
     /**
      * 物流路线子表查询条件封装
+     *
      * @param wmsRoutingDetail
      * @return
      */
@@ -208,6 +210,7 @@ public class WmsHqlPack {
 
     /**
      * 物流路线子表查询条件封装
+     *
      * @param wmsRoutingAssign
      * @return
      */
@@ -245,7 +248,7 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsPart(WmsPart wmsPart) {
         DdlPackBean result = new DdlPackBean();
 
-        DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringRightLikerPack(wmsPart.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
         DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
         DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result);
@@ -266,7 +269,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringRightLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
         getStringBuilderPack(wmsIbCheckPlan, result);
 
@@ -290,7 +293,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringEqualPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
+        DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
         DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result);
         DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result);
 
@@ -413,11 +416,11 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result);
         DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
         DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result);
-        if(wmsLocate.getZoneNo() != null){
-            DdlPreparedPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsLocate.getZoneNo().split(","))),","),"",result);
+        if (wmsLocate.getZoneNo() != null) {
+            DdlPreparedPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "", result);
         }
 
-       // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result);
+        // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result);
         DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result);
 
         getStringBuilderPack(wmsLocate, result);
@@ -555,6 +558,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsShipping.getOrderStatus(), "orderStatus", result);
         //特殊发货标志
         DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result);
+        //单据来源
+        DdlPreparedPack.getStringEqualPack(wmsShipping.getSrc(), "src", result);
 
         getStringBuilderPack(wmsShipping, result);
 
@@ -811,11 +816,12 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
         if (wmsStockSn.getSnStatus() == null) {
             DdlPreparedPack.getInPackArray(new Integer[]{
-                    WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(),WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(),
-                    WmsEnumUtil.STOCK_SN_STATUS.INSTOCKED.getValue(),WmsEnumUtil.STOCK_SN_STATUS.PICKED.getValue(),
+                    WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(),
+                    WmsEnumUtil.STOCK_SN_STATUS.INSTOCKED.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PICKED.getValue(),
                     WmsEnumUtil.STOCK_SN_STATUS.COMMING.getValue()}, "snStatus", result);
         }
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
+        result.setWhereAppend(result.getWhereAppend() + " and qty > 0");
 
         getStringBuilderPack(wmsStockSn, result);
 
@@ -831,7 +837,7 @@ public class WmsHqlPack {
     public static DdlPackBean packWmsStockQuan(WmsStockQuan wmsStockQuan) {
         DdlPackBean result = new DdlPackBean();
 
-        DdlPreparedPack.getInPackList(wmsStockQuan.getZoneList(),"zoneNo",result);
+        DdlPreparedPack.getInPackList(wmsStockQuan.getZoneList(), "zoneNo", result);
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
@@ -871,7 +877,7 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result);
         DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsTransQuan.getMoveNo(), "moveNo", result);
         DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result);
 
@@ -879,6 +885,7 @@ public class WmsHqlPack {
 
         return result;
     }
+
     /**
      * 业务：库存表报查询封装
      *
@@ -891,14 +898,14 @@ public class WmsHqlPack {
         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);
+        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.getPartNo() != null) {
+            HqlPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsStockQuan.getPartNo().split(","))), ","), "partNo", findWhere);
         }
-        if(!wmsStockQuan.getIncludeZeroStock()){
+        if (!wmsStockQuan.getIncludeZeroStock()) {
             //含0库存显示，默认为否
             //自定义条件，各汇总数量相加。为否时添加>0的条件判断
             findWhere.append("  and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 ");
@@ -914,22 +921,23 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getProdCfgTypeCode(), "prodCfgTypeCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
 
-        if(wmsStockQuan.getZoneNo() != null){
+        if (wmsStockQuan.getZoneNo() != null) {
             DdlPreparedPack.getInPackList(Arrays.asList(wmsStockQuan.getZoneNo().split(",")), "zoneNo", result);
         }
-        if(wmsStockQuan.getPartNo() != null){
+        if (wmsStockQuan.getPartNo() != null) {
             DdlPreparedPack.getInPackList(Arrays.asList(wmsStockQuan.getPartNo().split(",")), "partNo", result);
         }
-        if(!wmsStockQuan.getIncludeZeroStock()){
+        if (!wmsStockQuan.getIncludeZeroStock()) {
             //含0库存显示，默认为否
             //自定义条件，各汇总数量相加。为否时添加>0的条件判断
-            result.setWhereAppend(result.getWhereAppend()+" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 ");
+            result.setWhereAppend(result.getWhereAppend() + " and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 ");
         }
 
         getStringBuilderPack(wmsStockQuan, result);
 
         return result;
     }
+
     /**
      * 业务：物料包装查询封装
      *
@@ -984,9 +992,9 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);
 
         DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(),
-                wmsMoveMaster.getCreateDateTimeEnd(),"createDatetime",result,true);
+                wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
         DdlPreparedPack.timeBuilder(wmsMoveMaster.getModifyDateTimeStart(),
-                wmsMoveMaster.getModifyDateTimeEnd(),"modifyDatetime",result,true);
+                wmsMoveMaster.getModifyDateTimeEnd(), "modifyDatetime", result, true);
         getStringBuilderPack(wmsMoveMaster, result);
 
         return result;
@@ -1132,6 +1140,7 @@ public class WmsHqlPack {
 
     /**
      * 条码状态查询报表查询条件
+     *
      * @param wmsStockSn
      * @return
      */
@@ -1152,7 +1161,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
-        if(wmsStockSn.getIsValid()!= null){
+        if (wmsStockSn.getIsValid() != null) {
             DdlPreparedPack.getNumEqualPack(wmsStockSn.getIsValid(), "isValid", result);
         }
         getStringBuilderPack(wmsStockSn, result);
@@ -1165,7 +1174,7 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
 
-        result.setWhereAppend(result.getWhereAppend()+" and qty  > 0 ");
+        result.setWhereAppend(result.getWhereAppend() + " and qty  > 0 ");
         getStringBuilderPack(wmsStockQuan, result);
 
         return result;
@@ -1445,6 +1454,13 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
+
+        DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zones", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);
+        DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result);
+        if (StringUtils.isNotBlank(wmsStockSn.getOrderByParam())) {
+            result.setOrderByStr(wmsStockSn.getOrderByParam());
+        }
         getStringBuilderPack(wmsStockSn, result);
         return result;
     }
@@ -1561,13 +1577,14 @@ public class WmsHqlPack {
 
     /**
      * 把 List<Map> 中的一组数据重新封装到List<String>中
+     *
      * @param mapList
      * @param keyName
      */
-    private static List<String> cyclicTraversal(List<Map> mapList,String 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);
+        for (int i = 0; i < mapList.size(); i++) {
+            Map<String, String> map = mapList.get(i);
             list.add(map.get(keyName));
         }
         return list;
@@ -1575,13 +1592,14 @@ public class WmsHqlPack {
 
     /**
      * 把 List<Map> 中的一组查询条件封装成 HQL
+     *
      * @param mapList
      * @param keyName
      * @param columnName
      * @param packBean
      */
-    private static void packMutilConditionHql(List<Map> mapList, String keyName,String columnName, DdlPackBean packBean) {
-        int index  = 1;
+    private static void packMutilConditionHql(List<Map> mapList, String keyName, String columnName, DdlPackBean packBean) {
+        int index = 1;
         String columnParam = null;
         for (Map item : mapList) {
             columnParam = columnName + String.valueOf(index);
@@ -1600,7 +1618,7 @@ public class WmsHqlPack {
      * @param orderList
      * @return
      */
-    public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList,Map<String, List<WmsDataAuth>> groupDataAuth) {
+    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
@@ -1613,7 +1631,7 @@ public class WmsHqlPack {
             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);
+                    DdlPreparedPack.getInPackList(cyclicTraversal(mapList, "TRANS_TYPE_CODE"), "transTypeCode", packBean);
                     //packMutilConditionHql(mapList, "TRANS_TYPE_CODE", "transTypeCode", packBean);
                     break;
                 }
@@ -1868,7 +1886,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
         DdlPreparedPack.getStringNotNullPack("locateNo", result);
-        result.setWhereAppend(result.getWhereAppend()+" and locateNo != ''");
+        result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''");
 
         getStringBuilderPack(wmsStockSn, result);
 
@@ -1882,7 +1900,7 @@ public class WmsHqlPack {
         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 ");
+        result.setWhereAppend(result.getWhereAppend() + " and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 ");
         getStringBuilderPack(wmsStockQuan, result);
 
         return result;
@@ -1956,6 +1974,7 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsVendorPart, result);
         return result;
     }
+
     /**
      * 主数据信息 分页查询
      *
@@ -1965,12 +1984,12 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsProdCfgType(WmsProdCfgType wmsProdCfgType) {
         DdlPackBean result = new DdlPackBean();
         //查询参数封装
-        if(wmsProdCfgType != null){
+        if (wmsProdCfgType != null) {
             DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeName(), "prodCfgTypeName", result);
             DdlPreparedPack.getStringLikerPack(wmsProdCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", result);
         }
-        DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(),"isValid",result);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
+        DdlPreparedPack.getNumEqualPack(wmsProdCfgType.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
 //        getStringBuilderPack(wmsProdCfgType, result);
         return result;
     }
@@ -2000,11 +2019,11 @@ public class WmsHqlPack {
      * @param wmsPart
      * @return
      */
-    public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,String[] parts) {
+    public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart, String[] parts) {
 
         DdlPackBean packBean = new DdlPackBean();
-        DdlPreparedPack.getInPackArray(parts,"partNo",packBean);
-        DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(),"organizeCode",packBean);
+        DdlPreparedPack.getInPackArray(parts, "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", packBean);
         getStringBuilderPack(wmsPart, packBean);
 
         return packBean;
@@ -2073,11 +2092,11 @@ public class WmsHqlPack {
      * 根据存储区编号集合、库位类型查询库位信息
      *
      * @param zoneNoList
-     *@param wmsZones
+     * @param wmsZones
      * @param locateType
      * @return
      */
-    public static DdlPackBean packLocateNoByZoneNo(List<String> zoneNoList , WmsZones wmsZones , Integer locateType) {
+    public static DdlPackBean packLocateNoByZoneNo(List<String> zoneNoList, WmsZones wmsZones, Integer locateType) {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
@@ -2098,7 +2117,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getInPackList(ids,"id",result);
+        DdlPreparedPack.getInPackList(ids, "id", result);
 
         return result;
     }
@@ -2110,14 +2129,14 @@ public class WmsHqlPack {
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean packHqlWmsASNMasterByStatus(List<Integer> statusList,String organizeCode) {
+    public static DdlPackBean packHqlWmsASNMasterByStatus(List<Integer> statusList, String organizeCode) {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getInPackList(statusList,"asnStatus",result);
-        DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(),"actionStatus",result);
-        DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ORDER_TYPE.AMP.getValue(),"asnType",result);
-        DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
+        DdlPreparedPack.getInPackList(statusList, "asnStatus", result);
+        DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(), "actionStatus", result);
+        DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ORDER_TYPE.AMP.getValue(), "asnType", result);
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
 
@@ -2142,4 +2161,44 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    /**
+     * 库存条码管理查询条件
+     *
+     * @param wmsStockSn
+     * @return
+     */
+    public static DdlPackBean packHqlWmsStockSnManageByPager(WmsStockSn wmsStockSn) {
+        DdlPackBean result = new DdlPackBean();
+
+        // 物料编码支持多选
+        DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
+        // 存储区
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
+
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
+        // 库位不为空
+        DdlPreparedPack.getStringNotNullPack( "locateNo", result);
+        DdlPreparedPack.getStringNoEqualPack("","locateNo", result);
+        // 排除创建及出库状态条码
+        if(wmsStockSn.getSnStatus() != null){
+            DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
+        }
+        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result);
+        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result);
+
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(),"snType",result);
+
+        //数量大于0
+        DdlPreparedPack.getNumberBiggerPack(0,"qty",result);
+        DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
+        DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
+
+        getStringBuilderPack(wmsStockSn, result);
+        return result;
+    }
 }