diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 2a95d89..1e4576f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -1,10 +1,13 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseCode; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_CLASS; import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_LOCK_TYPE; import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_TYPE; import cn.estsh.i3plus.pojo.aps.enums.TIME_ROUND_TYPE; +import cn.estsh.i3plus.pojo.aps.holders.EResource; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +15,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :资源 @@ -96,4 +100,7 @@ public class Resource extends BaseCode { @Column(name="LOCK_TIME") @ApiParam(value ="锁定时间长度") private String lockTime; + + @JsonBackReference + public List getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); } } 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 new file mode 100644 index 0000000..cfffda0 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -0,0 +1,82 @@ +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; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :运输时间 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +@Entity +@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 ="前资源对象Id") + @FieldAnnotation(property = false) + private Long prevResId; + + @Column(name="POST_RES_CODE") + @ApiParam(value ="后资源对象Id") + @FieldAnnotation(property = false) + private Long postResId; + + @Column(name="PREV_STAND_CODE") + @ApiParam(value ="前标准工序对象Id") + @FieldAnnotation(property = false) + private Long prevStandId; + + @Column(name="POST_STAND_CODE") + @ApiParam(value ="后标准工序对象Id") + @FieldAnnotation(property = false) + private Long postStandId; + + public Resource getPrevRes() {return BeanRelation.get(this, EShippingTime.PrevRes); } + + 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 ddd9a92..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 @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.enums.WORK_PLAN_TYPE; import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; import io.swagger.annotations.Api; @@ -33,6 +35,11 @@ import java.util.List; @Table(name="APS_WORK_PLAN") @Api("工作计划") public class WorkPlan extends BaseAPS { + @Column(name="TYPE") + @ApiParam(value ="工作计划类型") + @FieldAnnotation(modify = false, display = false) + private WORK_PLAN_TYPE type; + @Column(name="PREV_SET_BEGIN") @ApiParam(value ="前设置开始时间") @FieldAnnotation(modify = false) @@ -51,6 +58,8 @@ public class WorkPlan extends BaseAPS { @Column(name="PRODUCE_BEGIN") @ApiParam(value ="生产开始时间") @FieldAnnotation(modify = false) + @RippleAnnotation(dependence = {"Work.PrevRelations.PrevWork.WorkPlan.produceBegin", + "PrevPlan.produceBegin"}, method = "calcPositive") private Date produceBegin; @Column(name="PRODUCE_END") @@ -81,6 +90,7 @@ public class WorkPlan extends BaseAPS { @Column(name="LOCK_BEGIN") @ApiParam(value ="锁定开始时间") @FieldAnnotation(modify = false) + @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/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index f51f6b1..638b6e8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -34,17 +34,17 @@ public class WorkResource extends BaseAPS { @Column(name="PREV_TIME") @ApiParam(value ="前设置时间") @FieldAnnotation(modify = false) - private Long prevTime; + private Integer prevTime; @Column(name="PRODUCE_TIME") @ApiParam(value ="制造时间") @FieldAnnotation(modify = false) - private Long produceTime; + private Integer produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") @FieldAnnotation(modify = false) - private Long postTime; + private Integer postTime; @Column(name="PRIORITY") @ApiParam(value ="优先级") 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 17cc18a..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 @@ -48,7 +48,7 @@ public class BeanRelation { return result; } for (Enum holder : beanInfo.getAllHolders()) { - result.put(holder, new ArrayList<>()); + result.put(holder, new LinkedList<>()); } return result; } @@ -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/common/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index 68b2fd5..2760736 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -139,12 +139,12 @@ public class DateDuration { * @param amount * @return */ - public long getTime(double amount) { + public int getTime(double amount) { if (amount < PRECISION) return getTime(); double result = (amount * this.rate) + this.time; - return (long)Math.ceil(result); + return (int)Math.ceil(result); } /** diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java index 3402810..d78c393 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java @@ -8,6 +8,7 @@ package cn.estsh.i3plus.pojo.aps.enums; * @Modify: **/ public enum RESOURCE_CLASS { - MAIN, // 主资源 - ASS // 副资源 + LIMITLESS, // 无限能力 + SINGLE, // 单能力 + BATCH // 炉资源 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java index a42c74c..fa18826 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java @@ -8,7 +8,6 @@ package cn.estsh.i3plus.pojo.aps.enums; * @Modify: **/ public enum RESOURCE_TYPE { - LIMITLESS, // 无限能力 - SINGLE, // 单能力 - BATCH // 炉资源 + MAIN, // 主资源 + ASS // 副资源 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java new file mode 100644 index 0000000..2a3afa2 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum WORK_PLAN_TYPE { + MAIN_PLAN, // 主资源计划 + ASS_PLAN, // 副资源计划 + BATCH_PLAN // 炉资源计划 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java index 175536d..c72c61e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java @@ -1,4 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EResource { + WorkPlans } 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/java/cn/estsh/i3plus/pojo/aps/repository/ShippingTimeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ShippingTimeRepository.java new file mode 100644 index 0000000..a4dda7b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ShippingTimeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ShippingTime; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ShippingTimeRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml index 81c9f49..c2123bc 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml @@ -1,3 +1,5 @@ + + \ No newline at end of file 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-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml index 7569fa1..c47bdad 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -1,7 +1,5 @@ - - diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 3b43308..fdd5391 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -862,6 +862,5 @@ public class BlockSoftSwitchEnumUtil { } return null; } - } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 8f92da4..a2e6054 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -33,6 +33,7 @@ public class CommonEnumUtil { HARDSWITCH(25,"block-hardswitch","硬件适配器"), LAC(26,"lac","连接适配器"), ANDON(27,"andon","安灯"), + APS(28,"APS","高级计划与排程"), CENTER(99,"icloud-server","注册中心"), SURFACE(98,"i3surface","对外服务"), CLOUD(97,"i3cloud","微服务"), 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 new file mode 100644 index 0000000..85262b4 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java @@ -0,0 +1,179 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-10-29 13:37 + * @Modify: + **/ +public class LacEnumUtil { + + /** + * 适配器类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SUIT_CASE_TYPE { + SOFTWARE(10, "软件"), + HARDWARE(20, "硬件"); + + private int value; + private String description; + + private SUIT_CASE_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; + } + + public static LacEnumUtil.SUIT_CASE_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + + /** + * 硬件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum HARDWARE_TYPE { + OPC_READ(10, "读OPC"), + OPC_WRITE(20, "写OPC"); + + private int value; + private String description; + + private HARDWARE_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; + } + + public static LacEnumUtil.HARDWARE_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + } + + /** + * 参数类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PARAM_TYPE{ + OUT_PARAM(1,"出参"), + IN_PARAM(2,"入参"); + + private int value; + private String description; + + PARAM_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; + } + } + + /** + * 指令集状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STACK_STATUS{ + RUNNING(1,"运行中"), + PAUSE(2,"暂停"), + FINISH(3,"完成"); + + private int value; + private String description; + + STACK_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; + } + + public static boolean isRunning(int val) { + return RUNNING.getValue() == val; + } + } + +} 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 439677b..fc5e745 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,82 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * MesRepair 处理措施 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_REPAIR_TYPE { + + SCRATCH(10, "划痕"), + FRACTURE(20, "破碎"), + SCRAP_TYPE3(30, "缺失"); + + private int value; + private String description; + + MES_REPAIR_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; + } + } + + /** + * 设备台账报表查询标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EQUIPMENT_REPORT_TYPE { + + TASK(10, "作业任务"), + PLAN(20, "周期计划"), + REPAIR(30, "维修记录"), + CHECK(40, "点检记录"), + MAINTAIN(50, "保养记录"); + + private int value; + private String description; + + EQUIPMENT_REPORT_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; + } + } + + /** * MesScrap 报废原因 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -809,15 +885,15 @@ public class MesEnumUtil { * pcn 是否是关键件 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_IS_KEY { + public enum MES_IS_BIND_KEY { - IS_KEY(10, "是"), - NO_KEY(20, "否"); + IS_BIND_KEY(1, "是"), + NO_BIND_KEY(2, "否"); private int value; private String description; - MES_IS_KEY(int value, String description) { + MES_IS_BIND_KEY(int value, String description) { this.value = value; this.description = description; } @@ -831,8 +907,8 @@ public class MesEnumUtil { } // 根据value返回枚举类型,主要在switch中使用 - public static MES_IS_KEY getByValue(int value) { - for (MES_IS_KEY mesInsertExcel : values()) { + public static MES_IS_BIND_KEY getByValue(int value) { + for (MES_IS_BIND_KEY mesInsertExcel : values()) { if (mesInsertExcel.getValue() == value) { return mesInsertExcel; } 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 de64862..a07f3fd 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 @@ -25,7 +25,7 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GROUP_COMMIT_CHECK { DISABLE(1, "禁止提交"), CHECK_MOVE(2, "校验移动单"), - NO_CHECK(3, "不校验"),CHECK_OLD_MOVE_NO(4, "校验是否已产生移动单"); + NO_CHECK(3, "不校验"), CHECK_OLD_MOVE_NO(4, "校验是否已产生移动单"); private int value; private String description; @@ -285,6 +285,7 @@ public class WmsEnumUtil { } return tmp; } + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -799,7 +800,8 @@ public class WmsEnumUtil { VDA_PICKING_GOODS("VDA_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解冻"); + VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"), + VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"); private String value; private String description; @@ -860,7 +862,7 @@ public class WmsEnumUtil { return null; } else { for (int i = 0; i < values().length; i++) { - if (StringUtils.equalsIgnoreCase(values()[i].value,value)) { + if (StringUtils.equalsIgnoreCase(values()[i].value, value)) { return values()[i]; } } @@ -917,7 +919,7 @@ public class WmsEnumUtil { INIT(20, "INIT", "初始化"), IS_GENERAL(30, "IS_GENERAL", "已生成"), NO_GENERAL(40, "NO_GENERAL", "不生成"), - CANCEL(50,"CANCEL","撤销"); + CANCEL(50, "CANCEL", "撤销"); private int value; private String code; @@ -1098,7 +1100,7 @@ public class WmsEnumUtil { MONTH_INVENTORY(20, "月度盘点"), SEASON_INVENTORY(30, "季度盘点"), YEAR_INVENTORY(40, "年度盘点"), - AJUST_INVENTORY(50, "库存调整盘点"); + AJUST_INVENTORY(50, "库存调整盘点"); private int value; private String description; @@ -3484,12 +3486,13 @@ public class WmsEnumUtil { * 收货状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum REC_STATUS{ + public enum REC_STATUS { UNRECEIVED("UNRECEIVED", "未收货"), COMPLETE_RECEIPT("COMPLETE_RECEIPT", "完成收货"), PARTIAL_RECEIPT("PARTIAL_RECEIPT", "部分收货"), OVER_RECEIVED_GOODS("OVER_RECEIVED_GOODS", "超量收货"), - OTHER("ELSE", "其他"),; + OTHER("ELSE", "其他"), + ; private String value; private String description; @@ -3525,7 +3528,7 @@ public class WmsEnumUtil { public static String valueOfDescription(String val) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(val) ) { + if (values()[i].value.equals(val)) { tmp = values()[i].description; } } @@ -3572,7 +3575,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ETC_PRINT_STATUS { - NOT_HIT (10, "未打"), + NOT_HIT(10, "未打"), ALREADY_HIT(20, "已打"); private int value; @@ -3609,7 +3612,8 @@ public class WmsEnumUtil { public enum PART_ASSOCIATE_TYPE { LINE(10, "LINE", "产线"), CUSTOMER(20, "CUSTOMER", "客户"), - VENDOR(30, "VENDOR", "供应商"); + VENDOR(30, "VENDOR", "供应商"), + BOXING_ERROR_PROOFING(40, "BOXING_ERROR_PROOFING","装箱防错"); private int value; private String code; @@ -3730,8 +3734,8 @@ public class WmsEnumUtil { public enum ROUTING_RULE_MODE { CREATE_TASK(10, "CREATE_TASK", "生成任务"), AUTO_OPT(20, "AUTO_OPT", "自动操作"), - MENU_OPT(30, "MENU_OPT", "手工操作"), - AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"); + MENU_OPT(30, "MENU_OPT", "手工操作"), + AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易"); private int value; private String code; private String description; @@ -3778,13 +3782,14 @@ public class WmsEnumUtil { return tmp; } } + /** * 物流规则 处理模式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ROUTING_RULE_TYPE { - PROMOTION_TYPE(10, "REPLENISH_TYPE", "推动规则"), - REPLENISH_TYPE(20, "PROMOTION_TYPE", "补货规则"); + PROMOTION_TYPE(10, "REPLENISH_TYPE", "推动规则"), + REPLENISH_TYPE(20, "PROMOTION_TYPE", "补货规则"); private int value; private String code; private String description; @@ -3831,12 +3836,13 @@ public class WmsEnumUtil { return tmp; } } + /** * 物流规则 处理单位 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ROUTING_DELAY_UNIT { - M(10, "M", "分"), + M(10, "M", "分"), D(20, "D", "天"); private int value; private String code; @@ -3885,4 +3891,77 @@ public class WmsEnumUtil { } } + /** + * MOVE_TO_ERP表是否同步 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MOVE_TO_ERP_IS_SYNC { + SYNCHRONIZED(1, "已同步"), UN_SYNCHRONIZED(2, "未同步"), NON_SYNCHRONIZED(3, "不同步"); + + private int value; + private String description; + + MOVE_TO_ERP_IS_SYNC(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 防错类型： + * 10=零件装箱防错，20=条码装箱防错，30=BMW标签防错，40=BMW零件防错，50=BMW发运防错，60=单件发运防错 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_BOXING_ERROR_PROOFING_TYPE { + PART_NO(10, "零件装箱防错"), + SN(20, "条码装箱防错"), + BMW_TAG(30, "BMW标签防错"), + BMW_PART(40, "BMW零件防错"), + BMW_DISPATCH(50, "BMW发运防错"), + SINGLE_DISPATCH(60, "单件发运防错"); + + private int value; + private String description; + + PART_BOXING_ERROR_PROOFING_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } \ No newline at end of file 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 7a42440..eea1bf4 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 @@ -9,11 +9,12 @@ 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.Lob; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : @@ -92,4 +93,8 @@ public class LacCommandStackRecord extends BaseBean { @ApiParam(value ="执行说明") private String executionDescription; + @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 84fb49f..cbe2d05 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,10 +9,11 @@ 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 javax.persistence.Transient; +import java.util.List; /** * @Description : @@ -47,7 +48,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name="LAC_COMMAND_STACK_STEP") -@Api(value="指令集模板",description = "指令集模板信息") +@Api(value="指令集步骤",description = "指令集步骤") public class LacCommandStackStep extends BaseBean { @Column(name="TEMPLATE_ID") @@ -69,10 +70,13 @@ public class LacCommandStackStep extends BaseBean { @Column(name="STEP_EXEC_COND") @ApiParam(value ="步骤执行条件") - private Integer stepExecCond; + private Double stepExecCond; @Column(name="STEP_DESCRIPTION") @ApiParam(value ="步骤执行条件") private String stepDescription; + @Transient + @ApiParam(value ="步骤任务列表") + private List stepTaskList; } 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 a0aac59..b1d8a30 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 @@ -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 : @@ -67,11 +68,15 @@ public class LacCommandStackStepTask extends BaseBean { // @ApiParam(value ="模板代码") // private String templateCodeRdd; - @Column(name="STEP_ID") @ApiParam(value ="步骤ID") @JsonSerialize(using = ToStringSerializer.class) private Long stepId; + + @Column(name="TASK_INSTANCE_ID") + @ApiParam(value ="任务实例ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskInstanceId; // // @Column(name="STEP_NAME_RDD") // @ApiParam(value ="步骤名称") @@ -94,9 +99,10 @@ public class LacCommandStackStepTask extends BaseBean { @ApiParam(value ="任务代码") private String taskCodeRdd; - @Column(name="IS_CRUX") @ApiParam(value ="是否关键") private Integer isCrux; - + @Transient + @ApiParam(value ="适配任务") + private LacSuitTask lacSuitTask; } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java index 11ff867..7f301fa 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackTemplate.java @@ -9,10 +9,11 @@ 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 javax.persistence.Transient; +import java.util.List; /** * @Description : @@ -77,4 +78,7 @@ public class LacCommandStackTemplate extends BaseBean { @ApiParam(value ="模板描述") private String templateDescription; + @Transient + @ApiParam(value ="步骤列表") + private List stepList; } 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 d9af1a4..5859ae1 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 @@ -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 : @@ -71,6 +73,10 @@ public class LacSuitTask extends BaseBean { @ApiParam(value ="超时时间") private Integer taskTimeout; + public int getTaskTimeoutVal(){ + return taskTimeout == null ? -1 : taskTimeout.intValue(); + } + @Column(name="TASK_RETRY_NUM") @ApiParam(value ="重试次数") private Integer taskRetryNum; @@ -113,4 +119,39 @@ public class LacSuitTask extends BaseBean { @ApiParam(value ="任务描述") private String taskDescription; + @Transient + @ApiParam(value ="适配套件") + private LacSuitCase lacSuitCase; + + @Transient + @ApiParam(value ="任务实例id") + private Long taskInstanceId; + + @Transient + @ApiParam(value ="适配参数") + private List lacSuitTaskParamList; + + @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 inputParamAdapterList; + + @Transient + @ApiParam(value ="出参适配") + private List outputParamAdapterList; } 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 2b4b3af..cb0905e 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 @@ -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 : @@ -87,4 +88,8 @@ public class LacSuitTaskParam extends BaseBean { @Column(name="PARAM_DESCRIPTION") @ApiParam(value ="参数描述") private String paramDescription; + + @Transient + @ApiParam(value ="参数值") + private Object value; } 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 2c5dbff..d147827 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.lac.sqlpack; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.lac.bean.*; /** @@ -15,33 +17,44 @@ public class LacHqlPack { private LacHqlPack() { } - public static DdlPackBean packHqlLacTaskType(LacTaskType bean){ + public static DdlPackBean packHqlLacTaskType(LacTaskType bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); return ddlPackBean; } - public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean){ + public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); return ddlPackBean; } - public static DdlPackBean packHqlLacLogTask(LacLogTask bean){ + public static DdlPackBean packHqlLacLogTask(LacLogTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); return ddlPackBean; } - public static DdlPackBean packHqlLacCommandStackType(LacCommandStackType bean){ + public static DdlPackBean packHqlLacCommandStackType(LacCommandStackType bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); return ddlPackBean; } - public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean){ + public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); return ddlPackBean; } + + public static DdlPackBean packHqlLacCommandStackStepByTemplateId(Long templateId) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(templateId, "templateId", ddlPackBean); + DdlPreparedPack.getOrderByPack( + new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, + new String[]{"stepSort"}, + ddlPackBean + ); + return ddlPackBean; + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java index 2d8f0f2..022e20c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java @@ -42,7 +42,7 @@ public class MesConfig extends BaseBean { @Column(name = "CFG_KEY") @ApiParam("配置key") - private String cfgkey; + private String cfgKey; @Column(name = "CFG_VALUE") @ApiParam("配置value") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java index 1c9c4b8d2..015d53e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java @@ -31,7 +31,6 @@ public class MesDataObject extends BaseBean { @ApiParam("对象代码") private String objectCode; - @Column(name = "OBJECT_NAME") @ApiParam("对象名称") private String objectName; @@ -43,4 +42,28 @@ public class MesDataObject extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; + + @Column(name = "FIELD_PK") + @ApiParam("主键") + private String fieldPk; + + @Column(name = "READ_FLAG_VALUE") + @ApiParam("读取标志值") + private String readFlagValue; + + @Column(name = "FEED_FIELD") + @ApiParam("反馈字段") + private String feedField; + + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + + @Column(name = "SELF_ADDITION") + @ApiParam("自增列") + private String selfAddition; + + @Column(name = "SELF_ADDITION_VALUE") + @ApiParam("自增列值") + private Long selfAdditionValue; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java index 2775754..ea4b34b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.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: @@ -83,4 +84,7 @@ public class MesDismantleRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") private String memo; + + @Transient + private String serialNumber; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java index c9f59b0..645c2d5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java @@ -27,7 +27,6 @@ import javax.persistence.Table; @Api("对象结构") public class MesObjectCfg extends BaseBean { - @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; @@ -48,18 +47,6 @@ public class MesObjectCfg extends BaseBean { @ApiParam("列长度") private String fieldLength; - @Column(name = "FIELD_PK") - @ApiParam("主键标记") - private String fieldPk; - - @Column(name = "FEED_FIELD") - @ApiParam("反馈字段") - private String feedField; - - @Column(name = "FEED_VALUE") - @ApiParam("反馈值") - private String feedValue; - @Column(name = "POJO_ATTR") @ApiParam("对应的pojo属性") private String pojoAttr; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java index f19880b..dcb2322 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PLC_CONFIGURE") @Api("PLC设备信息配置表") +@Deprecated public class MesPLCConfigure extends BaseBean { @Column(name = "IP") @ApiParam("设备ip") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 5fbb803..182a1d5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.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; /** * @Author: Wynne.Lu @@ -46,9 +47,9 @@ public class MesPackage extends BaseBean { @ApiParam("包装规格数量") private Double packSpecQty; - @Column(name = "NUIT") + @Column(name = "UNIT") @ApiParam("包装规格数量") - private String nuit; + private String unit; @Column(name = "LOT_NO") @ApiParam("批号") @@ -62,6 +63,10 @@ public class MesPackage extends BaseBean { @ApiParam("是否封箱") private Integer isSealed; + @Transient + @ApiParam("封箱状态") + private String sealStatus; + @Column(name = "PRINT_STATUS") @ApiParam("打印状态10：未打印 20：已打印") private Integer printStatus; @@ -82,6 +87,9 @@ public class MesPackage extends BaseBean { @ApiParam("备注") private String memo; + public MesPackage() { + } + public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) { this.packageNo = packageNo; this.partNo = partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java index 9424b33..d3864d0 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -23,7 +23,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE") +@Table(name = "MES_PACKAGE_DETAIL") @Api("包装规格") public class MesPackageDetail extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index bb74b3e..6beeba3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -28,7 +28,6 @@ import javax.persistence.Transient; @Api("PLC配置表") public class MesPlc extends BaseBean { - @Column(name = "PLC_CODE") @ApiParam("PLC代码") private String plcCode; @@ -65,6 +64,10 @@ public class MesPlc extends BaseBean { @ApiParam("分组名称") private String groupName; + @Column(name = "DEVICE") + @ApiParam("驱动") + private String device; + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; 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 a03c46a..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") @@ -83,10 +87,6 @@ public class MesProcessBom extends BaseBean { @ApiParam(value = "是否绑定关键件") private Integer isBindKey; - @Column(name = "IS_KEY") - @ApiParam(value = "是否关键件") - private Integer isKey; - @Transient @ApiParam("是否已绑定") private Boolean isBind; @@ -103,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 abb7861..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") @@ -85,9 +86,9 @@ public class MesProdBindRecord extends BaseBean { @ApiParam(value = "结果") private String result; - @Column(name = "IS_KEY") - @ApiParam(value = "是否关键件") - private Integer isKey; + @Column(name = "is_BIND_KEY") + @ApiParam(value = "是否绑定关键件") + private Integer isBindKey; @Column(name = "ACTION_TYPE") @ApiParam(value = "动作类型") 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 eb67cfc..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("面位") @@ -43,4 +43,16 @@ public class MesProduceCtgyPicture extends BaseBean { @Column(name = "PICTURE_NAME") @ApiParam("图片名称") private String pictureName; + + @Column(name = "FILE_SIZE") + @ApiParam("FILE_SIZE") + private String fileSize; + + @Column(name = "FILE_TYPE_ID") + @ApiParam("FILE_TYPE_ID") + private String fileTypeId; + + @Column(name = "FILE_TYPE_NAME") + @ApiParam("FILE_TYPE_NAME") + private String fileTypeName; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index ff3d432..ac36ee1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description: @@ -27,7 +28,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_SN") @Api("产品条码表") -public class MesProduceSn extends BaseBean { +public class MesProduceSn extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6641051790330191326L; @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") @@ -62,11 +65,11 @@ public class MesProduceSn extends BaseBean { private Integer printStatus; @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") + @ApiParam("生产线") private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") + @ApiParam("工位") private String workCellCode; @Column(name = "ROUTE_CODE") @@ -109,10 +112,6 @@ public class MesProduceSn extends BaseBean { @ApiParam("客户代码") private String custCode; - @Column(name = "PACKAGE_SN") - @ApiParam("包装条码") - private String packageSn; - @Column(name = "SN_TYPE") @ApiParam("条码类型 10=正常 20=首检件") private Integer snType; @@ -175,7 +174,6 @@ public class MesProduceSn extends BaseBean { ", workOrderNo='" + workOrderNo + '\'' + ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + - ", packageSn='" + packageSn + '\'' + ", snType='" + snType + '\'' + ", tray='" + tray + '\'' + ", resultMsg='" + resultMsg + '\'' + diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java index 0590a17..ae8b814 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java @@ -108,6 +108,10 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("包装条码") private String packageSn; + @Column(name="OPERATE_TYPE") + @ApiParam("操作类型") + private Integer operateType; + @Transient @ApiParam("返回信息") private String resultMsg; 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/MesConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java index e950b9c..3e61c2a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java @@ -42,7 +42,7 @@ public class MesConfig extends BaseBean { @Column(name = "CFG_KEY") @ApiParam("配置key") - private String cfgkey; + private String cfgKey; @Column(name = "CFG_VALUE") @ApiParam("配置value") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java index c788f8a..debf5a3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java @@ -43,4 +43,28 @@ public class MesDataObject extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; + + @Column(name = "FIELD_PK") + @ApiParam("主键") + private String fieldPk; + + @Column(name = "READ_FLAG_VALUE") + @ApiParam("读取标志值") + private String readFlagValue; + + @Column(name = "FEED_FIELD") + @ApiParam("反馈字段") + private String feedField; + + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + + @Column(name = "SELF_ADDITION") + @ApiParam("自增列") + private String selfAddition; + + @Column(name = "SELF_ADDITION_VALUE") + @ApiParam("自增列值") + private Long selfAdditionValue; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java index c5da050..ebe9d58 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java @@ -60,7 +60,7 @@ public class MesDatasource extends BaseBean { @ApiParam("设备代码") private String equipmentCode; - @Column(name = "DS_DB_NAME") + @Column(name = "DS_DB_NAMsE") @ApiParam("数据库名称") private String dsDbName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index dfd7e1b..b15b610 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -83,4 +83,8 @@ public class MesEquTaskDetail extends BaseBean { @ApiParam(value = "处理方法") private String fmCode; + @Transient + @ApiParam(value = "任务类型") + private Integer taskType; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index 44f04ba..89d70d6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -53,6 +53,10 @@ public class MesEquTaskPlan extends BaseBean { @ApiParam("创建提前天数") private Integer daysInAdvance; + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + @Transient @ApiParam(value = "生产线") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java index f5720a9..1ffe9c2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.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 :设备维修作业记录 @@ -65,4 +66,24 @@ public class MesEquTaskRepairRecord extends BaseBean { @ApiParam("备注") private String memo; + @Transient + @ApiParam("故障现象") + private String fpName; + + @Transient + @ApiParam("故障原因") + private String fcName; + + @Transient + @ApiParam("处理方法") + private String fmName; + + @Transient + @ApiParam("作业类型") + private String taskTypeName; + + @Transient + @ApiParam("整体结果") + private String finalResultName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java index 82bb4aa..41d7209 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java @@ -74,4 +74,16 @@ public class MesEquTaskStandardRecord extends BaseBean { @ApiParam("备注") private String memo; + @Transient + @ApiParam("作业类型") + private String taskTypeName; + + @Transient + @ApiParam("整体结果") + private String finalResultName; + + @Transient + @ApiParam("判定结果") + private String checkResultName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index e616922..b294abe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -27,7 +27,6 @@ import javax.persistence.Table; @Api("对象结构") public class MesObjectCfg extends BaseBean { - @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; @@ -48,19 +47,6 @@ public class MesObjectCfg extends BaseBean { @ApiParam("列长度") private String fieldLength; - @Column(name = "FIELD_PK") - @ApiParam("主键标记") - private String fieldPk; - - @Column(name = "FEED_FIELD") - @ApiParam("反馈字段") - private String feedField; - - @Column(name = "FEED_VALUE") - @ApiParam("反馈值") - private String feedValue; - - @Column(name = "POJO_ATTR") @ApiParam("对应的pojo属性") private String pojoAttr; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java index 9c320e4..be9933d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PLC_CONFIGURE") @Api("PLC设备信息配置表") +@Deprecated public class MesPLCConfigure extends BaseBean { @Column(name = "IP") @ApiParam("设备ip") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 08e041a..3314cf6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.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; /** * @Author: Wynne.Lu @@ -46,9 +47,9 @@ public class MesPackage extends BaseBean { @ApiParam("包装规格数量") private Double packSpecQty; - @Column(name = "NUIT") - @ApiParam("包装规格数量") - private String nuit; + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; @Column(name = "LOT_NO") @ApiParam("批号") @@ -62,6 +63,10 @@ public class MesPackage extends BaseBean { @ApiParam("是否封箱") private Integer isSealed; + @Transient + @ApiParam("封箱状态") + private String sealStatus; + @Column(name = "PRINT_STATUS") @ApiParam("打印状态10：未打印 20：已打印") private Integer printStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 79eb8f3..1dd0077 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -66,6 +66,10 @@ public class MesPlc extends BaseBean { @ApiParam("分组名称") private String groupName; + @Column(name = "DEVICE") + @ApiParam("驱动") + private String device; + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; 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 c89db3f..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 = "是否可重复") @@ -83,14 +87,10 @@ public class MesProcessBom extends BaseBean { @ApiParam(value = "是否投料配置") private Integer isFeed; - @Column(name = "is_BIND_KEY") + @Column(name = "IS_BIND_KEY") @ApiParam(value = "是否绑定关键件") private Integer isBindKey; - @Column(name = "IS_KEY") - @ApiParam(value = "是否关键件") - private Integer isKey; - @Transient @ApiParam("是否已绑定") private Boolean isBind; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 3d5b323..f689f22 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -86,9 +86,9 @@ public class MesProdBindRecord extends BaseBean { @ApiParam(value = "结果") private String result; - @Column(name = "IS_KEY") - @ApiParam(value = "是否关键件") - private String isKey; + @Column(name = "is_BIND_KEY") + @ApiParam(value = "是否绑定关键件") + private Integer isBindKey; @Column(name = "ACTION_TYPE") @ApiParam(value = "动作类型") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java index 445c18d..ae64067 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/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("面位") @@ -43,4 +43,16 @@ public class MesProduceCtgyPicture extends BaseBean { @Column(name = "PICTURE_NAME") @ApiParam("图片名称") private String pictureName; + + @Column(name = "FILE_SIZE") + @ApiParam("FILE_SIZE") + private String fileSize; + + @Column(name = "FILE_TYPE_ID") + @ApiParam("FILE_TYPE_ID") + private String fileTypeId; + + @Column(name = "FILE_TYPE_NAME") + @ApiParam("FILE_TYPE_NAME") + private String fileTypeName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index fa582cd..88c9257 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -109,10 +109,6 @@ public class MesProduceSn extends BaseBean { @ApiParam("客户代码") private String custCode; - @Column(name = "PACKAGE_SN") - @ApiParam("包装条码") - private String packageSn; - @Column(name = "SN_TYPE") @ApiParam("条码类型") private Integer snType; @@ -121,6 +117,10 @@ public class MesProduceSn extends BaseBean { @ApiParam("托盘号") private String tray; + @Column(name="OPERATE_TYPE") + @ApiParam("操作类型") + private Integer operateType; + @Transient @ApiParam("返回信息") private String resultMsg; @@ -171,7 +171,6 @@ public class MesProduceSn extends BaseBean { ", workOrderNo='" + workOrderNo + '\'' + ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + - ", packageSn='" + packageSn + '\'' + ", snType='" + snType + '\'' + ", tray='" + tray + '\'' + ", resultMsg='" + resultMsg + '\'' + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index dee99d3..b00e8b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -108,6 +108,10 @@ public class MesProduceSnTravel extends BaseBean { @ApiParam("包装条码") private String packageSn; + @Column(name="OPERATE_TYPE") + @ApiParam("操作类型") + private Integer operateType; + @Transient @ApiParam("返回信息") private String resultMsg; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java index 3464fb4..d3ece07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java @@ -28,6 +28,9 @@ public class MesEquTaskPlanModel implements Serializable { @ApiParam("创建提前天数") private Integer daysInAdvance; + @ApiParam("备注") + private String memo; + @ApiParam("生产线") private String workCenterCode; @@ -66,7 +69,7 @@ public class MesEquTaskPlanModel implements Serializable { } - public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -74,6 +77,7 @@ public class MesEquTaskPlanModel implements Serializable { this.taskCycle = taskCycle; this.lastTime = lastTime; this.daysInAdvance = daysInAdvance; + this.memo = memo; this.workCenterCode = workCenterCode; this.equipmentCategory = equipmentCategory; this.organizeCode = organizeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java index b4a23a6..2d5ffd2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java @@ -8,7 +8,9 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Transient; /** * @Description: @@ -60,4 +62,8 @@ public class ProdOrgModel extends BaseBean { @ApiParam("当前级") private Integer level; + + @Transient + @ApiParam("工位类型") + private Integer workCellType; } 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 38beffe..69b01b7 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 @@ -459,7 +459,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean); } if (mesRepair.getRepairType() != null) { - DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean); + DdlPreparedPack.getStringEqualPack(mesRepair.getRepairType(), "repairType", packBean); } if (mesRepair.getIsValid() != null) { DdlPreparedPack.getNumEqualPack(mesRepair.getIsValid(), "isValid", packBean); @@ -880,7 +880,6 @@ public class MesHqlPack { public static DdlPackBean getMesProdCfgExcludeById(MesProdRouteCfg mesProdRouteCfg, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getNumNOEqualPack(mesProdRouteCfg.getId(), "id", packBean); return packBean; @@ -1428,8 +1427,8 @@ public class MesHqlPack { */ public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceCtgyPicture, organizeCode); - if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCtgyCode())) { - DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCtgyCode(), "produceCtgyCode", packBean); + if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCategoryCode())) { + DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCategoryCode(), "produceCtgyCode", packBean); } if (!StringUtils.isEmpty(mesProduceCtgyPicture.getPictureName())) { DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getPictureName(), "pictureName", packBean); @@ -1573,4 +1572,35 @@ public class MesHqlPack { } return packBean; } + + /** + * 维修记录 + * @param mesEquTaskRepairRecord + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquTaskRepairRecord(MesEquTaskRepairRecord mesEquTaskRepairRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquTaskRepairRecord, organizeCode); + if (!StringUtils.isEmpty(mesEquTaskRepairRecord.getEquipmentCode())) { + DdlPreparedPack.getStringEqualPack(mesEquTaskRepairRecord.getEquipmentCode(), "equipmentCode", packBean); + } + return packBean; + } + + /** + * 点检或保养记录 + * @param mesEquTaskStandardRecord + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquTaskStandardRecord(MesEquTaskStandardRecord mesEquTaskStandardRecord, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquTaskStandardRecord, organizeCode); + if (!StringUtils.isEmpty(mesEquTaskStandardRecord.getEquipmentCode())) { + DdlPreparedPack.getStringEqualPack(mesEquTaskStandardRecord.getEquipmentCode(), "equipmentCode", packBean); + } + if (!StringUtils.isEmpty(mesEquTaskStandardRecord.getTaskType())) { + DdlPreparedPack.getNumEqualPack(mesEquTaskStandardRecord.getTaskType(), "taskType", packBean); + } + return packBean; + } } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 7f12b9c..39d9423 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -43,15 +43,22 @@ i3plus.pojo i3plus-pojo-wms + i3plus.pojo i3plus-pojo-form + i3plus.pojo i3plus-pojo-softswitch + + i3plus.pojo + i3plus-pojo-lac + + 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 new file mode 100644 index 0000000..c9fb540 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.model.lac; + +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; +import lombok.Data; +import org.slf4j.LoggerFactory; + +/** + * @Description : lac指令集model + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-10-29 15:29 + * @Modify: + **/ +@Data +public class LacCommandStackModel { + + /** + * 指令集记录id + */ + private Long recordId; + + /** + * 指令集记录 + */ + private LacCommandStackRecord commandStackRecord; + + /** + * 请求数据 + */ + private LacSuitRequest request; + + /** + * 请求XML + */ + private String requestXml; + + /** + * 响应数据 + */ + private LacSuitResponse response; + + /** + * 异常信息 + */ + private Exception exception; + + public void setException(Exception exception){ + LoggerFactory.getLogger("YYYY").error("异常信息：{}",exception); + this.exception = exception; + } + + public void setCommandStackRecord(LacCommandStackRecord commandStackRecord){ + this.commandStackRecord = commandStackRecord; + this.recordId = commandStackRecord.getId(); + } + + public Object getTaskRequestParam(String taskCode){ + for (Task task : this.getRequest().getTaskList()) { + if(task.getCode().equals(taskCode)){ + return task.getParamList(); + } + } + return null; + } + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java new file mode 100644 index 0000000..75964e5 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.model.lac; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; +import java.util.List; + +/** + * @Description : lac 适配请求信息 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-10-29 15:07 + * @Modify: + **/ +@Data +@XStreamAlias("request") +public class LacSuitRequest { + + /** + * 指令集代码 + */ + private String commandStackCode; + + /** + * 参数集合 + */ + private List taskList; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java new file mode 100644 index 0000000..46a58d5 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitResponse.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.model.lac; + +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +/** + * @Description : lac 适配响应信息 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-10-29 15:07 + * @Modify: + **/ +@Data +@XStreamAlias("response") +public class LacSuitResponse { + + /** + * 是否成功 + */ + private boolean success; + + /** + * 状态码 + */ + private String code; + + /** + * 状态信息 + */ + private String message; + + /** + * 返回数据 + */ + private Object result; + + public LacSuitResponse(){ + this.success = true; + this.code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); + this.message = ResourceEnumUtil.MESSAGE.SUCCESS.getDescription(); + } + +} 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 new file mode 100644 index 0000000..839e2e3 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.lac; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-10-29 17:06 + * @Modify: + **/ +@Data +@XStreamAlias("task") +public class Task { + + private String code; + + private Object paramList; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java new file mode 100644 index 0000000..40bc9c6 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/TaskParam.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.model.lac; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamConverter; +import com.thoughtworks.xstream.converters.extended.ToAttributedValueConverter; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-10-29 15:10 + * @Modify: + **/ +@Data +@XStreamAlias("param") +@XStreamConverter(value= ToAttributedValueConverter.class, strings={"value"}) +public class TaskParam { + + private String name; + + private String value; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java index e6e47f3..3dafd66 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java @@ -18,6 +18,8 @@ import java.util.List; @Data public class StationRequestBean implements Serializable { + private static final long serialVersionUID = -8597212451891803174L; + @ApiParam("扫描信息") private String scanInfo; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java index 34409f4..6b7eedd 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java @@ -7,6 +7,9 @@ import java.io.Serializable; @Data public class StepModel implements Serializable { + + private static final long serialVersionUID = -5772746720347236465L; + @ApiParam("工步代码") private String stepCode; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java index d61b983..6f69f3d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -171,6 +171,7 @@ public class UserDetailModel extends BaseBean { user.setUserPhone(this.userPhone); user.setUserLoginPassword(this.userLoginPassword); user.setLanguageCode(this.userLanguageCode); + user.setOrganizeCode(this.organizeCode); return user; } @@ -204,6 +205,7 @@ public class UserDetailModel extends BaseBean { info.setUserPoliticalStatus(this.infoPoliticalStatus); info.setUserGrade(this.infoGrade); info.setUserEmployeeType(this.infoEmployeeType); + info.setOrganizeCode(this.organizeCode); return info; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 66fbc2b..654dbd2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -26,6 +26,7 @@ import javax.persistence.*; @Table(name = "WMS_MOVE_TO_ERP", indexes = { @Index(columnList = "TRANS_TYPE_CODE"), @Index(columnList = "ORDER_NO"), + @Index(columnList = "ITEM"), @Index(columnList = "ORGANIZE_CODE"), @Index(columnList = "PART_NO") }) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 4aaec5c..72b1248 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -89,6 +89,10 @@ public class WmsPoSn extends BaseBean { @ApiParam(value = "收货数量", example = "0") public Double recQty; + @Column(name = "ERP_AREA_NO_ADD") + @ApiParam("默认收货库存地") + private String erpAreaNoAdd; + @ApiParam(value = "供应商名称") @Transient public String vendorNameRdd; 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 b1e3261..c4c545d 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 @@ -262,6 +262,14 @@ public class WmsStockSn extends BaseBean { @Transient private Integer isSnapshot; + @Transient + @ApiParam("临保天数") + private String qualityDay; + + @Transient + @ApiParam("筛选（>=）或<") + private String choose; + public WmsStockSn() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 33e46a0..eee5432 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -76,12 +76,12 @@ public class WmsInterfaceDataMapper extends BaseBean { /** * 目标实体对象的名字，多个字段用半角逗号分隔 */ - @Column(name = "DEST_BEAN_NAME", length = 50) + @Column(name = "DEST_BEAN_NAME", length = 500) public String destBeanName; /** * 目标实体对象判断数据是否存在的一组业务属性名称，多个属性用半角逗号分隔 */ - @Column(name = "DEST_PK_PROPERTIES", length = 50) + @Column(name = "DEST_PK_PROPERTIES", length = 500) public String destPkProperties; /** * 源表字段与目标对象属性的映射关系，List 对象，JSON 格式存储 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 d30e639..dd901c0 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 @@ -889,6 +889,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); if (wmsStockSn.getSnStatus() == null) { DdlPreparedPack.getInPackArray(new Integer[]{ WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(), @@ -1509,6 +1511,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsPoSn, result); @@ -1964,6 +1967,7 @@ 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.getStringNotNullPack("locateNo", result); result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''"); diff --git a/pom.xml b/pom.xml index f355cca..0b2c3eb 100644 --- a/pom.xml +++ b/pom.xml @@ -134,6 +134,12 @@ ${project.version} + + i3plus.pojo + i3plus-pojo-lac + ${project.version} + + com.fasterxml.jackson.core