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

# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProdCfgTypeRepository.java

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

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

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

@@ -1,10 +1,17 @@
 package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WareHouse;
 import cn.estsh.i3plus.pojo.wms.bean.WmsProdCfgType;
+import org.springframework.stereotype.Repository;
 
 /**
- * Created by Administrator on 2019/6/18.
- */
+ * @Description : 对象持久层仓用方法控制
+ * @Reference :
+ * @Author : sky.meng
+ * @CreateDate : 2018-11-06 9:47
+ * @Modify:
+ **/
+@Repository
 public interface WmsProdCfgTypeRepository extends BaseRepository<WmsProdCfgType, Long> {
 }

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

@@ -858,7 +858,57 @@ public class WmsHqlPack {
 
         return result;
     }
+    /**
+     * 业务：库存表报查询封装
+     *
+     * @param wmsStockQuan
+     * @return
+     */
+    public static String packWmsStoreQuanForReport(WmsStockQuan wmsStockQuan) {
+
+        StringBuffer findWhere = new StringBuffer();
+        HqlPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", findWhere);
+        HqlPack.getStringEqualPack(wmsStockQuan.getProdCfgTypeCode(), "prodCfgTypeCode", findWhere);
+        HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", findWhere);
+        if(wmsStockQuan.getZoneNo() != null){
+            HqlPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsStockQuan.getZoneNo().split(","))),","),"",findWhere);
+            //DdlPreparedPack.getInPackArray(wmsStockQuan.getZoneNo().split(","), "zoneNo", result);
+        }
+        if(wmsStockQuan.getPartNo() != null){
+            HqlPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsStockQuan.getPartNo().split(","))),","),"partNo",findWhere);
+        }
+        if(!wmsStockQuan.getIncludeZeroStock()){
+            //含0库存显示，默认为否
+            //自定义条件，各汇总数量相加。为否时添加>0的条件判断
+            findWhere.append("  and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 ");
+        }
+        return findWhere.toString();
+    }
+
+    public static DdlPackBean packWmsStoreQuanForReport1(WmsStockQuan wmsStockQuan) {
 
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getProdCfgTypeCode(), "prodCfgTypeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
+
+        if(wmsStockQuan.getZoneNo() != null){
+            DdlPreparedPack.getInPackList(Arrays.asList(wmsStockQuan.getZoneNo().split(",")), "zoneNo", result);
+        }
+        if(wmsStockQuan.getPartNo() != null){
+            DdlPreparedPack.getInPackList(Arrays.asList(wmsStockQuan.getPartNo().split(",")), "partNo", result);
+        }
+        if(!wmsStockQuan.getIncludeZeroStock()){
+            //含0库存显示，默认为否
+            //自定义条件，各汇总数量相加。为否时添加>0的条件判断
+            result.setWhereAppend(result.getWhereAppend()+" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 ");
+        }
+
+        getStringBuilderPack(wmsStockQuan, result);
+
+        return result;
+    }
     /**
      * 业务：物料包装查询封装
      *
@@ -1694,6 +1744,41 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 库存条码 查询条件封装
+     *
+     * @param wmsStockSn
+     * @return
+     */
+    public static DdlPackBean packHqlWmsStockSnReport(WmsStockSn wmsStockSn) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
+        DdlPreparedPack.getStringNotNullPack("locateNo", result);
+        result.setWhereAppend(result.getWhereAppend()+" and locateNo != ''");
+
+        getStringBuilderPack(wmsStockSn, result);
+
+        return result;
+    }
+
+    public static DdlPackBean packWmsStoreQuanForLocateReport(WmsStockQuan wmsStockQuan) {
+
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result);
+        result.setWhereAppend(result.getWhereAppend()+" and (qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty) > 0 ");
+        getStringBuilderPack(wmsStockQuan, result);
+
+        return result;
+    }
+
 
     /**
      * 线边库物料信息 分页查询