Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java

@@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : ANDON_自处理配置
@@ -67,4 +69,8 @@ public class AndonDisposalCfg extends BaseBean {
     @Column(name = "FLOW_MEMO")
     @ApiParam(value = "审批意见")
     private String flowMemo;
+
+    @Transient
+    @ApiParam(value = "审批意见集合")
+    private Integer[] flowStatusArray;
 }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -388,6 +388,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getWorkCellCode(),"workCellCode", result);
         DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAlarmCode(),"alarmCode", result);
         DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAcCode(),"acCode", result);
+        DdlPreparedPack.getInPackArray(andonDisposalCfg.getFlowStatusArray(), "flowStatus", result);
         DdlPreparedPack.getNumEqualPack(andonDisposalCfg.getFlowStatus(),"flowStatus", result);
 
         getStringBuilderPack(andonDisposalCfg, result);

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java

@@ -42,7 +42,7 @@ public class WorkPlan extends BaseAPS {
 
     @Column(name="PREV_SET_TIME")
     @ApiParam(value ="前设置时间")
-    private Long prevSetTime;
+    private Integer prevSetTime;
 
     @Column(name="PRODUCE_BEGIN")
     @ApiParam(value ="生产开始时间")
@@ -54,7 +54,7 @@ public class WorkPlan extends BaseAPS {
 
     @Column(name="PRODUCE_TIME")
     @ApiParam(value ="生产时间")
-    private Long produceTime;
+    private Integer produceTime;
 
     @Column(name="POST_SET_BEGIN")
     @ApiParam(value ="后设置开始时间")
@@ -66,7 +66,7 @@ public class WorkPlan extends BaseAPS {
 
     @Column(name="POST_SET_TIME")
     @ApiParam(value ="后设置时间")
-    private Long postSetTime;
+    private Integer postSetTime;
 
     @Column(name="LOCK_BEGIN")
     @ApiParam(value ="锁定开始时间")
@@ -78,7 +78,7 @@ public class WorkPlan extends BaseAPS {
 
     @Column(name="LOCK_TIME")
     @ApiParam(value ="锁定时间")
-    private Long lockTime;
+    private Integer lockTime;
 
     @Column(name="WORK_ID")
     @ApiParam(value ="工作对象id")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+/**
+ * @Description :工作计划包含的时间类型
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+public enum PLAN_TYPE {
+    PREV_SET,
+    PRODUCE,
+    POST_SET,
+    LOCK
+}

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java

@@ -3,8 +3,32 @@ package cn.estsh.i3plus.pojo.aps.model;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class APSPager extends Pager {
+    public static class SortData {
+        // 排序对象
+        private String name;
+        // 排序类型，1为升序，0为降序
+        private int orderType;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public int getOrderType() {
+            return orderType;
+        }
+
+        public void setOrderType(int orderType) {
+            this.orderType = orderType;
+        }
+    }
     private String filter;
-    private String sort;
+    private List<SortData> sorts;
 }

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

@@ -797,7 +797,9 @@ public class WmsEnumUtil {
         VDAREPORT("VDAREPORT", "VDA生产报工"),
         VDA_FINISH_GOODS("VDA_FINISH_GOODS", "VDA生产快速入库"),
         VDA_PICKING_GOODS("VDA_PICKING_GOODS", "VDA生产领料"),
-        VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料");
+        VDA_NC_FREEZE("VDA_NC_FREEZE", "VDA_NC冻结"),
+        VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"),
+        VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻");
 
         private String value;
         private String description;

modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java

@@ -88,4 +88,8 @@ public class LacCommandStackRecord extends BaseBean {
     @ApiParam(value ="执行状态")
     private Integer stackStatus;
 
+    @Column(name="EXECUTION_DESCRIPTION")
+    @ApiParam(value ="执行说明")
+    private String executionDescription;
+
 }

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :
@@ -84,6 +85,18 @@ public class WmsBom extends BaseBean {
     @Column(name = "EFF_END_TIME")
     private String effEndTime;
 
+    @ApiParam(value = "目标存储区")
+    @Transient
+    public String destZoneNo;
+
+    @ApiParam(value = "交易类型")
+    @Transient
+    public String transTypeCode;
+
+    @ApiParam(value = "线路代码")
+    @Transient
+    public String routingCode;
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty.doubleValue();
     }

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

@@ -2460,4 +2460,20 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    /**
+     * 根据父物料查询子物料的bom信息
+     *
+     * @param wmsBom
+     * @return
+     */
+    public static DdlPackBean packHqlWmsBomByItemPartNo(WmsBom wmsBom) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsBom.getPartNo(), "partNo", result);
+
+        getStringBuilderPack(wmsBom, result);
+
+        return result;
+    }
 }