Merge remote-tracking branch 'origin/dev' into dev

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

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description : 甘特图分页查询参数
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-11-22
+ * @Modify:
+ **/
+@Data
+@Api("甘特图分页查询参数")
+public class GanttEventModel {
+    private Long[] resourceIds;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date begin;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date end;
+}

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

@@ -1,43 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.model;
-
-import cn.estsh.i3plus.pojo.base.common.Pager;
-import io.swagger.annotations.Api;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @Description : 甘特图分页查询参数
- * @Reference :
- * @Author : jason.niu
- * @CreateDate : 2019-11-22
- * @Modify:
- **/
-@Data
-@Api("甘特图分页查询参数")
-public class GanttPager extends Pager {
-    public static class SortData {
-        // 排序对象
-        private String field;
-        // 排序类型，1为升序，0为降序
-        private Boolean ascending;
-
-        public String getField() {
-            return field;
-        }
-
-        public void setField(String field) {
-            this.field = field;
-        }
-
-        public Boolean getAscending() {
-            return ascending;
-        }
-
-        public void setAscending(Boolean ascending) {
-            this.ascending = ascending;
-        }
-    }
-    private String filter;
-    private List<SortData> sorts;
-}

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

@@ -223,7 +223,8 @@ public class LacEnumUtil {
     public enum PARAM_VALUE_TYPE{
         INTEGER(1,"整数"),
         STRING(2,"字符串"),
-        FLOAT(3,"浮点");
+        FLOAT(3,"浮点"),
+        ORGIN(99,"原始数据");
 
         private int value;
         private String description;
@@ -347,15 +348,17 @@ public class LacEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum LOGICAL_OPERATOR{
-        OR(10,"或"),
+        OR(10,"或","||"),
-        AND(20,"与");
+        AND(20,"与","&&");
 
         private int value;
         private String description;
+        private String operator;
 
-        LOGICAL_OPERATOR(int value, String description) {
+        LOGICAL_OPERATOR(int value, String description, String operator) {
             this.value = value;
             this.description = description;
+            this.operator = operator;
         }
 
         public int getValue() {
@@ -376,6 +379,16 @@ public class LacEnumUtil {
             return tmp;
         }
 
+        public static String valueOfOperator(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].operator;
+                }
+            }
+            return tmp;
+        }
+
     }
 
     /**
@@ -383,19 +396,21 @@ public class LacEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum RELATIONAL_OPERATOR{
-        GT(10,">"),
+        GT(10,"大于",">"),
-        LT(20,"<"),
+        LT(20,"小于","<"),
-        EQ(20,"=="),
+        EQ(30,"等于","=="),
-        NE(20,"!="),
+        NE(40,"不等于","!="),
-        GE(20,">="),
+        GE(50,"大于等于",">="),
-        LE(20,"<=");
+        LE(60,"小于等于","<=");
 
         private int value;
         private String description;
+        private String operator;
 
-        RELATIONAL_OPERATOR(int value, String description) {
+        RELATIONAL_OPERATOR(int value, String description,String operator) {
             this.value = value;
             this.description = description;
+            this.operator = operator;
         }
 
         public int getValue() {
@@ -416,6 +431,16 @@ public class LacEnumUtil {
             return tmp;
         }
 
+        public static RELATIONAL_OPERATOR valueOf(int val) {
+            RELATIONAL_OPERATOR tmp = EQ;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
+
     }
 
     /**

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

@@ -9,6 +9,7 @@ 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;
@@ -84,6 +85,9 @@ public class LacCommandStackStep extends BaseBean {
     @ApiParam(value ="步骤任务列表")
     private List<LacCommandStackStepTask> stepTaskList;
 
+    @Transient
+    @ApiParam(value ="步骤任务检查")
+    private List<LacTaskCheck> taskCheckList;
 
     public LacCommandStackStep() {
     }

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

@@ -85,10 +85,10 @@ public class LacCommandStackStepTask extends BaseBean {
 //    @Column(name="STEP_NAME_RDD")
 //    @ApiParam(value ="步骤名称")
 //    private String stepNameRdd;
-//
+
-//    @Column(name="STEP_CODE_RDD")
+    @Column(name="STEP_CODE_RDD")
-//    @ApiParam(value ="步骤代码")
+    @ApiParam(value ="步骤代码")
-//    private String stepCodeRdd;
+    private String stepCodeRdd;
 
     @Column(name="TASK_ID")
     @ApiParam(value ="任务ID")
@@ -99,7 +99,7 @@ public class LacCommandStackStepTask extends BaseBean {
     @ApiParam(value ="步骤名称")
     private String taskNameRdd;
 
-    @Column(name="STEP_CODE_RDD")
+    @Column(name="TASK_CODE_RDD")
     @ApiParam(value ="任务代码")
     private String taskCodeRdd;
 

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

@@ -82,6 +82,7 @@ public class LacSuitTaskParam extends BaseBean {
 
     @Column(name="PARAM_VALUE_TYPE")
     @ApiParam(value ="参数值类型")
+    @AnnoOutputColumn(refClass = LacEnumUtil.PARAM_VALUE_TYPE.class)
     private Integer paramValueType;
 
     @Column(name="PARAM_DEFAULT_VALUE")

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

@@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :
@@ -97,4 +98,11 @@ public class LacTaskCheck extends BaseBean {
     @ApiParam(value ="目标步骤ID")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long targetStepId;
+
+    @Column(name="TARGET_STEP_NAME_RDD")
+    @ApiParam(value ="目标步骤名称")
+    private String targetStepNameRdd;
+
+    @Transient
+    private String value;
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.model.lac;
 
 import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord;
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask;
 import lombok.Data;
 import org.slf4j.LoggerFactory;
 
@@ -55,9 +56,13 @@ public class LacCommandStackModel {
         this.recordId = commandStackRecord.getId();
     }
 
-    public Object getTaskRequestParam(String taskCode){
+    public Object getTaskRequestParam(LacCommandStackStepTask stepTask){
         for (Task task : this.getRequest().getTaskList()) {
-            if(task.getCode().equals(taskCode)){
+            // 步骤代码为空时匹配所有任务参数
+            if (task.getStepCode() == null && task.getCode().equals(stepTask.getTaskCodeRdd())) {
+                return task.getParamList();
+            } else if (task.getStepCode() != null && task.getStepCode().equals(stepTask.getStepCodeRdd())
+                    && task.getCode().equals(stepTask.getTaskCodeRdd())) {
                 return task.getParamList();
             }
         }

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

@@ -47,4 +47,8 @@ public class WmsContainerType extends BaseBean {
     @ApiParam(value = "是否回收")
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     private Integer isRecycle;
+
+    @Column(name = "LIMIT_UOM")
+    @ApiParam(value = "期限单位")
+    private String limitUom;
 }

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

@@ -66,10 +66,6 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam(value = "已处理数量", example = "0")
     public Double handledQty;
 
-    public Double getTransQty() {
-        return this.transQty == null ? 0 : this.transQty.doubleValue();
-    }
-
     @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "不合格处理数量", example = "0")
     public Double rejectQty;
@@ -202,17 +198,6 @@ public class WmsMoveDetails extends BaseBean {
         return isSnapshot == null ? 0 : isSnapshot.intValue();
     }
 
-
-   /* @JSONField(name="fPartNo")
-    public String getfPartNo() {
-        return fPartNo;
-    }
-
-    @JSONField(name="fPartName")
-    public String getfPartName() {
-        return fPartName;
-    }*/
-
     public WmsMoveDetails() {
     }
 
@@ -293,4 +278,12 @@ public class WmsMoveDetails extends BaseBean {
         this.modifyDatetime = modifyDatetime;
         this.modifyUser = modifyUser;
     }
+
+    public Double getTransQty() {
+        return this.transQty == null ? 0 : this.transQty.doubleValue();
+    }
+    public Double getHandledQtyVal() {
+        return this.handledQty == null ? 0 : this.handledQty.doubleValue();
+    }
+
 }

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

@@ -54,7 +54,7 @@ public class WmsPackageSpec extends BaseBean {
 
 
     @Column(name = "POCKET_TYPE")
-    @ApiParam(value = "默认容器类型")
+    @ApiParam(value = "容器类型")
     private String pocketType;
 
     @ApiParam(value = "上级规格名称")

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

@@ -90,7 +90,7 @@ public class WmsPart extends BaseBean {
     private Double pu2su;
 
     @Column(name = "SNP", columnDefinition = "decimal(18,8)")
-    @ApiParam(value = "标准包装", example = "1")
+    @ApiParam(value = "标包", example = "1")
     private Double snp;
 
     @ColumnDefault("2")

pom.xml

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