Merge remote-tracking branch 'origin/dev' into test

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

@@ -0,0 +1,42 @@
+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 : 盘点调差范围信息
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-06-17 12:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_CS_ADJUST_RANGE")
+@Api("盘点调差范围信息")
+public class WmsCSAdjustRange extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public Integer item;
+
+    @Column(name="IS_ADJUST")
+    @ApiParam(value = "调整标识", example = "1")
+    public Integer isAdjust;
+}

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

@@ -82,6 +82,10 @@ public class WmsCSOrderMaster extends BaseBean {
     @ApiParam(value = "是否散件")
     private Integer isPart;
 
+    @Column(name = "YEAR")
+    @ApiParam("年度")
+    public String year;
+
     public Integer getIsInventoryVal() {
         return this.isInventory == null ? 0 :this.isInventory.intValue();
     }

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

@@ -0,0 +1,67 @@
+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 : 盘点范围信息
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-06-17 11:57
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_CS_RANGE")
+@Api("盘点范围信息")
+public class WmsCSRange extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name = "ITEM")
+    @ApiParam("行号")
+    public Integer item;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name = "ZONE_NO")
+    @ApiParam("存储区编号")
+    public String zoneNo;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam("库位编号")
+    public String locateNo;
+
+    @Column(name = "UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    public WmsCSRange(){}
+
+    public WmsCSRange(String zoneNo,String partNo,String partNameRdd){
+        this.zoneNo = zoneNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+    }
+
+}

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

@@ -47,7 +47,7 @@ public class WmsZones extends BaseBean {
     private String zoneName;
 
     @Column(name = "PARENT_ZONE_NO")
-    @ApiParam(value = "父级存储区", example ="1")
+    @ApiParam(value = "父级存储区", example ="-1")
     private String parentZoneNo;
 
     @Column(name = "IS_SON_NODE")

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsCSAdjustRange;
+
+/**
+ * @Description : 对象持久层仓用方法控制(盘点调差范围信息)
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-06-17 15:13
+ * @Modify:
+ **/
+public interface WmsCSAdjustRangeRepository extends BaseRepository<WmsCSAdjustRange, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsCSRange;
+
+/**
+ * @Description : 对象持久层仓用方法控制(盘点范围信息)
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-06-17 15:12
+ * @Modify:
+ **/
+public interface WmsCSRangeRepository extends BaseRepository<WmsCSRange, Long> {
+}

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

@@ -1402,32 +1402,31 @@ public class WmsHqlPack {
         entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey()));
 
         for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
+
             String key = map.getKey();
             List<WmsDataAuth> valueList = map.getValue();
             List<String> vList = valueList.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList());
             String data = String.join(",", vList);
+
             if (StringUtils.isNotBlank(data)) {
+
                 List<Map> mapList = JSONObject.parseArray(data, Map.class);
+
                 if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", key)) {
-                    for (Map whNoItem : mapList) {
+
-                        // 拼接仓库查询sql
+                    packMutilConditionHql(mapList, "WH_CODE", "destWhNo", result);
-                        DdlPreparedPack.getStringEqualPackOr(whNoItem.get("WH_CODE").toString(), "destWhNo", result);
+
-                    }
                 } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", key)) {
-                    for (Map locateNoItem : mapList) {
+
-                        // 拼接库位查询sql
+                    packMutilConditionHql(mapList, "LOCATE_NO", "destLocateNo", result);
-                        DdlPreparedPack.getStringEqualPackOr(locateNoItem.get("LOCATE_NO").toString(), "destLocateNo", result);
+
-                    }
                 } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", key)) {
-                    for (Map zoneNoItem : mapList) {
+
-                        // 拼接存储区查询sql
+                    packMutilConditionHql(mapList, "ZONE_CODE", "destZoneNo", result);
-                        DdlPreparedPack.getStringEqualPackOr(zoneNoItem.get("ZONE_CODE").toString(), "destZoneNo", result);
+
-                    }
                 } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) {
-                    for (Map partNoItem : mapList) {
+
-                        // 拼接物料查询sql
+                    packMutilConditionHql(mapList, "PART_NO", "partNo", result);
-                        DdlPreparedPack.getStringEqualPackOr(partNoItem.get("PART_NO").toString(), "partNo", result);
-                    }
                 }
             }
         }
@@ -1443,6 +1442,24 @@ 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) {
+        Integer index  = 1;
+
+        for (Map item : mapList) {
+            packBean.addColumnQuery(columnName," or model." +
+                            columnName + " = :m_" + columnName + (index++).toString(),
+                    item.get(keyName).toString());
+        }
+    }
+
+    /**
      * 给定字段动态in sql
      *
      * @param columnName
@@ -1722,4 +1739,25 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsVendorPart, result);
         return result;
     }
+
+
+    /**
+     * 盘点范围 条件封装
+     *
+     * @param wmsCSRange
+     * @return
+     */
+    public static DdlPackBean packHqlWmsCSRange(WmsCSRange wmsCSRange) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsCSRange.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsCSRange.getPartNo(), "partNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsCSRange.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result);
+
+        getStringBuilderPack(wmsCSRange, result);
+
+        return result;
+    }
+
 }