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

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,21 @@ public class WmsActionResponseBean<Obj> implements Serializable {
 
     @ApiParam("列表信息")
     public List<String> informations;
+    public void setInformation(List<String> list){
+        if(list == null){
+            list = new ArrayList<>();
+        }
+        informations = list;
+    }
 
     @ApiParam("可选项")
     public List<WmsOptionModel> 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/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 : 库存条码信息
@@ -210,6 +211,14 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "条码数量总和")
     public Long snCount;
 
+    @Transient
+    @ApiParam(value = "物料编码集合")
+    public List<String> partNoList;
+
+    @Transient
+    @ApiParam(value = "ERP库存地集合")
+    public List<String> erpZoneNoList;
+
     public WmsStockSn(){}
 
 

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

@@ -1108,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
@@ -1936,10 +1964,10 @@ public class WmsHqlPack {
      * @param wmsPart
      * @return
      */
-    public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,List<WmsStockSn> partNoList) {
+    public static DdlPackBean packHqlWmsPartByList(WmsPart wmsPart,String[] parts) {
 
         DdlPackBean packBean = new DdlPackBean();
-        DdlPreparedPack.getInPackList(partNoList.stream().map(part -> part.getPartNo()).collect(Collectors.toList()),"partNo",packBean);
+        DdlPreparedPack.getInPackArray(parts,"partNo",packBean);
         DdlPreparedPack.getStringEqualPack(wmsPart.getOrganizeCode(),"organizeCode",packBean);
         getStringBuilderPack(wmsPart, packBean);