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

@@ -1888,7 +1888,7 @@ public class WmsEnumUtil {
         STEP_SEQ("STEP_SEQ", "步骤调用序号"),
         MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"),
         QC_ORDER_NO("QC_ORDER_NO", "质检单单号"),
-        ORDER_NO("ORDER_NO", "盘点主表序号");
+        CHECK_ORDER_NO("CHECK_ORDER_NO", "盘点主表序号");
 
         private String code;
         private String description;

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

@@ -86,8 +86,7 @@ public class WmsCSOrderDetails extends BaseBean {
     public Integer snStatus;
 
     /**
-     * 处理状态:1=已创建,5=已盘,10=已冻结
+     * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结
-     * ,20=已解冻,30=取消冻结
      */
     @Column(name = "TRANS_STATUS")
     @ApiParam(value = "处理状态", example = "1")

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

@@ -65,4 +65,16 @@ public class WmsCSOrderMaster extends BaseBean {
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
     public Integer isTask;
+
+    @Transient
+    @ApiParam(value = "盘点物料清单")
+    public List<WmsCSPart> wmsCSPartList;
+
+    @Transient
+    @ApiParam(value = "盘点存储区清单")
+    public List<WmsCSZone> wmsCSZoneList;
+
+    @Transient
+    @ApiParam(value = "盘点库位清单")
+    public List<WmsCSLocate> wmsCSLocateList;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.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,8 @@ public class WmsCSZone extends BaseBean {
     @Column(name="ZONE_NO")
     @ApiParam("存储区代码")
     public String zoneNo;
+
+    @Transient
+    @ApiParam("库位代码")
+    public String locateNo;
 }

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

@@ -24,6 +24,12 @@ import java.util.stream.Collectors;
  **/
 public class WmsHqlPack {
 
+    public static String packInParams(String colnumName,String[] params){
+        StringBuffer sb = new StringBuffer();
+        HqlPack.getInPackString(String.join(",", params),colnumName,sb);
+        return sb.toString();
+    }
+
     /**
      * 封装公用查询参数
      * @param bean 实体对象
@@ -188,7 +194,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
-        HqlPack.getStringLikerPack(wmsPart.getPartName(), "partNameRdd", result);
+        HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
         HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
         HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);