diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java index 9e637b2..cfffda0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EShippingTime; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -21,27 +24,59 @@ import javax.persistence.Table; @Table(name = "APS_SHIPPING_TIME") @Api("运输时间") public class ShippingTime extends BaseAPS { + @Column(name="TIME") + @ApiParam(value ="运输时间") + private String time; + + @Column(name="PRIORITY") + @ApiParam(value ="优先级") + private Integer priority; + @Column(name="PREV_RES_CODE") - @ApiParam(value ="前资源编码") - private String prevResCode; + @ApiParam(value ="前资源对象Id") + @FieldAnnotation(property = false) + private Long prevResId; @Column(name="POST_RES_CODE") - @ApiParam(value ="后资源编码") - private String postResCode; + @ApiParam(value ="后资源对象Id") + @FieldAnnotation(property = false) + private Long postResId; @Column(name="PREV_STAND_CODE") - @ApiParam(value ="前标准工序编码") - private String prevStandCode; + @ApiParam(value ="前标准工序对象Id") + @FieldAnnotation(property = false) + private Long prevStandId; @Column(name="POST_STAND_CODE") - @ApiParam(value ="后标准工序编码") - private String postStandCode; + @ApiParam(value ="后标准工序对象Id") + @FieldAnnotation(property = false) + private Long postStandId; - @Column(name="TIME") - @ApiParam(value ="运输时间") - private String time; + public Resource getPrevRes() {return BeanRelation.get(this, EShippingTime.PrevRes); } - @Column(name="PRIORITY") - @ApiParam(value ="优先级") - private Integer priority; + public void setPrevRes(Resource res) { + this.prevResId = res != null ? res.getId() : 0l; + BeanRelation.set(this, EShippingTime.PrevRes, res); + } + + public Resource getPostRes() { return BeanRelation.get(this, EShippingTime.PostRes); } + + public void setPostRes(Resource res) { + this.postResId = res != null ? res.getId() : 0l; + BeanRelation.set(this, EShippingTime.PostRes, res); + } + + public StandOperation getPrevStand() { return BeanRelation.get(this, EShippingTime.PrevStand);} + + public void setPrevStand(StandOperation stand) { + this.prevStandId = stand != null ? stand.getId() : 0l; + BeanRelation.set(this, EShippingTime.PrevStand, stand); + } + + public StandOperation getPostStand() { return BeanRelation.get(this, EShippingTime.PostStand); } + + public void setPostStand(StandOperation stand) { + this.postStandId = stand != null ? stand.getId() : 0l; + BeanRelation.set(this, EShippingTime.PostStand, stand); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index d034238..0d114d5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -90,7 +90,7 @@ public class WorkPlan extends BaseAPS { @Column(name="LOCK_BEGIN") @ApiParam(value ="锁定开始时间") @FieldAnnotation(modify = false) - @RippleAnnotation(dependence = {"PostRelations.PostWork.WorkPlan.produceBegin"}, method = "calcPositiveLockBegin") + @RippleAnnotation(dependence = {"PostRelations.PostWork.WorkPlan.produceBegin", "produceBegin"}, method = "calcPositiveLock") private Date lockBegin; @Column(name="LOCK_END") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 700a1cf..fa3db91 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -202,30 +202,26 @@ public class BeanRelation { } } - public static List lastList(BaseBean entity, Enum... args) { - List result = new ArrayList(); - lastListImpl(result, entity, null, args, 0); - return result; - } - - public static List lastList(BaseBean entity, Predicate filter, Enum... args) { - List result = new ArrayList(); - lastListImpl(result, entity, filter, args, 0); + public static List lastList(BaseBean bean, Enum... holders) { + List result = new ArrayList<>(); + lastListImpl(result, bean, bean, holders, 0); return result; } - - @SuppressWarnings("unchecked") - private final static boolean lastListImpl(List result, BaseBean entity, Predicate filter, - Enum[] args, int index) { - if (index >= args.length) { + private final static boolean lastListImpl(List result, BaseBean bean, BaseBean self, + Enum[] holders, int index) { + if (index >= holders.length) { + if (self == bean) { + return false; + } index = 0; + self = bean; } boolean bNotLast = true; - List relaEntities = list(entity, args[index]); - for (BaseBean relaEntity : relaEntities) { - if (lastListImpl(result, relaEntity, filter, args, index + 1)) { - result.add((T)relaEntity); + List nextBeans = list(bean, holders[index]); + for (BaseBean nextBean : nextBeans) { + if (lastListImpl(result, nextBean, self, holders, index + 1)) { + result.add((T)nextBean); bNotLast = false; } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java new file mode 100644 index 0000000..100379b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java @@ -0,0 +1,8 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EShippingTime { + PrevRes, // 前资源 + PostRes, // 后资源 + PrevStand, // 前标准工序 + PostStand // 后标准工序 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java index 314ecfa..b735390 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.model; import cn.estsh.i3plus.pojo.aps.bean.WorkResource; +import java.util.ArrayList; import java.util.List; /** @@ -14,5 +15,5 @@ import java.util.List; **/ public class ResourceCompose { public WorkResource resource; - public List assResource; + public List assResource = new ArrayList<>(); } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ShippingTime.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ShippingTime.xml new file mode 100644 index 0000000..c51acb0 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ShippingTime.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file 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 85262b4..e5ad0f4 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 @@ -141,9 +141,13 @@ public class LacEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STACK_STATUS{ - RUNNING(1,"运行中"), - PAUSE(2,"暂停"), - FINISH(3,"完成"); + INIT(10,"初始化"), + WAIT(20,"等待中"), + RUNNING(30,"运行中"), + PAUSE(40,"手动暂停"), + FINISH(100,"执行完成"), + RUN_ERROR(101,"运行异常"), + RUN_STOP(102,"手动结束"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index f9ea404..457f5e5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -801,8 +801,9 @@ public class WmsEnumUtil { 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解冻"), - VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"); - + VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"), + VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"), + VDA_SN_("VDA_SN_MERGE", "VDA条码合并"); private String value; private String description; @@ -2763,8 +2764,47 @@ public class WmsEnumUtil { return tmp; } + 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; + } } + + public enum WMS_PART_TYPE_STR { + RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"); + + private String value; + private String description; + + WMS_PART_TYPE_STR(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; + } + } /** * 任务数据来源：检查子数据 */ @@ -2918,6 +2958,16 @@ public class WmsEnumUtil { 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; + } } /** diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java index eea1bf4..e108f1b 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java @@ -83,7 +83,7 @@ public class LacCommandStackRecord extends BaseBean { @Column(name="STACK_SPEND") @ApiParam(value ="执行耗时") - private Integer stackSpend; + private Long stackSpend; @Column(name="STACK_STATUS") @ApiParam(value ="执行状态") @@ -94,6 +94,10 @@ public class LacCommandStackRecord extends BaseBean { private String executionDescription; @Transient + @ApiParam(value ="指令集模板") + private LacCommandStackTemplate template; + + @Transient @ApiParam(value ="步骤列表") private List stepList; 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 cbe2d05..41be18c 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 @@ -79,4 +79,12 @@ public class LacCommandStackStep extends BaseBean { @Transient @ApiParam(value ="步骤任务列表") private List stepTaskList; + + + public LacCommandStackStep() { + } + + public LacCommandStackStep(Long templateId) { + this.templateId = templateId; + } } 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 b1d8a30..1b43256 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 @@ -73,6 +73,10 @@ public class LacCommandStackStepTask extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long stepId; + /** + * 不建议使用 + */ + @Deprecated @Column(name="TASK_INSTANCE_ID") @ApiParam(value ="任务实例ID") @JsonSerialize(using = ToStringSerializer.class) @@ -102,7 +106,19 @@ public class LacCommandStackStepTask extends BaseBean { @Column(name="IS_CRUX") @ApiParam(value ="是否关键") private Integer isCrux; + @Transient @ApiParam(value ="适配任务") private LacSuitTask lacSuitTask; + + @Transient + @ApiParam(value ="适配任务记录") + private LacLogTask logTask; + + public LacCommandStackStepTask() { + } + + public LacCommandStackStepTask(Long templateId) { + this.templateId = templateId; + } } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java index daab86e..6f74bbf 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java @@ -32,6 +32,12 @@ import javax.persistence.Table; public class LacLogTask extends BaseBean { private static final long serialVersionUID = 674009105885048131L; + + @Column(name="COMMAND_STACK_RECORD_ID") + @ApiParam(value ="指令集记录ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackRecordId; + @Column(name="commandStackId") @ApiParam(value ="指令集ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -50,6 +56,10 @@ public class LacLogTask extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long commandStackTypeId; + @Column(name="COMMAND_STACK_TYPE_NAME_RDD") + @ApiParam(value ="指令集类型名称") + private String commandStackTypeNameRdd; + @Column(name="STEP_ID") @ApiParam(value ="步骤ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -61,7 +71,7 @@ public class LacLogTask extends BaseBean { @Column(name="STEP_SEQUENCE") @ApiParam(value ="步骤顺序") - private String stepSequence; + private Integer stepSequence; @Column(name="TASK_ID") @ApiParam(value ="任务ID" , example = "-1") @@ -72,16 +82,25 @@ public class LacLogTask extends BaseBean { @ApiParam(value ="任务名称") private String taskNameRdd; - @Column(name="TASK_NAME_TYPE") + @Column(name="TASK_TYPE_ID") @ApiParam(value ="任务类型") @JsonSerialize(using = ToStringSerializer.class) - private Long taskNameType; + private Long taskTypeId; + + @Column(name="TASK_TYPE_NAME_RDD") + @ApiParam(value ="任务类型") + private String taskTypeNameRdd; @Column(name="adapterId") @ApiParam(value ="适配器ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long adapterId; + @Column(name="TASK_DETAIL_ID") + @ApiParam(value ="任务执行记录明细" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskDetailId; + @Lob @Column(name="INPUT_PARAMETER") @ApiParam(value ="任务入参") @@ -97,7 +116,7 @@ public class LacLogTask extends BaseBean { @Column(name="TASK_SPEND") @ApiParam(value ="任务耗时") - private Integer taskSpend; + private Long taskSpend; @Column(name="TASK_STATUS") @ApiParam(value ="任务状态") diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java index 3a3f05e..7fa12bd 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java @@ -33,6 +33,12 @@ public class LacLogTaskDetail extends BaseBean { private static final long serialVersionUID = -4918694502072594064L; + + @Column(name="COMMAND_STACK_RECORD_ID") + @ApiParam(value ="指令集记录ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackRecordId; + @Column(name="commandStackId") @ApiParam(value ="指令集ID" , example = "-1") @JsonSerialize(using = ToStringSerializer.class) @@ -53,6 +59,11 @@ public class LacLogTaskDetail extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long taskId; + @Column(name="TASK_TYPE_ID") + @ApiParam(value ="任务类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskTypeId; + @Column(name="TASK_NAME_TYPE") @ApiParam(value ="任务类型") @JsonSerialize(using = ToStringSerializer.class) @@ -91,4 +102,9 @@ public class LacLogTaskDetail extends BaseBean { @ApiParam(value ="任务出参处理后") private String outputParameterBody; + @Lob + @Column(name="OUTPUT_PARAMETER_BODY") + @ApiParam(value ="任务执行异常信息") + private String errorMessage; + } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java index 1b2c71a..22c04a7 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTask.java @@ -119,6 +119,8 @@ public class LacSuitTask extends BaseBean { @ApiParam(value ="任务描述") private String taskDescription; + /********************************** 虚拟字段 **********************************/ + @Transient @ApiParam(value ="适配套件") private LacSuitCase lacSuitCase; @@ -128,6 +130,22 @@ public class LacSuitTask extends BaseBean { private Long taskInstanceId; @Transient + @ApiParam(value ="适配原始参数") + private Object orginParam; + + @Transient + @ApiParam(value ="适配转换后参数") + private Object transParam; + + @Transient + @ApiParam(value ="原始报文") + private Object orginMessage; + + @Transient + @ApiParam(value ="转换后报文") + private Object transMessage; + + @Transient @ApiParam(value ="适配参数") private List lacSuitTaskParamList; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index d147827..6d04b02 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.lac.bean.*; +import java.util.List; + /** * @Description : * @Reference : @@ -32,6 +34,75 @@ public class LacHqlPack { public static DdlPackBean packHqlLacLogTask(LacLogTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(),"",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacCommandStackTemplate(LacCommandStackTemplate bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(),"templateCode",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacCommandStackStep(LacCommandStackStep bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacCommandStackStepTask(LacCommandStackStepTask bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTask(LacSuitTask bean, List idList) { + DdlPackBean ddlPackBean = packHqlLacSuitTask(bean) ; + + DdlPreparedPack.getInPackList(idList,"id",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTaskParamAdapter(LacSuitTaskParamAdapter bean, List taskIdList) { + DdlPackBean ddlPackBean = packHqlLacSuitTaskParamAdapter(bean); + + DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean, List taskIdList) { + DdlPackBean ddlPackBean = packHqlLacSuitTaskParam(bean); + + DdlPreparedPack.getInPackList(taskIdList,"taskId",ddlPackBean); + return ddlPackBean; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java index c4dfe04..8ac4a33 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java @@ -67,8 +67,12 @@ public class MesProcessBom extends BaseBean { @ApiParam(value = "子零件数量", example = "0") private Double qty; + @Transient + @ApiParam(value = "绑定数量") + private Double boundQty; + @Column(name = "IS_REPEAT") - @ApiParam(value = "是否可重复") + @ApiParam(value = "是否可重复") private Integer isRepeat; @Column(name = "IS_CHECK") @@ -99,6 +103,9 @@ public class MesProcessBom extends BaseBean { @ApiParam("产品条码") private String serialNumber; + public double getBoundQtyVal() { + return this.boundQty == null ? 0.0d : this.boundQty; + } public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java index 13e4804..111be8e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :产品绑定记录表 @@ -70,11 +71,11 @@ public class MesProdBindRecord extends BaseBean { private String supplierCode; @Column(name = "LOT_NO") - @ApiParam + @ApiParam("关联批次") private String lotNo; @Column(name = "IS_FEED") - @ApiParam + @ApiParam("是否投料配置") private Integer isFeed; @Column(name = "VERSION") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java index f148413..db5ccea 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java @@ -30,7 +30,7 @@ public class MesProduceCtgyPicture extends BaseBean { @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") - private String produceCtgyCode; + private String produceCategoryCode; @Column(name = "SIDE_LOCATION") @ApiParam("面位") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java index 11940aa..86e92b4 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java @@ -58,4 +58,18 @@ public class MesProcessBomModel { this.parentPartNo = parentPartNo; this.parentPartName = parentPartName; } + + public MesProcessBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java index 8736abb..42840a9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java @@ -50,11 +50,10 @@ public class MesProdBindRecordModel { } - public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) { + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) { this.id = id; this.itemPartNo = itemPartNo; this.itemPartName = itemPartName; - this.qty = qty; this.isValid = isValid; this.isDeleted = isDeleted; this.organizeCode = organizeCode; @@ -104,4 +103,17 @@ public class MesProdBindRecordModel { this.serialNumber = serialNumber; } + public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber) { + this.itemPartNo = itemPartNo; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.kpSn = kpSn; + this.parentPartNo = parentPartNo; + this.serialNumber = serialNumber; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java index 4e0986f..58f0644 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java @@ -69,6 +69,10 @@ public class MesProcessBom extends BaseBean { @ColumnDefault("0") @ApiParam(value = "子零件数量", example = "0") private Double qty; + + @Transient + @ApiParam(value = "绑定数量") + private Double boundQty; @Column(name = "IS_REPEAT") @ApiParam(value = "是否可重复") 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 c141c5a..c9fb540 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,13 +1,8 @@ package cn.estsh.i3plus.pojo.model.lac; import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; -import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask; import lombok.Data; -import org.apache.commons.lang3.StringUtils; import org.slf4j.LoggerFactory; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; /** * @Description : lac指令集model @@ -35,23 +30,14 @@ public class LacCommandStackModel { private LacSuitRequest request; /** - * 响应数据 - */ - private LacSuitResponse response; - - /** - * 任务原始报文 - * key : 任务编号 - * value ： 原始报文 + * 请求XML */ - private Map orginMessageMap = new ConcurrentHashMap<>(); + private String requestXml; /** - * 任务转换后报文 - * key : 任务编号 - * value ： 转换后报文 + * 响应数据 */ - private Map transMessageMap = new ConcurrentHashMap<>(); + private LacSuitResponse response; /** * 异常信息 @@ -68,7 +54,7 @@ public class LacCommandStackModel { this.recordId = commandStackRecord.getId(); } - public List getTaskRequestParam(String taskCode){ + public Object getTaskRequestParam(String taskCode){ for (Task task : this.getRequest().getTaskList()) { if(task.getCode().equals(taskCode)){ return task.getParamList(); @@ -77,17 +63,4 @@ public class LacCommandStackModel { return null; } - public void putOrginMessage(LacSuitTask lacSuitTask,Object orginMessage){ - if(lacSuitTask == null || lacSuitTask.getTaskInstanceId() ==null){ - return; - } - this.orginMessageMap.put(lacSuitTask.getTaskInstanceId(), orginMessage == null ? StringUtils.EMPTY : orginMessage); - } - public void putTransMessage(LacSuitTask lacSuitTask,Object transMessage){ - if(lacSuitTask == null || lacSuitTask.getTaskInstanceId() ==null){ - return; - } - this.transMessageMap.put(lacSuitTask.getTaskInstanceId(), transMessage == null ? StringUtils.EMPTY : transMessage); - } - } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java index 3ea6970..839e2e3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.model.lac; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; -import java.util.List; /** * @Description : @@ -17,5 +16,5 @@ public class Task { private String code; - private List paramList; + private Object paramList; } 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 c905237..d44f335 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -44,6 +46,7 @@ public class WmsPart extends BaseBean { @Column(name = "PART_TYPE") @ApiParam(value = "物料类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description") private String partType; @Column(name = "PART_TYPE_DESC") @@ -169,8 +172,13 @@ public class WmsPart extends BaseBean { @Transient @ApiParam("库存水平") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description") private String stockLevelStatus; + @Column(name="verb_num") + @ApiParam(value = "单次拆包数") + private Double verbNum; + @Column(name = "IS_PROD_LOT") @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index a67bfda..c98681aa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -83,6 +83,10 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "线路代码") private String routingCode; + @Column(name = "DEST_LOCATE_NO") + @ApiParam(value = "目的库位") + private String destLocateNo; + public WmsRoutingRule(){} } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java new file mode 100644 index 0000000..ace266b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.Api; +import lombok.Data; + +@Data +@Api("库存预警入参") +public class QuanWarnDto extends Pager { + + private String organizeCode; + private Integer checked; + private String partNo; + private String partType; + + public Integer getChecked() { + return checked == null? 0 : checked; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java new file mode 100644 index 0000000..e137f64 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 移动单统计输出model + * @Reference : + * @Author : gcj + * @CreateDate : 2019-10-31 20:04 + * @Modify: + **/ +@Data +@Api("移动单统计输出model") +public class WmsMoveInfoModel { + + + @ApiParam(value = "操作时间") + private String modifyDateTime; + @ApiParam(value = "物料号") + private String partNo; + @ApiParam(value = "物料名称") + private String partNameRdd; + @ApiParam(value = "交易类型") + private String transTypeCode; + @ApiParam(value = "交易类型名称") + private String transTypeName; + @ApiParam(value = "业务类型") + private String busiTypeCode; + @ApiParam(value = "处理数量") + private String sumQty; + @ApiParam(value = "工厂代码") + private String organizeCode; + @ApiParam(value = "操作状态") + private String itemStatus; + public WmsMoveInfoModel() { + } + + public WmsMoveInfoModel(String modifyDateTime, String partNo, String partNameRdd, String transTypeCode, String transTypeName, String busiTypeCode, String sumQty, String organizeCode) { + this.modifyDateTime = modifyDateTime; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + this.busiTypeCode = busiTypeCode; + this.sumQty = sumQty; + this.organizeCode = organizeCode; + } +}