diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index c052a9d..4fa7c5a 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -11,6 +11,7 @@
4.0.0
i3plus-pojo-aps
+ jar
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java
index c86230f..13abdc2 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java
@@ -21,5 +21,4 @@ public class GanttCalendarModel {
//private String timeRangeColor;
private String eventColor;
private String name;
- private Long workId;
}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java
new file mode 100644
index 0000000..385ee44
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java
@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+@Data
+public class GanttDragModel {
+ private Long workId;
+ private Long resId;
+ private Long targetWorkId;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java
new file mode 100644
index 0000000..69d1e23
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.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 GanttEventRequest {
+ 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;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java
new file mode 100644
index 0000000..dcbc039
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java
@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class GanttPlanModel {
+ private Long resourceId;
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @JsonDeserialize(using = CustomDateDeserializer.class)
+ private Date startDate;
+ @JsonSerialize(using = CustomDateSerializer.class)
+ @JsonDeserialize(using = CustomDateDeserializer.class)
+ private Date endDate;
+ private String cls;
+ //private String timeRangeColor;
+ private String eventColor;
+ private String name;
+ private Long workId;
+ private List resIds;
+}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
index e19e6e5..b1a8fc7 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.StringUtils;
import java.math.BigDecimal;
-import java.util.Date;
/**
* @Description : 模块表单枚举类
@@ -1985,7 +1984,7 @@ public class BlockFormEnumUtil {
}
private String getJDBCUrlSQLServer(String database,String host,Integer port){
- return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database;
+ return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true";
}
}
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java
index dfb4079..a1db447 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java
+++ b/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,"或"),
- AND(20,"与");
+ OR(10,"或","||"),
+ 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,">"),
- LT(20,"<"),
- EQ(20,"=="),
- NE(20,"!="),
- GE(20,">="),
- LE(20,"<=");
+ GT(10,"大于",">"),
+ LT(20,"小于","<"),
+ EQ(30,"等于","=="),
+ NE(40,"不等于","!="),
+ GE(50,"大于等于",">="),
+ 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;
+ }
+
}
/**
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 2a2e426..9c4d8f6 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -12,6 +12,41 @@ import com.fasterxml.jackson.annotation.JsonFormat;
public class MesEnumUtil {
+ /**
+ * JIS发运模式类型
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum MES_JIS_PATTERN_TYPE {
+ ONE(10, "一套发运"),
+ TRUE(20, "多套发运"),
+ FALSE(30, "单产品多套发运");
+
+ private int value;
+ private String description;
+
+ MES_JIS_PATTERN_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;
+ }
+ }
/**
* 是否解析
@@ -2386,82 +2421,6 @@ public class MesEnumUtil {
}
/**
- * mes按钮状态配置 判断符号
- */
- @JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum MES_BUTTON_STATUS_JUDGE_FLAG {
-
- EQUAL("=", "等于"),
- NOT_EQUAL("!=", "不等于"),
- GREATER_THAN(">", "大于"),
- NOT_LESS_THAN(">=", "大于大于"),
- LESS_THAN("<", "小于"),
- NOT_GREATER_THAN("<=", "小于等于");
-
- private String value;
- private String description;
-
- MES_BUTTON_STATUS_JUDGE_FLAG(String value, String description) {
- this.value = value;
- this.description = description;
- }
-
- public String getValue() {
- return value;
- }
-
- public String getDescription() {
- return description;
- }
-
- public static String valueOfDescription(String val) {
- String tmp = null;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].value.equals(val)) {
- tmp = values()[i].description;
- }
- }
- return tmp;
- }
- }
-
- /**
- * mes按钮状态配置 逻辑符号
- */
- @JsonFormat(shape = JsonFormat.Shape.OBJECT)
- public enum MES_BUTTON_STATUS_LOGIC_FLAG {
-
- AND("&&", "逻辑与"),
- OR("||", "逻辑或");
-
- private String value;
- private String description;
-
- MES_BUTTON_STATUS_LOGIC_FLAG(String value, String description) {
- this.value = value;
- this.description = description;
- }
-
- public String getValue() {
- return value;
- }
-
- public String getDescription() {
- return description;
- }
-
- public static String valueOfDescription(String val) {
- String tmp = null;
- for (int i = 0; i < values().length; i++) {
- if (values()[i].value.equals(val)) {
- tmp = values()[i].description;
- }
- }
- return tmp;
- }
- }
-
- /**
* MesWorkOrder实体对应的approvalStatus值 审批状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java
index e9cacb4..1caf947 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java
+++ b/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 stepTaskList;
+ @Transient
+ @ApiParam(value ="步骤任务检查")
+ private List taskCheckList;
public LacCommandStackStep() {
}
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java
index 50433f4..63154b6 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java
+++ b/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")
-// @ApiParam(value ="步骤代码")
-// private String stepCodeRdd;
+
+ @Column(name="STEP_CODE_RDD")
+ @ApiParam(value ="步骤代码")
+ 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;
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java
index 49e34bf..697b68e 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java
+++ b/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")
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java
index 5c14b36..dd50d24 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java
+++ b/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;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java
new file mode 100644
index 0000000..e4d90a6
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.annotation;
+
+
+import java.lang.annotation.*;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/25 1:45 下午
+ * @Description:
+ **/
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+@Documented
+public @interface UseMongoDb {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java
index 5c7d7ae..1b7c85c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java
@@ -37,21 +37,9 @@ public class MesButtonStatus extends BaseBean {
@ApiParam("实体类名称")
private String ClassName;
- @Column(name = "STATUS_FIELD")
- @ApiParam("状态字段")
- private String statusField;
-
- @Column(name = "JUDGE_FLAG")
- @ApiParam("判断符合")
- private String judgeFlag;
-
- @Column(name = "STATUS_VALUE")
- @ApiParam("状态值")
- private String statusValue;
-
- @Column(name = "LOGIC_FLAG")
- @ApiParam("逻辑符合")
- private String logicFlag;
+ @Column(name = "APPEND_HQL")
+ @ApiParam("拼接HQL")
+ private String appendHql;
@Column(name = "STATUS_DESC")
@ApiParam("描述")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
index 2b2d84a..602bb21 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.annotation.UseMongoDb;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@@ -33,6 +34,7 @@ import javax.persistence.Transient;
@Index(columnList = "OBJECT_CODE"),
@Index(columnList = "MODIFY_DATE_TIME")
})
+//@UseMongoDb
@Api("生产数据")
public class MesProductData extends BaseBean {
@Column(name = "WORK_CENTER_CODE")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java
new file mode 100644
index 0000000..2f615de
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java
@@ -0,0 +1,15 @@
+//package cn.estsh.i3plus.pojo.mes.repositorymongo;
+//
+//
+//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
+//import cn.estsh.i3plus.pojo.mes.bean.MesProductData;
+//import org.springframework.stereotype.Repository;
+//
+///**
+// * @Author: Wynne.Lu
+// * @CreateDate: 2019/12/25 1:30 下午
+// * @Description:
+// **/
+//@Repository
+//public interface MesProductDataRepository extends BaseMongoRepository {
+//}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index 001ee09..a0827de 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -2097,4 +2097,6 @@ public class MesHqlPack {
}
return packBean;
}
+
+
}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java
index 0574386..ddcfd44 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java
+++ b/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();
}
}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
index a0f8726..b84e932 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
@@ -15,7 +15,8 @@ import java.util.List;
@Data
public class WmsJobParamModel implements Serializable {
private static final long serialVersionUID = 5784492509251527816L;
- private String organizeCode;
- private List zonesNoList;
- private Integer snType;
+ private String organizeCode;//工厂代码
+ private List zonesNoList;//存储区编号
+ private Integer snType;//条码类型（虚拟，实物）
+ private String devOpsEmail;//运维人员邮箱
}
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
index 03ab889..7a8856c 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.thoughtworks.xstream.annotations.XStreamAlias;
@@ -68,6 +69,7 @@ public class BsSuitCaseParam extends BaseBean {
@AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE.class)
private Integer paramValTypeId;
+ @JsonIgnore
public int getParamValTypeIdVal() {
return paramValTypeId == null ? NumberUtils.INTEGER_MINUS_ONE : paramValTypeId.intValue();
}
@@ -88,6 +90,7 @@ public class BsSuitCaseParam extends BaseBean {
@ApiParam(value = "参数值")
private Object paramValue;
+ @JsonIgnore
public String getParamValueStr() {
if (paramValue == null) {
return null;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
index 27a400a..2be688f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
@@ -123,4 +123,13 @@ public class WmsBom extends BaseBean {
this.bomNum = bomNum;
this.itemQty = itemQty;
}
+
+ public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty,String effStartTime) {
+ this.itemPartNo = itemPartNo;
+ this.itemPartNam = itemPartNam;
+ this.itemUnit = itemUnit;
+ this.bomNum = bomNum;
+ this.itemQty = itemQty;
+ this.effStartTime = effStartTime;
+ }
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
index 14c0486..c08e1eb 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
@@ -181,6 +181,23 @@ public class WmsCSFactTrans extends BaseBean {
this.srcZoneNo = srcZoneNo;
this.srcWhNo = srcWhNo;
}
+
+ public WmsCSFactTrans(String orderNo, String whNo, String zoneNo, String locateNo,Double factQty, String partNo, String partNameRdd, String sn, Double qty, String unit, String srcLocateNo, String srcZoneNo, String srcWhNo,String vendorNo) {
+ this.orderNo = orderNo;
+ this.whNo = whNo;
+ this.zoneNo = zoneNo;
+ this.locateNo = locateNo;
+ this.factQty = factQty;
+ this.partNo = partNo;
+ this.partNameRdd = partNameRdd;
+ this.sn = sn;
+ this.qty = qty;
+ this.unit = unit;
+ this.srcLocateNo = srcLocateNo;
+ this.srcZoneNo = srcZoneNo;
+ this.srcWhNo = srcWhNo;
+ this.vendorNo= vendorNo;
+ }
public WmsCSFactTrans(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) {
this.partNo=partNo;
this.partNameRdd = partNameRdd;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java
index def0261..3c51124 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java
+++ b/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;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index 3ac14cc..4fcea9d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -208,7 +208,16 @@ public class WmsDocMovementDetails extends BaseBean {
@Transient
@ApiParam("优先级")
- private String priority;
+ private Integer priority;
+
+
+ @Transient
+ @ApiParam(value = "汇总需求数量", example = "0")
+ public Double sumQty;
+
+ @Transient
+ @ApiParam(value = "汇总拣货数量", example = "0")
+ public Double sumPickQty;
public String getRecommondLot() {
return recommondLot == null ? "无" : this.recommondLot;
@@ -272,8 +281,12 @@ public class WmsDocMovementDetails extends BaseBean {
this.destLocateNo = destLocateNo;
}
- public WmsDocMovementDetails (String partNo) {
+ public WmsDocMovementDetails (Double sumQty,Double sumPickQty ,String partNo,Integer priority,String orderNo) {
+ this.sumQty = sumQty;
+ this.sumPickQty = sumPickQty;
this.partNo = partNo;
+ this.priority = priority;
+ this.orderNo = orderNo;
}
public WmsDocMovementDetails (String partNo,String orderNo) {
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java
index c37935e..4a71d08 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java
@@ -8,10 +8,7 @@ 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 javax.persistence.UniqueConstraint;
+import javax.persistence.*;
/**
* @Description : 附件表
@@ -58,4 +55,8 @@ public class WmsFile extends BaseBean{
@Column(name = "REF_TYPE")
@ApiParam(value = "关联单据类型")
private String refType;
+
+ @Transient
+ @ApiParam("预览前缀")
+ public String previewPrefix;
}
\ No newline at end of file
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
index 8e6d27e..3311b77 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
@@ -62,9 +62,9 @@ public class WmsMoveDetails extends BaseBean {
@ApiParam(value = "处理数量", example = "0")
public Double transQty;
- public Double getTransQty() {
- return this.transQty == null ? 0 : this.transQty.doubleValue();
- }
+ @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)")
+ @ApiParam(value = "已处理数量", example = "0")
+ public Double handledQty;
@Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)")
@ApiParam(value = "不合格处理数量", example = "0")
@@ -198,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() {
}
@@ -289,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();
+ }
+
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java
index 4b4a129..71eb010 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java
+++ b/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 = "上级规格名称")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
index be7ffe3..370667a 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
+++ b/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")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
index 811158c..837cbf2 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
@@ -124,14 +124,18 @@ public class WmsStockQuan extends BaseBean {
private String prodCfgTypeName;
@Transient
- @ApiParam(value = "箱数", example = "-1")
+ @ApiParam(value = "箱数")
private Integer boxQty;
@Transient
- @ApiParam(value = "零件数", example = "-1")
+ @ApiParam(value = "零件数")
private Double partQty;
@Transient
+ @ApiParam(value = "处理中数量")
+ private Double transQty;
+
+ @Transient
@ApiParam(value = "ERP库存地")
private String areaNo;
@@ -211,7 +215,7 @@ public class WmsStockQuan extends BaseBean {
public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName,
Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty,
- Double consignQty, Double lockQty,Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
+ Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
this.whNo = whNo;
this.zoneNo = zoneNo;
this.partNo = partNo;
@@ -281,5 +285,6 @@ public class WmsStockQuan extends BaseBean {
this.consignQty = consignQty;
this.lockQty = lockQty;
this.scrapQty = scrapQty;
+ this.totalQty = qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty;
}
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index 892693a..422cf79 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -278,6 +278,10 @@ public class WmsStockSn extends BaseBean {
@ApiParam("是否寄售 1-是 2-否")
private Integer consignation;
+ @Transient
+ @ApiParam(value = "是否最早批次")
+ public String isFifo;
+
public WmsStockSn() {
}
diff --git 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
index bb2b334..ed53137 100644
--- 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
@@ -229,13 +229,13 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getContainerNo(), "containerNo", result);
- if (wmsPOMaster.getPriorRC()!=null&&wmsPOMaster.getPriorRC()==WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){
+ if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) {
ArrayList numList = new ArrayList<>();
numList.add(0);
numList.add(wmsPOMaster.getPriorRC());
numList.add(null);
DdlPreparedPack.getNotOrIsNull(numList, "priorRC", result);
- }else{
+ } else {
DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result);
}
@@ -923,8 +923,8 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
- DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo",result);
- DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(),"qualityDate",result);
+ DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(), "packageNo", result);
+ DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(), "qualityDate", result);
if (wmsStockSn.getSnStatus() == null) {
DdlPreparedPack.getInPackArray(new Integer[]{
WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(),
@@ -1613,7 +1613,9 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
- DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
+ DdlPreparedPack.getOrderByPack(
+ new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE},
+ new String[]{"sn", "createDatetime"}, result);
return result;
}
@@ -2007,8 +2009,8 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
- DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo", result);
- DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(),"vendorNo", result);
+ DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(), "packageNo", result);
+ DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringNotNullPack("locateNo", result);
result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''");
@@ -2427,7 +2429,7 @@ public class WmsHqlPack {
DdlPackBean result = new DdlPackBean();
- DdlPreparedPack.getStringLeftLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
+ DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result);
// DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result);
@@ -2618,15 +2620,15 @@ public class WmsHqlPack {
* @param wmsPullTaskMaster
* @return
*/
- public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) {
+ public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster, String statusList) {
DdlPackBean result = new DdlPackBean();
List stringList = null;
List integerList = null;
//List integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList());
- if(StringUtils.isNotBlank(statusList)){
+ if (StringUtils.isNotBlank(statusList)) {
stringList = Arrays.asList(statusList.split(","));
integerList = new ArrayList<>();
- for(String sl : stringList){
+ for (String sl : stringList) {
integerList.add(Integer.valueOf(sl));
}
}
diff --git a/pom.xml b/pom.xml
index 9caeb95..5918acc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,8 @@
i3plus.pojo
i3plus-pojo
pom
- 1.0-DEV-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
+
modules/i3plus-pojo-base
modules/i3plus-pojo-platform
modules/i3plus-pojo-model