动态查询：解决了BUG#7658,7660,7661,7663,7664

3D仓库：联调优化逻辑

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

@@ -0,0 +1,25 @@
+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 更改三维坐标MoDel
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/3/6 17:57
+ * @Modify
+ */
+@Data
+public class WmsTdChangeModel implements Serializable {
+    private static final long serialVersionUID = -2682858106052506217L;
+
+    private List<WmsZones> wmsZonesList;
+    private List<WmsFurniture> wmsFurnitureList;
+    private List<WmsLocate> wmsLocateList;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.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 家具实体
@@ -49,7 +50,35 @@ public class WmsFurniture extends BaseBean {
     @ApiParam(value = "是否储物")
     private Integer isSaveGoods;
 
+    @Column(name = "POSITION")
+    @ApiParam(value = "三维位置")
+    private String position;
+
+    @Transient
+    @ApiParam(value = "层")
+    private Integer storey;
+
+    @Transient
+    @ApiParam(value = "列")
+    private Integer fntCol;
+
+
     public int getIsSaveGoodsVal() {
         return this.isSaveGoods == null ? 0 : this.isSaveGoods;
     }
+
+    public WmsFurniture() {
+    }
+
+    public WmsFurniture(String whNo, String zoneNo, String typeCode, String furnitureNo,
+                        Integer isSaveGoods, String position, Integer storey, Integer fntCol) {
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.typeCode = typeCode;
+        this.furnitureNo = furnitureNo;
+        this.isSaveGoods = isSaveGoods;
+        this.position = position;
+        this.storey = storey;
+        this.fntCol = fntCol;
+    }
 }

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

@@ -47,7 +47,7 @@ public class WmsLocate extends BaseBean {
      */
     @Column(name = "LOCATE_TYPE")
     @ApiParam(value = "库位类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, entityName = "LOCATE_TYPE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "LOCATE_TYPE")
     private Integer locateType;
 
     @Column(name = "WH_NO")
@@ -147,6 +147,10 @@ public class WmsLocate extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     private String lastCsTime;
 
+    @Column(name = "POSITION")
+    @ApiParam(value = "三维位置")
+    private String position;
+
     // 导入用
     @ApiParam(value = "工厂")
     @Transient
@@ -254,5 +258,15 @@ public class WmsLocate extends BaseBean {
         return this.frequency == null ? 0 : this.frequency.intValue();
     }
 
+    public Integer getXVal() {
+        return this.x == null ? 0 : this.x.intValue();
+    }
+    public Integer getYVal() {
+        return this.y == null ? 0 : this.y.intValue();
+    }
+    public Integer getZVal() {
+        return this.z == null ? 0 : this.z.intValue();
+    }
+
 
 }

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

@@ -113,6 +113,10 @@ public class WmsZones extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double zoneWidth;
 
+    @Column(name = "POSITION")
+    @ApiParam(value = "三维位置")
+    private String position;
+
     @Transient
     @ApiParam(value = "子存储区列表")
     private List<WmsZones> childList;

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

@@ -541,7 +541,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
         DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result);
         if (wmsLocate.getZoneNo() != null) {
-            DdlPreparedPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "", result);
+            DdlPreparedPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "zoneNo", result);
         }
         if (wmsLocate.getLocateNoArr() != null) {
             DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "", result);