冲突

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

@@ -84,6 +84,7 @@ public class AndonHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", result);
         getStringBuilderPack(mesWorkCell, result);
 
         return result;

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

@@ -247,7 +247,7 @@ public class AndonEnumUtil {
         EQUIP("EQUMENT_ALARM","设备"),
         PROCESS("ROUTING_ALARM","工艺"),
         CHECK("OTHER_ALARM","其他"),
-        FIX_ERROR("FIX_ERROR", "设备故障");
+        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;
@@ -2556,4 +2556,39 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+
+    /**
+     * 库存交易表状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WMS_TRANS_QUAN_STATUS {
+        CREATE(1, "创建"), SUCCESS(10, "处理成功"),FAIL(30,"处理失败");
+
+        private int value;
+        private String description;
+
+        WMS_TRANS_QUAN_STATUS(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-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 = ( Math.abs(new Random().nextInt())+ "");
+    private String sid = "";
 
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiParam(value = "接收数据日期", example = "-1")

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

@@ -52,7 +52,7 @@ public class SapCyco extends SapBase{
     @AnnoOutputColumn
     private String zxm;
 
-    @ApiParam(value = "库存帐冻结标识")
+    @ApiParam(value = "库存账冻结标志")
     @AnnoOutputColumn
     private String zdjbs;
 

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

@@ -122,7 +122,7 @@ public class WmsASNMasterDetails extends BaseBean {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public transient int lockVersion;
+    public transient Integer lockVersion;
 
     @Transient
     @ApiParam("实收数量")

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -42,9 +43,33 @@ public class WmsActionResponseBean<Obj> implements Serializable {
 
     @ApiParam("列表信息")
     public List<String> informations;
+    public List<String> getInformations(){
+        if(informations == null){
+            informations= new ArrayList<>();
+        }
+        return informations;
+    }
+    public void setInformation(List<String> list){
+        if(list == null){
+            list = new ArrayList<>();
+        }
+        informations = list;
+    }
 
     @ApiParam("可选项")
     public List<WmsOptionModel> options;
+    public List<WmsOptionModel> getOptions(){
+        if(options == null){
+            options = new ArrayList<>();
+        }
+        return options;
+    }
+    public void setOptions(List<WmsOptionModel> opt){
+        if(opt == null){
+            opt = new ArrayList<>();
+        }
+        options = opt;
+    }
 
     @ApiParam("选中的明细数据")
     public Obj details;

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

@@ -60,4 +60,17 @@ public class WmsCSAdjustRange extends BaseBean {
     @Transient
     @ApiParam("单位")
     public String unit;
+
+    public WmsCSAdjustRange(){}
+    public WmsCSAdjustRange(String orderNo, Integer item, Integer isAdjust, String partNo, String partNameRdd, String zoneNo, String locateNo, String unit,String organizeCode) {
+        this.orderNo = orderNo;
+        this.item = item;
+        this.isAdjust = isAdjust;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.unit = unit;
+        this.organizeCode = organizeCode;
+    }
 }

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

@@ -209,5 +209,5 @@ public class WmsDocMovementDetails extends BaseBean {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public transient int lockVersion;
+    public transient Integer lockVersion;
 }

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 Integer 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/WmsQCDetails.java

@@ -84,5 +84,5 @@ public class WmsQCDetails extends BaseBean {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public transient int lockVersion;
+    public transient Integer lockVersion;
 }

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

@@ -13,6 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.persistence.*;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description : 库存条码信息
@@ -202,8 +203,25 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "工厂名称")
     public String organizeName;
 
+    @Transient
+    @ApiParam(value = "物料数量总和")
+    public Double sumPartQty;
+
+    @Transient
+    @ApiParam(value = "条码数量总和")
+    public Long snCount;
+
+    @Transient
+    @ApiParam(value = "物料编码集合")
+    public List<String> partNoList;
+
+    @Transient
+    @ApiParam(value = "ERP库存地集合")
+    public List<String> erpZoneNoList;
+
     public WmsStockSn(){}
 
+
     public WmsStockSn(String partNo){
         this.partNo = partNo;
     }
@@ -213,4 +231,10 @@ public class WmsStockSn extends BaseBean {
     }
 
     public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();}
+
+    public WmsStockSn( Long snCount, Double sumPartQty,String locateNo) {
+        this.snCount = snCount;
+        this.sumPartQty = sumPartQty;
+        this.locateNo = locateNo;
+    }
 }

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

@@ -153,4 +153,37 @@ public class WmsTransQuan extends BaseBean {
     @Transient
     @ApiParam("存储区名称")
     private String zoneName;
+
+    @Transient
+    @ApiParam("库存地代码")
+    private String areaNo;
+
+    public WmsTransQuan(){}
+
+    public WmsTransQuan(String organizeCode,String partNo,String partNameRdd,String transCode,String unit,String whNo,String zoneNo,
+                        Double qty,Double failQty,Double holdQty,Double scrapQty,Double qcQty,Double rinQty,
+                        Double freezeQty,Double consignQty,Double lockQty){
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.transCode = transCode;
+        this.unit = unit;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.qty = qty;
+        this.failQty = failQty;
+        this.holdQty = holdQty;
+        this.scrapQty = scrapQty;
+        this.qcQty = qcQty;
+        this.rinQty = rinQty;
+        this.freezeQty = freezeQty;
+        this.consignQty = consignQty;
+        this.lockQty = lockQty;
+
+    }
+
+
+    public WmsTransQuan(Integer transStatus){
+        this.transStatus = transStatus;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomRepository.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.WmsBom;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by Administrator on 2019/6/22.
+ */
+@Repository
+public interface WmsBomRepository  extends BaseRepository<WmsBom, 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 and snStatus=40 " +
             "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/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;
@@ -170,7 +176,6 @@ public class WmsHqlPack {
 
     /**
      * 物流路线子表查询条件封装
-     *
      * @param wmsRoutingDetail
      * @return
      */
@@ -202,7 +207,6 @@ public class WmsHqlPack {
 
     /**
      * 物流路线子表查询条件封装
-     *
      * @param wmsRoutingAssign
      * @return
      */
@@ -653,7 +657,6 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
         DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result);
         DdlPreparedPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result);
-        DdlPreparedPack.getStringEqualPack(wmsTaskInfo.getTransTypeCode(), "transTypeCode", result);
 
         getStringBuilderPack(wmsTaskInfo, result);
 
@@ -862,7 +865,6 @@ public class WmsHqlPack {
 
         return result;
     }
-
     /**
      * 业务：库存表报查询封装
      *
@@ -875,14 +877,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 ");
@@ -898,23 +900,22 @@ 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;
     }
-
     /**
      * 业务：物料包装查询封装
      *
@@ -1107,6 +1108,34 @@ public class WmsHqlPack {
     }
 
     /**
+     * 条码状态查询报表查询条件
+     * @param wmsStockSn
+     * @return
+     */
+    public static DdlPackBean packHqlWmsStockSnReportByPager(WmsStockSn wmsStockSn) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
+
+        // 物料编码支持多选
+        DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
+        DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
+
+        getStringBuilderPack(wmsStockSn, result);
+
+        return result;
+    }
+
+    /**
      * 质检单明细信息 查询条件封装
      *
      * @param wmsQCDetails
@@ -1437,7 +1466,7 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsDataAuth(WmsDataAuth dataAuth, List<String> roleIds) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getNumEqualPack(dataAuth.getDataObj(), "dataObj", result);
-        DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getStringEqualPack(dataAuth.getOrganizeCode(),"organizeCode",result);
         DdlPreparedPack.getInPackList(roleIds, "roleCode", result);
         getStringBuilderPack(dataAuth, result);
         return result;
@@ -1497,14 +1526,13 @@ 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;
@@ -1512,14 +1540,13 @@ 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);
@@ -1538,7 +1565,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
@@ -1551,7 +1578,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;
                 }
@@ -1745,7 +1772,7 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue(),
                 WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue()}, "orderStatus", result);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result);
+        DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result);
 
         getStringBuilderPack(wmsCSOrderMaster, result);
@@ -1806,7 +1833,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);
 
@@ -1820,7 +1847,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;
@@ -1894,7 +1921,6 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsVendorPart, result);
         return result;
     }
-
     /**
      * 主数据信息 分页查询
      *
@@ -1906,8 +1932,8 @@ public class WmsHqlPack {
         //查询参数封装
         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;
     }
@@ -2009,11 +2035,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();
 
         //查询参数封装