Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-andon/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-aps/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -17,7 +17,8 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_ACTION_MODULE {
-        WORK_ORDER_LANDED(10, "生产工单下达");
+        WORK_ORDER_LANDED(10, "生产工单下达"),
+        QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达");
 
         private int value;
         private String description;
@@ -2915,7 +2916,9 @@ public class MesEnumUtil {
         STANDARD_ORDER(10, "标准工单"),
         BTS_ORDER(20, "BTS工单"),
         ATTEMPT_ORDER(30, "试制工单"),
-        BH_ORDER(40, "B&H工单");
+        BH_ORDER(40, "B&H工单"),
+        JIT_ORDER(50, "JIT工单"),
+        STOCK_ORDER(60, "库存工单");
 
         private int value;
         private String description;
@@ -4068,7 +4071,7 @@ public class MesEnumUtil {
      * 客户JIT生产队列状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_QUEUE_JIT_ACTUAL_STATUS {
+    public enum QUEUE_JIT_ACTUAL_STATUS {
         CREATE(10, "创建"),
         LANDED(20, "下达"),
         CANCEL(30, "取消");
@@ -4076,7 +4079,7 @@ public class MesEnumUtil {
         private int value;
         private String description;
 
-        MES_QUEUE_JIT_ACTUAL_STATUS(int value, String description) {
+        QUEUE_JIT_ACTUAL_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -4104,14 +4107,120 @@ public class MesEnumUtil {
      * 客户JIT生产队列特殊标识
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
+    public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
         NORMAL(10, "正常"),
         EMPTYING(20, "放空");
 
         private int value;
         private String description;
 
-        MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG(int value, String description) {
+        QUEUE_JIT_ACTUAL_SPECIAL_FLAG(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * JIS发运队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIS_STATUS {
+        CREATE(10, "创建"),
+        LANDED(20, "下达"),
+        SHIPMENT(30, "已发运");
+
+        private int value;
+        private String description;
+
+        QUEUE_JIS_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 生产队列 队列类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_ORDER_QUEUE_TYPE {
+        PRODUCT_QUEUE(10, "生产队列"),
+        PRELOAD_QUEUE(20, "预装队列");
+
+        private int value;
+        private String description;
+
+        QUEUE_ORDER_QUEUE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * JIS发运队列明细 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIS_DETAIL_STATUS {
+        CREATE(10, "创建"),
+        SHIPMENT(20, "已发运");
+
+        private int value;
+        private String description;
+
+        QUEUE_JIS_DETAIL_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -1551,13 +1551,20 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlWhereByClear(DdlPackBean packBean, String dateTime) {
+        LOGGER.info("ptl_pcn数据清除查询");
         StringBuffer queryString = new StringBuffer();
-        queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 and model.createDatetime <= " + dateTime + " ");
+        queryString.append("select model from " + persistentClass.getSimpleName()
+                + " as model where 1=1 and model.createDatetime <= " + "'" + dateTime + "'" + " ");
 
         if (packBean != null) {
             queryString.append(packBean.getWhereAppend());
         }
 
-        return entityManager.createQuery(queryString.toString()).getResultList();
+        Query query = entityManager.createQuery(queryString.toString());
+        for (String key : packBean.getHqlPreparedMap().keySet()) {
+            query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
+        }
+
+        return query.getResultList();
     }
 }

modules/i3plus-pojo-form/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java

@@ -112,6 +112,14 @@ public class BfDataObjectProperty extends BaseBean {
     }
 
     @Transient
+    @ApiParam(value ="是否为数据有效字段")
+    private transient Integer isValidProperty;
+
+    @Transient
+    @ApiParam(value ="是否为弱删除字段")
+    private transient Integer isDeleteWeaklyProperty;
+
+    @Transient
     @ApiParam(value ="元素值")
     private transient Object propertyFormValue;
 

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java

@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
-import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -79,6 +78,22 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否删除")
     private Integer isObjectDel;
 
+    @Column(name = "IS_OBJECT_DEL_WEAK")
+    @ApiParam(value = "是否弱删除")
+    private Integer isObjectDelWeak;
+
+    @Column(name = "ELEMENT_DEL_WEAK_ATTR_ID")
+    @ApiParam(value = "元素弱删除属性id")
+    private Long elementDelWeakAttrId;
+
+    @Column(name = "IS_OBJECT_VALID")
+    @ApiParam(value = "是否有效")
+    private Integer isObjectValid;
+
+    @Column(name = "ELEMENT_VALID_ATTR_ID")
+    @ApiParam(value = "元素有效属性id")
+    private Long elementValidAttrId;
+
     @Column(name = "IS_OBJECT_EXPORT")
     @ApiParam(value = "是否导出")
     private Integer isObjectExport;

modules/i3plus-pojo-hardswitch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-jobflow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-lac/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mes/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/3/11 8:59 上午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROD_SCATTER_DETAIL")
+@Api("MES_散件产品配置关系")
+public class MesProdScatterDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3602480079910597288L;
+
+    @Column(name = "SP_CFG_CODE")
+    @ApiParam("散件配置编码")
+    private String spCfgCode;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("散件产品代码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("散件产品名称")
+    private String partName;
+}

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

@@ -14,7 +14,7 @@ import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
- * @Description :MES_QUEUE_JIT_ACTUAL_DETAIL
+ * @Description :
  * @Reference :
  * @Author : joke
  * @CreateDate : 2020-03-06 10:16 上午

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

@@ -64,6 +64,14 @@ public class MesQueueJis extends BaseBean implements Serializable {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户产线代码")
+    private String custPlantCode;
+
     @Transient
     @ApiParam("颜色")
     private String color;

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

@@ -59,4 +59,12 @@ public class MesQueueJisDetail extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String serialNumber;
 
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
 }

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

@@ -88,4 +88,16 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("客户需求结束时间")
     private String custPointEndDate;
 
+    @Transient
+    @ApiParam("产品配置名称")
+    private String prodCfgName;
+
+    @Transient
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @Transient
+    @ApiParam("特殊标识名称")
+    private String specialFlagName;
+
 }

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

@@ -31,9 +31,9 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 1442091799346314190L;
 
-    @Column(name = "QGR_CODE")
-    @ApiParam("分组规则代码")
-    private String qgrCode;
+    @Column(name = "JIS_ACTUAL_NO")
+    @ApiParam("队列编号")
+    private String jisActualNo;
 
     @Column(name = "PROD_CFG_CODE")
     @ApiParam("配置代码")

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

@@ -72,6 +72,26 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("区域代码")
     private String areaCode;
 
+    @Column(name = "IS_LOCK")
+    @ApiParam("锁定标识")
+    private Integer isLock;
+
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "WORK_TYPE")
+    @ApiParam("区域代码")
+    private String workType;
+
+    @Column(name = "QUEUE_TYPE")
+    @ApiParam("队列类型")
+    private Integer queueType;
+
+    @Column(name = "PG_CODE")
+    @ApiParam("生产组代码")
+    private String pgCode;
+
     @Transient
     @ApiParam("起始车号")
     private String custFlagNoStart;

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

@@ -72,11 +72,17 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品类型名称")
     private String produceCategoryNameRdd;
 
-    @Column(name = "产品生产类型")
+@Column(name = "产品生产类型")
     @ApiParam("产品类型名称")
     private String pptCode;
 
-    @Transient
+   @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("组内编号")
+    private Integer groupNo;    @Transient
     @ApiParam("队列序号")
     private Double queueSeq;
 

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

@@ -26,6 +26,9 @@ public class MesButtonFlagModel implements Serializable {
     @ApiParam("按配置修改按钮")
     private boolean updateButtonConfig;
 
+    @ApiParam("按散件修改按钮")
+    private boolean updateButtonScatter;
+
     @ApiParam("下达按钮")
     private boolean transmitButton;
 

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -79,6 +80,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步列表")
     private List<StepModel> stepList;
 
+    @ApiParam("生产主队列编号")
+    private String orderNo;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProdScatterDetail;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/3/11 9:16 上午
+ * @Modify:
+ */
+public interface MesProdScatterDetailRepository extends BaseRepository<MesProdScatterDetail, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -226,15 +226,28 @@ public class MesHqlPack {
             DdlPreparedPack.getNumEqualPack(mesQueueOrder.getIsValid(), "isValid", packBean);
         }
 
+        if (!StringUtils.isEmpty(mesQueueOrder.getWorkType())) {
+            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getWorkType(), "workType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) {
+            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) {
+            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getPgCode(), "pgCode", packBean);
+        }
+        if (mesQueueOrder.getQueueType() != null) {
+            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getQueueType(), "queueType", packBean);
+        }
+
         // 只查询创建状态的队列
         DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean);
 
-        // 时间段查询
-        DdlPreparedPack.timeBuilder(
-                mesQueueOrder.getCreateDateTimeStart(),
-                mesQueueOrder.getCreateDateTimeEnd(),
-                "createDatetime", packBean, true);
-
+        if (!StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesQueueOrder.getCreateDateTimeStart(),
+                    mesQueueOrder.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
         // DdlPreparedPack.getOrderDefault(mesQueueOrder);
         return packBean;
     }

modules/i3plus-pojo-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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-platform/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-ptl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-report/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-softswitch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-sweb/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-wms/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -28,52 +28,63 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_WAREHOUSE")
+@Table(name = "WMS_WAREHOUSE")
 @Api("工厂仓库信息")
 public class WareHouse extends BaseBean {
 
     private static final long serialVersionUID = 7914396535326597148L;
-    @Column(name="CODE")
+    @Column(name = "CODE")
     @ApiParam("仓库代码")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     public String code;
 
-    @Column(name="NAME")
+    @Column(name = "NAME")
     @ApiParam("仓库名称")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     public String name;
 
-    @Column(name="ADDRESS")
+    @Column(name = "ADDRESS")
     @ApiParam("仓库地址")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     public String address;
 
-    @Column(name = "WH_LENGTH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value = "长")
+    @Column(name = "WH_LENGTH")
+    @ApiParam(value = "长(单位：全局设置参数中的基本单元)")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double whLength;
+    private Integer whLength;
 
-    @Column(name = "WH_WIDTH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value = "宽")
+    @Column(name = "WH_WIDTH")
+    @ApiParam(value = "宽(单位：全局设置参数中的基本单元)")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double whWidth;
+    private Integer whWidth;
 
-    @Column(name = "WH_HEIGHT", columnDefinition = "decimal(18,8)")
-    @ApiParam(value = "高")
+    @Column(name = "WH_HEIGHT")
+    @ApiParam(value = "高(单位：全局设置参数中的基本单元)")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double whHeight;
+    private Integer whHeight;
+
+    @Column(name = "BASE_UNIT", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "基本单元（米）")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    private Double baseUnit;
 
     @Transient
-    @ApiParam(value ="存储区列表")
+    @ApiParam(value = "存储区列表")
     private List<WmsZones> zoneList;
 
-    public double getWhLengthVal() {
-        return this.whLength == null ? 0 : this.whLength.doubleValue();
+    public Integer getWhLengthVal() {
+        return this.whLength == null ? 0 : this.whLength.intValue();
+    }
+
+    public Integer getWhWidthVal() {
+        return this.whWidth == null ? 0 : this.whWidth.intValue();
     }
-    public double getWhWidthVal() {
-        return this.whWidth == null ? 0 : this.whWidth.doubleValue();
+
+    public Integer getWhHeightVal() {
+        return this.whHeight == null ? 0 : this.whHeight.intValue();
     }
-    public double getWhHeightVal() {
-        return this.whHeight == null ? 0 : this.whHeight.doubleValue();
+
+    public Double getBaseUnitVal() {
+        return this.baseUnit == null ? 0 : this.baseUnit.doubleValue();
     }
 }

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

@@ -92,10 +92,18 @@ public class WmsCSOrderMaster extends BaseBean {
     public String[] wmsCSParts;
 
     @Transient
+    @ApiParam(value = "盘点物料清单")
+    public String wmsCSPartsStr;
+
+    @Transient
     @ApiParam(value = "盘点存储区清单")
     public String[] wmsCSZones;
 
     @Transient
+    @ApiParam(value = "盘点存储区清单")
+    public String wmsCSZonesStr;
+
+    @Transient
     @ApiParam(value = "盘点库位清单")
     public String[] wmsCSLocates;
 

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

@@ -127,6 +127,11 @@ public class WmsDocMovementSn extends BaseBean {
     @ApiParam("父层级packcode对应的可回用零件号")
     private String parentReturnPart;
 
+
+    @Transient
+    @ApiParam("打印模板")
+    private String templateNo;
+
     @Transient
     @ApiParam("剩余箱数量")
     private Long countBox;

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;
 
-    public int getIsSaveGoodsVal() {
+    @Column(name = "POSITION")
+    @ApiParam(value = "三维位置")
+    private String position;
+
+    @Transient
+    @ApiParam(value = "层")
+    private Integer storey;
+
+    @Transient
+    @ApiParam(value = "列")
+    private Integer fntCol;
+
+    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;
+    }
+
+    public Integer getIsSaveGoodsVal() {
         return this.isSaveGoods == null ? 0 : this.isSaveGoods;
     }
+
 }

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

@@ -37,17 +37,17 @@ public class WmsFurnitureType extends BaseBean {
     @ApiParam(value = "类型名称")
     private String typeName;
 
-    @Column(name = "FNT_LENGTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "FNT_LENGTH")
     @ApiParam(value = "长")
-    private Double fntLength;
+    private Integer fntLength;
 
-    @Column(name = "FNT_WIDTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "FNT_WIDTH")
     @ApiParam(value = "宽")
-    private Double fntWidth;
+    private Integer fntWidth;
 
-    @Column(name = "FNT_HEIGHT", columnDefinition = "decimal(18,8)")
+    @Column(name = "FNT_HEIGHT")
     @ApiParam(value = "高")
-    private Double fntHeight;
+    private Integer fntHeight;
 
     @Column(name = "STOREY")
     @ApiParam(value = "层")
@@ -61,14 +61,28 @@ public class WmsFurnitureType extends BaseBean {
     @ApiParam(value = "是否储物")
     private Integer isSaveGoods;
 
-    public Double getFntLengthVal() {
-        return this.fntLength == null ? 0 : this.fntLength.doubleValue();
+    public Integer getStoreyVal() {
+        return this.storey == null ? 0 : this.storey.intValue();
     }
-    public Double getFntWidthVal() {
-        return this.fntWidth == null ? 0 : this.fntWidth.doubleValue();
+
+    public Integer getFntColVal() {
+        return this.fntCol == null ? 0 : this.fntCol.intValue();
+    }
+
+    public Integer getFntLengthVal() {
+        return this.fntLength == null ? 0 : this.fntLength.intValue();
+    }
+
+    public Integer getFntWidthVal() {
+        return this.fntWidth == null ? 0 : this.fntWidth.intValue();
+    }
+
+    public Integer getFntHeightVal() {
+        return this.fntHeight == null ? 0 : this.fntHeight.intValue();
     }
-    public Double getFntHeightVal() {
-        return this.fntHeight == null ? 0 : this.fntHeight.doubleValue();
+
+    public Integer getIsSaveGoodsVal() {
+        return this.isSaveGoods == null ? 0 : this.isSaveGoods.intValue();
     }
 
 }

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")
@@ -82,20 +82,20 @@ public class WmsLocate extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer z;
 
-    @Column(name = "LC_LENGTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "LC_LENGTH")
     @ApiParam(value = "长")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
-    private Double lcLength;
+    private Integer lcLength;
 
-    @Column(name = "LC_WIDTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "LC_WIDTH")
     @ApiParam(value = "宽")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
-    private Double lcWidth;
+    private Integer lcWidth;
 
-    @Column(name = "LC_HEIGHT", columnDefinition = "decimal(18,8)")
+    @Column(name = "LC_HEIGHT")
     @ApiParam(value = "高")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
-    private Double lcHeight;
+    private Integer lcHeight;
 
     @Column(name = "SEQ")
     @ApiParam(value = "序号", example = "-1")
@@ -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
@@ -240,18 +244,28 @@ public class WmsLocate extends BaseBean {
         return this.locateType== null ? 0 : this.locateType.intValue();
     }
 
-    public Double getLcLengthVal() {
-        return this.lcLength == null ? 0 : this.lcLength.doubleValue();
+    public Integer getFrequencyVal() {
+        return this.frequency == null ? 0 : this.frequency.intValue();
+    }
+
+    public Integer getLcLengthVal() {
+        return this.lcLength == null ? 0 : this.lcLength.intValue();
     }
-    public Double getLcWidthVal() {
-        return this.lcWidth == null ? 0 : this.lcWidth.doubleValue();
+    public Integer getLcWidthVal() {
+        return this.lcWidth == null ? 0 : this.lcWidth.intValue();
     }
-    public Double getLcHeightVal() {
-        return this.lcHeight == null ? 0 : this.lcHeight.doubleValue();
+    public Integer getLcHeightVal() {
+        return this.lcHeight == null ? 0 : this.lcHeight.intValue();
     }
 
-    public Integer getFrequencyVal() {
-        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/WmsStockSn.java

@@ -310,6 +310,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "预计完成时间")
     private String planCompleteTime;
 
+    @Transient
+    @ApiParam(value = "集装箱号")
+    private String containerNo;
+
     public WmsStockSn() {
     }
 

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

@@ -103,15 +103,19 @@ public class WmsZones extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
     private Integer checkFifo;
 
-    @Column(name = "ZONE_LENGTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "ZONE_LENGTH")
     @ApiParam(value = "长")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double zoneLength;
+    private Integer zoneLength;
 
-    @Column(name = "ZONE_WIDTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "ZONE_WIDTH")
     @ApiParam(value = "宽")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double zoneWidth;
+    private Integer zoneWidth;
+
+    @Column(name = "POSITION")
+    @ApiParam(value = "三维位置")
+    private String position;
 
     @Transient
     @ApiParam(value = "子存储区列表")
@@ -129,10 +133,10 @@ public class WmsZones extends BaseBean {
     public WmsZones() {
     }
 
-    public double getZoneLengthVal() {
-        return this.zoneLength == null ? 0 : this.zoneLength.doubleValue();
+    public Integer getZoneLengthVal() {
+        return this.zoneLength == null ? 0 : this.zoneLength.intValue();
     }
-    public double getZoneWidthVal() {
-        return this.zoneWidth == null ? 0 : this.zoneWidth.doubleValue();
+    public Integer getZoneWidthVal() {
+        return this.zoneWidth == null ? 0 : this.zoneWidth.intValue();
     }
 }

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);

modules/i3plus-pojo-workflow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-DEV-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>