3D可视化仓库

5 years ago · 7f161e3bae
parent 709db0b573
commit 7f161e3bae
10 changed files with 332 additions and 14 deletions
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCsStatusModel.java
+++ b/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;
+}
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsThreeDimenZoneModel.java
+++ b/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;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java
+++ b/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();
+    }
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java
+++ b/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;
+    }
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java
+++ b/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();
+    }
+
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
+++ b/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();
+    }
+
+
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
+++ b/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();
+    }
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFurnitureRepository.java
+++ b/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> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFurnitureTypeRepository.java
+++ b/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> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/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);