合并冲突

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

@@ -1264,6 +1264,46 @@ public class WmsEnumUtil {
         }
     }
 
+	/**
+	 * 盘点主表 单据类型
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+	public enum CS_STRATEGY_TYPE {
+		PART_COVERAGE(110, "物料分类覆盖"),
+		TOUCH(120, "动碰"),
+		ZORE_STOCK(130, "零库存");
+
+		private int value;
+		private String description;
+
+		CS_STRATEGY_TYPE(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;
+		}
+
+		public static String valueOfDescription(int val) {
+			return valueOf(val);
+		}
+	}
+
     /**
      * 盘点主表 单据类型
      */
@@ -1273,7 +1313,11 @@ public class WmsEnumUtil {
         MONTH_INVENTORY(20, "月度盘点"),
         SEASON_INVENTORY(30, "季度盘点"),
         YEAR_INVENTORY(40, "年度盘点"),
-        AJUST_INVENTORY(50, "库存调整盘点");
+        AJUST_INVENTORY(50, "库存调整盘点"),
+        PART_COVERAGE(110, "物料分类覆盖"),
+        TOUCH(120, "动碰"),
+        ZORE_STOCK(130, "零库存");
+
         private int value;
         private String description;
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -598,7 +598,7 @@ public class DdlPreparedPack {
      */
     public static void getNotInPackList(List<?> data, String columnName, DdlPackBean packBean) {
         if (data != null && data.size() > 0) {
-            packBean.addColumnQuery(columnName, " and model." + columnName + "not in (:m_" + columnName + ")", data);
+            packBean.addColumnQuery(columnName, " and model." + columnName + " not in (:m_" + columnName + ")", data);
         }
     }
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java

@@ -52,4 +52,12 @@ public class MesWorkCell extends BaseBean implements Serializable {
     @Column(name = "SEQ")
     @ApiParam("序号")
     private Integer seq;
+
+    @Column(name = "WORK_CELL_IP")
+    @ApiParam("工作单元IP")
+    private String workCellIp;
+
+    @Column(name = "WORK_CELL_PORT")
+    @ApiParam("工作单元端口")
+    private String workCellPort;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java

@@ -57,6 +57,14 @@ public class MesWorkCell extends BaseBean implements Serializable {
     @ApiParam("序号")
     private Integer seq;
 
+    @Column(name = "WORK_CELL_IP")
+    @ApiParam("工作单元IP")
+    private String workCellIp;
+
+    @Column(name = "WORK_CELL_PORT")
+    @ApiParam("工作单元端口")
+    private String workCellPort;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesEquipment> childTreeList;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PcsObserverStatusModel.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/2/21 17:20
+ * @desc
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("工位监控观察者对象")
+public class PcsObserverStatusModel {
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("运行状况")
+    private Boolean runningStatus;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCsStatusModel.java

@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsLocate;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 3D可视化仓库-盘点状况分布图交互数据模型
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/2/21 18:39
+ * @Modify
+ */
+@Data
+public class WmsCsStatusModel implements Serializable {
+    private static final long serialVersionUID = 1321068307797279909L;
+
+    private List<WmsLocate> noInventoryLocateList;
+
+    private List<WmsLocate> factTransLocateList;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsPoSnPrintModel.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 批量修改修改条码打印数量
+ * @author puxiao.liao
+ */
+@Data
+public class WmsPoSnPrintModel implements Serializable {
+
+    private static final long serialVersionUID = 5306382160072353831L;
+
+    @ApiParam("数量")
+    private Double qty;
+
+    @ApiParam("打印条码")
+    private List<WmsStockSn> wmsStockSnList;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsThreeDimenZoneModel.java

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsFurniture;
+import cn.estsh.i3plus.pojo.wms.bean.WmsLocate;
+import cn.estsh.i3plus.pojo.wms.bean.WmsZones;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 3D存储区MoDel
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2019/10/18 1:18
+ * @Modify
+ */
+@Data
+public class WmsThreeDimenZoneModel implements Serializable {
+    private static final long serialVersionUID = -5490167040159056107L;
+    private WmsZones wmsZones;
+    private List<WmsFurniture> furnitureList;
+    private List<WmsLocate> locateList;
+}

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

@@ -43,8 +43,29 @@ public class WareHouse extends BaseBean {
     @ApiParam("仓库地址")
     public String address;
 
+    @Column(name = "WH_LENGTH", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "长")
+    private Double whLength;
+
+    @Column(name = "WH_WIDTH", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "宽")
+    private Double whWidth;
+
+    @Column(name = "WH_HEIGHT", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "高")
+    private Double whHeight;
+
     @Transient
     @ApiParam(value ="存储区列表")
     private List<WmsZones> zoneList;
 
+    public double getWhLengthVal() {
+        return this.whLength == null ? 0 : this.whLength.doubleValue();
+    }
+    public double getWhWidthVal() {
+        return this.whWidth == null ? 0 : this.whWidth.doubleValue();
+    }
+    public double getWhHeightVal() {
+        return this.whHeight == null ? 0 : this.whHeight.doubleValue();
+    }
 }

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

@@ -103,6 +103,9 @@ public class WmsCSOrderMaster extends BaseBean {
     @Column(name = "is_obvious")
     private Integer isObvious;
 
+    @ApiParam(value = "允许盘入的库位")
+    @Column(name = "ALLOW_LOCATES")
+    private String allowLocates;
     public Integer getIsInventoryVal() {
         return this.isInventory == null ? 0 :this.isInventory.intValue();
     }

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

@@ -0,0 +1,89 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+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;
+import java.io.Serializable;
+
+/**
+ * @Description :盘点策略表
+ * @Reference :
+ * @Author :QianHuaSheng
+ * @CreateDate : 2020-02-17 10:13 上午
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_CS_STRATEGY", indexes = {
+})
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "盘点策略表", description = "盘点策略表")
+public class WmsCsStrategy extends BaseBean  implements Serializable {
+
+	private static final long serialVersionUID = -1692487594678973549L;
+
+	@Column(name = "STRATEGY_NAME")
+	@ApiParam(value = "策略名称")
+	private String strategyName;
+
+	@Column(name = "part_type")
+	@ApiParam(value = "物料分类")
+	private String partType;
+
+	@Column(name = "STRATEGY_TYPE")
+	@ApiParam(value = "策略分类", example = "0")
+	@AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class, refForeignKey = "value", value = "description")
+	private Integer strategyType;
+
+	@Column(name = "CYCLE_RULE")
+	@ApiParam(value = "循环规则")
+	private String cycleRule;
+
+	@Column(name = "START_DATE")
+	@ApiParam(value = "开始日期", example = "0")
+	private String startDate;
+
+	@Column(name = "END_DATE")
+	@ApiParam(value = "结束日期", example = "0")
+	private String endDate;
+
+	@Column(name = "NUM_MAX")
+	@ApiParam(value = "明细数量上限")
+	private Integer numMax;
+
+	@Column(name = "COVERAGE_RATE")
+	@ApiParam(value = "抽盘覆盖率")
+	private Double coverageRate;
+
+	@Column(name = "ZONE_NOS")
+	@ApiParam(value = "存储区")
+	private String zoneNos;
+
+	@Column(name = "LOCATES")
+	@ApiParam(value = "盘点库位")
+	private String locates;
+
+	@Column(name = "last_run_time")
+	@ApiParam(value = "上次运行时间")
+	private String lastRunTime;
+
+	@Column(name = "next_run_time")
+	@ApiParam(value = "下次运行时间")
+	private String nextRunTime;
+
+	@Column(name = "REMAKE")
+	@ApiParam(value = "备注")
+	private String remake;
+}

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

@@ -0,0 +1,55 @@
+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 dragon
+ * @CreateDate 2020/2/20 10:42
+ * @Modify
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_FURNITURE")
+@Api("家具表")
+public class WmsFurniture extends BaseBean {
+    private static final long serialVersionUID = -8428899843794155828L;
+
+    @Column(name = "WH_NO")
+    @ApiParam(value = "仓库代码")
+    private String whNo;
+
+    @Column(name = "ZONE_NO")
+    @ApiParam(value = "存储区代码")
+    private String zoneNo;
+
+    @Column(name = "TYPE_CODE")
+    @ApiParam(value = "家具类型编号")
+    private String typeCode;
+
+    @Column(name = "FURNITURE_NO")
+    @ApiParam(value = "家具代码")
+    private String furnitureNo;
+
+    @Column(name = "IS_SAVE_GOODS")
+    @ApiParam(value = "是否储物")
+    private Integer isSaveGoods;
+
+    public int getIsSaveGoodsVal() {
+        return this.isSaveGoods == null ? 0 : this.isSaveGoods;
+    }
+}

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

@@ -0,0 +1,74 @@
+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 dragon
+ * @CreateDate 2020/2/20 10:42
+ * @Modify
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_FURNITURE_TYPE")
+@Api("家具类型表")
+public class WmsFurnitureType extends BaseBean {
+    private static final long serialVersionUID = 3573734032905328327L;
+
+    @Column(name = "TYPE_CODE")
+    @ApiParam(value = "类型编号")
+    private String typeCode;
+
+    @Column(name = "TYPE_NAME")
+    @ApiParam(value = "类型名称")
+    private String typeName;
+
+    @Column(name = "FNT_LENGTH", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "长")
+    private Double fntLength;
+
+    @Column(name = "FNT_WIDTH", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "宽")
+    private Double fntWidth;
+
+    @Column(name = "FNT_HEIGHT", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "高")
+    private Double fntHeight;
+
+    @Column(name = "STOREY")
+    @ApiParam(value = "层")
+    private Integer storey;
+
+    @Column(name = "FNT_COL")
+    @ApiParam(value = "列")
+    private Integer fntCol;
+
+    @Column(name = "IS_SAVE_GOODS")
+    @ApiParam(value = "是否储物")
+    private Integer isSaveGoods;
+
+    public Double getFntLengthVal() {
+        return this.fntLength == null ? 0 : this.fntLength.doubleValue();
+    }
+    public Double getFntWidthVal() {
+        return this.fntWidth == null ? 0 : this.fntWidth.doubleValue();
+    }
+    public Double getFntHeightVal() {
+        return this.fntHeight == null ? 0 : this.fntHeight.doubleValue();
+    }
+
+}

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

@@ -53,6 +53,10 @@ public class WmsLocate extends BaseBean {
     @ApiParam(value = "存储区代码")
     private String zoneNo;
 
+    @Column(name = "FURNITURE_NO")
+    @ApiParam(value = "家具代码")
+    private String furnitureNo;
+
     @Column(name = "X")
     @ApiParam(value = "X", example = "-1")
     private Integer x;
@@ -65,6 +69,18 @@ public class WmsLocate extends BaseBean {
     @ApiParam(value = "Z", example = "-1")
     private Integer z;
 
+    @Column(name = "LC_LENGTH", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "长")
+    private Double lcLength;
+
+    @Column(name = "LC_WIDTH", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "宽")
+    private Double lcWidth;
+
+    @Column(name = "LC_HEIGHT", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "高")
+    private Double lcHeight;
+
     @Column(name = "SEQ")
     @ApiParam(value = "序号", example = "-1")
     private Integer seq;
@@ -126,6 +142,18 @@ public class WmsLocate extends BaseBean {
     @ApiParam(value = "末次盘点结束时间")
     private String lastCsTimeEnd;
 
+    @Transient
+    @ApiParam(value = "库位数组集")
+    private String[] locateNoArr;
+
+    @Transient
+    @ApiParam(value = "移动频次")
+    private Integer frequency;
+
+    @Transient
+    @ApiParam(value = "库龄")
+    private String age;
+
     public WmsLocate() {
     }
 
@@ -139,6 +167,33 @@ public class WmsLocate extends BaseBean {
         this.partQty=partQty;
         this.locateNo=locateNo;
     }
+    public WmsLocate(String locateNo,Integer frequency,String organizeCode,
+                     String whNo,String zoneNo,String furnitureNo,
+                     Integer x,Integer y,Integer z){
+        this.locateNo=locateNo;
+        this.frequency=frequency;
+        this.organizeCode=organizeCode;
+        this.whNo=whNo;
+        this.zoneNo=zoneNo;
+        this.furnitureNo=furnitureNo;
+        this.x=x;
+        this.y=y;
+        this.z=z;
+    }
+    public WmsLocate(String locateNo,String age,String organizeCode,
+                     String whNo,String zoneNo,String furnitureNo,
+                     Integer x,Integer y,Integer z){
+        this.locateNo=locateNo;
+        this.age=age;
+        this.organizeCode=organizeCode;
+        this.whNo=whNo;
+        this.zoneNo=zoneNo;
+        this.furnitureNo=furnitureNo;
+        this.x=x;
+        this.y=y;
+        this.z=z;
+    }
+
     public Integer getMaxPackageQty() {
         return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue();
     }
@@ -158,4 +213,20 @@ public class WmsLocate extends BaseBean {
     public Integer getLocateType() {
         return this.locateType== null ? 0 : this.locateType.intValue();
     }
+
+    public Double getLcLengthVal() {
+        return this.lcLength == null ? 0 : this.lcLength.doubleValue();
+    }
+    public Double getLcWidthVal() {
+        return this.lcWidth == null ? 0 : this.lcWidth.doubleValue();
+    }
+    public Double getLcHeightVal() {
+        return this.lcHeight == null ? 0 : this.lcHeight.doubleValue();
+    }
+
+    public Integer getFrequencyVal() {
+        return this.frequency == null ? 0 : this.frequency.intValue();
+    }
+
+
 }

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

@@ -291,6 +291,10 @@ public class WmsStockSn extends BaseBean {
     private Integer isSameBatch;
 
     @Transient
+    @ApiParam("父层级packcode对应的可回用零件号")
+    private String parentReturnPart;
+
+    @Transient
     @ApiParam(value = "预计完成时间")
     private String planCompleteTime;
 

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

@@ -23,11 +23,11 @@ import java.util.List;
  **/
 @Data
 @Entity
-@Table(name="WMS_ZONES")
+@Table(name = "WMS_ZONES")
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Api(value="存储区信息表",description = "存储区信息表")
+@Api(value = "存储区信息表", description = "存储区信息表")
 public class WmsZones extends BaseBean {
 
     private static final long serialVersionUID = 7759454799191378612L;
@@ -48,7 +48,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")
@@ -56,23 +56,23 @@ public class WmsZones extends BaseBean {
     private Integer isSonNode;
 
     @Column(name = "IS_PM")
-    @ApiParam(value = "零件级管控" , example = "2")
+    @ApiParam(value = "零件级管控", example = "2")
     private Integer isPm;
 
     @Column(name = "IS_LM")
-    @ApiParam(value = "批次级管控" , example = "2")
+    @ApiParam(value = "批次级管控", example = "2")
     private Integer isLm;
 
     @Column(name = "IS_SN")
-    @ApiParam(value = "条码级管控" , example = "1")
+    @ApiParam(value = "条码级管控", example = "1")
     private Integer isSn;
 
     @Column(name = "IS_MIX")
-    @ApiParam(value = "允许混淆" , example = "1")
+    @ApiParam(value = "允许混淆", example = "1")
     private Integer isMix;
 
     @Column(name = "IS_SC")
-    @ApiParam(value = "库容检查" , example = "1")
+    @ApiParam(value = "库容检查", example = "1")
     private Integer isSc;
 
     @Column(name = "STRATEGY")
@@ -80,26 +80,41 @@ public class WmsZones extends BaseBean {
     private String strategy;
 
     @Column(name = "IS_NEGATIVE")
-    @ApiParam(value = "允许负库存" , example = "1")
+    @ApiParam(value = "允许负库存", example = "1")
     private Integer isNegative;
 
     @Column(name = "CHECK_FIFO")
-    @ApiParam(value = "校验先进先出" , example = "1")
+    @ApiParam(value = "校验先进先出", example = "1")
     private Integer checkFifo;
 
+    @Column(name = "ZONE_LENGTH", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "长")
+    private Double zoneLength;
+
+    @Column(name = "ZONE_WIDTH", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "宽")
+    private Double zoneWidth;
+
     @Transient
-    @ApiParam(value ="子存储区列表")
+    @ApiParam(value = "子存储区列表")
     private List<WmsZones> childList;
 
-    public WmsZones(String zoneNo){
+    public WmsZones(String zoneNo) {
         this.zoneNo = zoneNo;
     }
 
-    public WmsZones(String zoneNo,String areaNo){
+    public WmsZones(String zoneNo, String areaNo) {
         this.zoneNo = zoneNo;
         this.areaNo = areaNo;
     }
 
-    public WmsZones(){}
+    public WmsZones() {
+    }
 
+    public double getZoneLengthVal() {
+        return this.zoneLength == null ? 0 : this.zoneLength.doubleValue();
+    }
+    public double getZoneWidthVal() {
+        return this.zoneWidth == null ? 0 : this.zoneWidth.doubleValue();
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCsStrategyRepository.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.WmsCsStrategy;
+
+/**
+* @Description : 盘点策略表
+* @Reference :
+* @Author :QianHuaSheng
+* @CreateDate : 2018-11-17 15:53
+* @Modify:
+**/
+public interface WmsCsStrategyRepository extends BaseRepository<WmsCsStrategy, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsFurniture;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description 家具对象DAO层
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/2/20 10:56
+ * @Modify
+ */
+@Repository
+public interface WmsFurnitureRepository extends BaseRepository<WmsFurniture, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsFurnitureType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description 家具类型对象DAO层
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/2/20 10:56
+ * @Modify
+ */
+@Repository
+public interface WmsFurnitureTypeRepository extends BaseRepository<WmsFurnitureType, Long> {
+}

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

@@ -543,6 +543,9 @@ public class WmsHqlPack {
         if (wmsLocate.getZoneNo() != null) {
             DdlPreparedPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "", result);
         }
+        if (wmsLocate.getLocateNoArr() != null) {
+            DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "", result);
+        }
 
         // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result);
         DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result);