From a76d70851d5204252bc14e2ca69de50e55d7b8a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 30 Dec 2019 19:17:12 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=20=E9=80=82?= =?UTF-8?q?=E9=85=8D=E8=AE=B0=E5=BD=95=E5=8F=82=E6=95=B0=20=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 23 +++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index b1a9344..6bf3024 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -4,19 +4,7 @@ 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.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource; -import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKeyParam; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule; -import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; +import cn.estsh.i3plus.pojo.softswitch.bean.*; /** * @Description : @@ -415,7 +403,6 @@ public class SoftSwitchHqlPack { return ddlPackBean; } - public static DdlPackBean packHqlSuitDataDetailBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); @@ -426,4 +413,12 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + + public static DdlPackBean packHqlBsSuitRecordParam(BsSuitRecordParam bsSuitRecordParam){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bsSuitRecordParam.getSuitRecordId(),"suitRecordId",ddlPackBean); + + return ddlPackBean; + } } From b0b671aac01dc388d1c8fd6963263811b1cab88c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 31 Dec 2019 14:18:24 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E9=80=82=E9=85=8D=E5=99=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index a798d8b..806c17b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.annotations.XStreamOmitField; @@ -90,6 +91,7 @@ public class SuitClientModel { /** * 适配报文 */ + @JsonIgnore @XStreamCDATA private Object suitResultMessage; From 9a272f8b6a32378555ab96055cf358de66da91de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 31 Dec 2019 14:39:04 +0800 Subject: [PATCH 03/14] =?UTF-8?q?BUG#6755=EF=BC=9A=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=8D=95=E7=9B=91=E5=90=AC=E9=98=9F=E5=88=97=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=9A=E5=A6=82=E6=9E=9C=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=9A=84=E7=A7=BB=E5=8A=A8=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E7=B1=BB=E5=9E=8B=E9=85=8D=E7=BD=AE=E6=88=90?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=8E=A8=E9=80=81=E5=BC=82=E5=B8=B8=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=85=A8=E5=B1=80=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E2=80=9C=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E2=80=9D=E4=B9=9F=E6=9C=89=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=88=99?= =?UTF-8?q?=E9=9A=8F=E9=80=81=E5=BC=82=E5=B8=B8=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index c6caa7a..107503e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -41,11 +41,11 @@ public class WmsTransType extends BaseBean { private String transTypeName; @Column(name = "SEQ") - @ApiParam(value = "序号", example = "-1") + @ApiParam(value = "序号") private Integer seq; @Column(name = "AG_ID") - @ApiParam(value = "作业流程", example = "-1") + @ApiParam(value = "作业流程") @JsonSerialize(using = ToStringSerializer.class) private Long agId; @@ -66,10 +66,19 @@ public class WmsTransType extends BaseBean { @ApiParam(value = "PDA图标") private String pdaIcon; + @Column(name = "IS_SEND_ERROR_EMAIL", columnDefinition = "int default 2") + @ApiParam(value = "是否发送异常邮件") + private Integer isSendErrorEmail; + @Transient @ApiParam("菜单URL") private String menuUrl; + @Transient + @ApiParam("交易处理组件调用类") + private String callClass; + + public String getMenuUrl() { return "/handle?transTypeCode=" + this.transTypeCode; } From 2eb244c41cad4e52ad4277c1649a9fbb1da18d7e Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 31 Dec 2019 14:44:26 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 20 +++++++++++++++----- .../java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 5 +++++ .../cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java | 10 +++++----- .../java/cn/estsh/i3plus/pojo/aps/holders/EWork.java | 1 + .../src/main/resources/relations/Work.xml | 2 ++ 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 72bec5a..472b69c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -36,12 +36,12 @@ import java.util.List; public class Work extends BaseAPS { @Column(name="CODE") @ApiParam(value ="编码") - @FieldAnnotation(popSearch = true, mainkey = true) + @FieldAnnotation(popSearch = true, mainkey = true, modify = false) private String code; @Column(name="ORDER_ID") @ApiParam(value ="订单") - @FieldAnnotation(relation = "Order") + @FieldAnnotation(relation = "Order", modify = false) private Long orderId; @Column(name="WORK_TYPE") @@ -77,9 +77,10 @@ public class Work extends BaseAPS { @ApiParam(value ="指定数量") private Double specifyCount; - @Column(name="SPECIFY_RESOURCE") - @ApiParam(value ="指定资源") - private String specifyResource; + @Column(name="SPECIFY_RESOURCE_ID") + @ApiParam(value ="指定主资源") + @FieldAnnotation(relation = "SpecifyResource") + private Long specifyResourceId; @Column(name="SPECIFY_PRODUCE_TIME") @ApiParam(value ="指定制造时间") @@ -223,4 +224,13 @@ public class Work extends BaseAPS { @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EWork.WorkPlans); } + + public Resource getSpecifyResource() { + return BeanRelation.get(this, EWork.SpecifyResource); + } + + public void setSpecifyResource(Resource resource) { + this.specifyResourceId = resource != null ? resource.getId() : 0; + BeanRelation.set(this, EWork.SpecifyResource, resource); + } } 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 d63e4a4..455ae2c 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 @@ -113,6 +113,11 @@ public class WorkPlan extends BaseAPS { @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer lockTime; + @Column(name="FORCE_POST_SET_ZERO") + @ApiParam(value ="是否将后设置时间强制设置成0") + @FieldAnnotation(property = false) + private Boolean forcePostSetZero; + @Column(name="WORK_RESOURCE_ID") @ApiParam(value ="工作资源对象id") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 4a5e01f..1bfbecf 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -30,27 +30,27 @@ public class WorkRelation extends BaseAPS { @Column(name="MATERIAL_ID") @ApiParam(value ="物料") - @FieldAnnotation(relation = "Material") + @FieldAnnotation(relation = "Material", modify = false) private Long materialId; @Column(name="PREV_ORDER_ID") @ApiParam(value ="前订单") - @FieldAnnotation(relation = "PrevOrder") + @FieldAnnotation(relation = "PrevOrder", modify = false) private Long prevOrderId; @Column(name="POST_ORDER_ID") @ApiParam(value ="后订单") - @FieldAnnotation(relation = "PostOrder") + @FieldAnnotation(relation = "PostOrder", modify = false) private Long postOrderId; @Column(name="PREV_WORK_ID") @ApiParam(value ="前工作") - @FieldAnnotation(relation = "PrevWork") + @FieldAnnotation(relation = "PrevWork", modify = false) private Long prevWorkId; @Column(name="POST_WORK_ID") @ApiParam(value ="后工作") - @FieldAnnotation(relation = "PostWork") + @FieldAnnotation(relation = "PostWork", modify = false) private Long postWorkId; @Column(name="COUNT", columnDefinition = "decimal(18,8)") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index 240fc04..c9befe8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -12,4 +12,5 @@ public enum EWork { PlanFeedbacks, // 工作计划反馈 MainPlan, // 关联的为主资源的计划 WorkPlans, // 关联的工作计划 + SpecifyResource, // 指定资源 } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index 7e7253e..5c26770 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -18,4 +18,6 @@ + + \ No newline at end of file From 9627b6cf9ec420766d6d3f70f6bdc0eee9eca076 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 31 Dec 2019 17:36:50 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java new file mode 100644 index 0000000..88cd06c --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class GanttOrderModel { + private Long id; + private String code; + private String name; + private List children = new ArrayList<>(); +} From b29347c4097c5f8fb1cbeb769ecf556d7f29fcc1 Mon Sep 17 00:00:00 2001 From: gcj Date: Tue, 31 Dec 2019 17:46:53 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E3=80=90=E5=9D=A4=E6=B3=B0=E8=BF=90?= =?UTF-8?q?=E8=BE=93=E7=AE=A1=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index ca012e6..bdd8cc6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -64,4 +64,10 @@ public class WmsTmsShipDto extends BaseDto implements Serializable { @ApiParam("关联单号") private String refOrderNo; + + @ApiParam("开始时间") + private String createDateTimeStart; + + @ApiParam("结束时间") + private String createDateTimeEnd; } From 011b4d220589484233ecec70f0d386cb64b6a24b Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 1 Jan 2020 00:32:43 +0800 Subject: [PATCH 07/14] =?UTF-8?q?zh20200101=20=E7=8E=B0=E5=9C=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=20BI=20all?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java index 5bc5ca1..9226c3a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -80,7 +80,8 @@ public class MesQcCheckStandard extends BaseBean { public MesQcCheckStandard() { } - public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) { + public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) { + this.id = id; this.partNo = partNo; this.workCenterCode = workCenterCode; this.workCellCode = workCellCode; From a1276b5542e24a3fb00ec0c980adf85080ef3f23 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 2 Jan 2020 10:22:59 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E3=80=90#1338=20=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E7=89=A9=E6=96=99=E4=B8=AD=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 81db268..a0ea3cb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -31,11 +31,11 @@ public class WmsLocatePart extends BaseBean { private static final long serialVersionUID = 9134745988014340144L; @Column(name = "LOCATE_NO") - @ApiParam(value = "库位代码") + @ApiParam(value = "库位编码") private String locateNo; @Column(name = "PART_NO") - @ApiParam(value = "物料编码") + @ApiParam(value = "物料代码") private String partNo; @Column(name = "PART_NAME_RDD") From 7594b3d515f0fd5724e7f40122ff1fd39d070d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 2 Jan 2020 12:08:03 +0800 Subject: [PATCH 09/14] =?UTF-8?q?SAP=E5=8F=96=E6=B6=88=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=EF=BC=9A=E6=8C=89=E8=A1=8C=E5=8F=96=E6=B6=88=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BB=8E=E8=BD=AF=E5=88=A0=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=92=8C=E6=9D=A1=E7=A0=81=E5=8F=98=E4=B8=BA=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86=E5=92=8C=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81=E4=B8=BA=E8=A1=8C=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 6 +++--- .../i3plus/pojo/model/wms/WmsSapDbParamModel.java | 24 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 2 +- 3 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java 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 1e07422..f1d43e0 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 @@ -363,10 +363,10 @@ public class WmsEnumUtil { } /** - * PO条码状态 + * 单据条码状态（PO/DOC_MOVE） */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PO_SN_STATUS { + public enum ORDER_SN_STATUS { CREATE(10, "N", "创建"), RECEIPTED(20, "R", "已完成"), CANCEL(30, "C", "行取消"), @@ -376,7 +376,7 @@ public class WmsEnumUtil { private String code; private String description; - PO_SN_STATUS(int value, String code, String description) { + ORDER_SN_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java new file mode 100644 index 0000000..1c4fdfe --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description SAP DB操作参数Model + * @Reference + * @Author dragon + * @CreateDate 2020/1/2 11:23 + * @Modify + */ +@Data +public class WmsSapDbParamModel implements Serializable { + private static final long serialVersionUID = 5784492509251527816L; + private String organizeCode;//工厂代码 + private String orderNo;//单号 + private String partNo;//物料号 + private String masterTableName;//单据主表名 + private String masterStatusName;//单据状态名 + private String detailsTableName;//单据明细表名 + private String snTableName;//单据条码表名 +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 22fe9f5..3e57d16 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -67,7 +67,7 @@ public class WmsDocMovementSn extends BaseBean { */ @Column(name="SN_STATUS") @ApiParam(value = "操作状态", example = "10") - @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer snStatus; @Column(name="SN") From 42a22d14d38a86b738836ad87c80b5ad9ad64bd4 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 2 Jan 2020 15:06:43 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=AD=97=3D=E5=AD=97=E6=AE=B5=E5=86=97=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/andon/bean/AndonCellAlarmCause.java | 9 ++ .../pojo/andon/bean/AndonCellEventCause.java | 8 ++ .../pojo/andon/bean/AndonCellEventMethod.java | 9 ++ .../i3plus/pojo/andon/bean/AndonManageQueue.java | 4 + .../cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java | 17 ++++ .../estsh/i3plus/pojo/mes/model/QueueJisModel.java | 100 +++++++++++++++++++++ 6 files changed, 147 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java index d79eb4b..9d9df79 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.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 : ANDON_工作单元呼叫原因配置 @@ -45,4 +46,12 @@ public class AndonCellAlarmCause extends BaseBean { @Column(name = "AC_CODE") @ApiParam(value = "事件描述") private String acCode; + + @Transient + @ApiParam(value = "安灯类型名称") + private String alarmCodeName; + + @Transient + @ApiParam(value = "呼叫原因描述") + private String acName; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java index 4f04613..1be0a94 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.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 : ANDON_工作单元事件原因配置 @@ -47,5 +48,12 @@ public class AndonCellEventCause extends BaseBean { @ApiParam(value = "事件原因") private String ecCode; + @Transient + @ApiParam(value = "安灯类型名称") + private String alarmCodeName; + + @Transient + @ApiParam(value = "事件原因描述") + private String ecName; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java index b2f933c..00dea5f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.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 : ANDON_工作单元处理方法配置 @@ -45,4 +46,12 @@ public class AndonCellEventMethod extends BaseBean { @Column(name = "EM_CODE") @ApiParam(value = "处理方法") private String emCode; + + @Transient + @ApiParam(value = "安灯类型名称") + private String alarmCodeName; + + @Transient + @ApiParam(value = "处理方法描述") + private String emName; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 5f6df39..f2be38c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -266,6 +266,10 @@ public class AndonManageQueue extends BaseManageQueue { @ApiParam(value ="生产累计件数") private Integer totalProdNum; + @Transient + @ApiParam(value ="安灯类型名称") + private String alarmCodeName; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java index 828a12a..e9bbc29 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : ANDON_PLC控制 @@ -82,6 +83,22 @@ public class AndonPLC extends BaseBean { @ApiParam(value = "是否安灯") private Integer isAlarmStatus; + @Transient + @ApiParam(value = "安灯类型名称") + private String alarmCodeName; + + @Transient + @ApiParam(value = "生产线名称") + private String workCenterName; + + @Transient + @ApiParam(value = "标签业务类型名称") + private String tagBusinessTypeName; + + @Transient + @ApiParam(value = "是否安灯名称") + private String isAlarmStatusName; + public int getIsAlarmStatusVal(){ if(isAlarmStatus == null){ return 0; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java new file mode 100644 index 0000000..ce42085 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java @@ -0,0 +1,100 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesEquTaskModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("作业任务编号") + private String taskNo; + + @ApiParam("作业类型") + private Integer taskType; + + @ApiParam("作业状态") + private Integer taskStatus; + + @ApiParam(value="生产线") + private String workCenterCode; + + @ApiParam("计划日期") + private String planTime; + + @ApiParam("任务来源") + private Integer taskSource; + + @ApiParam("备注") + private String memo; + + @ApiParam("通知标识") + private Integer notifyFlag; + + @ApiParam("关联任务") + private String relateTask; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("有效性") + public Integer isValid; + + @ApiParam("是否已删除") + public Integer isDeleted; + + @ApiParam("创建用户") + public String createUser; + + @ApiParam("创建日期") + public String createDatetime; + + @ApiParam("修改人") + public String modifyUser; + + @ApiParam("修改日期") + public String modifyDatetime; + + @ApiParam("作业类型") + private String taskTypeName; + + @ApiParam("作业状态") + private String taskStatusName; + + @ApiParam("任务来源") + private String taskSourceName; + + @ApiParam("通知标识") + private String notifyFlagName; + + @ApiParam("mes设备作业任务页面按钮控制") + private MesButtonFlagModel mesButtonFlagModel; + + + public MesEquTaskModel() { + + } + + public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + this.id = id; + this.taskNo = taskNo; + this.taskType = taskType; + this.taskStatus = taskStatus; + this.workCenterCode = workCenterCode; + this.planTime = planTime; + this.taskSource = taskSource; + this.memo = memo; + this.notifyFlag = notifyFlag; + this.relateTask = relateTask; + this.organizeCode = organizeCode; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } +} From a3a5e63baa3629cfa27c85e8c79f3dbcb06e8071 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 2 Jan 2020 15:55:37 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E3=80=90=207194=20Po=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=EF=BC=8C=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E4=B8=AD=E6=96=87=20=E3=80=91bug7194?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 44b26b2..215fb1b 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 @@ -351,7 +351,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result); DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); - + DdlPreparedPack.getNumEqualPack(wmsPart.getIsValuable(), "isValuable",result); getStringBuilderPack(wmsPart, result); return result; @@ -2677,4 +2677,19 @@ public class WmsHqlPack { return result; } + /** + * 根据条件查询dataAuth + * + * @param wmsSnOperateRecord + * @return + */ + public static DdlPackBean packHqlWmsSnOperateRecord(WmsSnOperateRecord wmsSnOperateRecord) { + DdlPackBean result = new DdlPackBean(); + if (!Strings.isNullOrEmpty(wmsSnOperateRecord.getSn())) { + DdlPreparedPack.getStringEqualPack(wmsSnOperateRecord.getSn(), "sn", result); + } + getStringBuilderPack(wmsSnOperateRecord, result); + return result; + } + } From 0d2df2ec43500ed2357c9a72526de9d61554b735 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 2 Jan 2020 16:28:03 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E3=80=90=207194=20Po=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=EF=BC=8C=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E4=B8=AD=E6=96=87=20=E3=80=91bug7194?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 370667a..0f31d20 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 @@ -171,7 +171,7 @@ public class WmsPart extends BaseBean { private Double proportion; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") - @ApiParam(value = "贵重物料") + @ApiParam(value = "是否贵重") @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; From 76c84631ab4245670e2cf8a5dd20eebb87195569 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 2 Jan 2020 16:51:05 +0800 Subject: [PATCH 13/14] revise class name --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java index ce42085..be4145b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java @@ -6,7 +6,7 @@ import lombok.Data; import java.io.Serializable; @Data -public class MesEquTaskModel implements Serializable { +public class QueueJisModel implements Serializable { @ApiParam("id") private Long id; @@ -74,11 +74,11 @@ public class MesEquTaskModel implements Serializable { private MesButtonFlagModel mesButtonFlagModel; - public MesEquTaskModel() { + public QueueJisModel() { } - public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public QueueJisModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.id = id; this.taskNo = taskNo; this.taskType = taskType; From a57d90ce7d10bc90fc041752f9b330f0f811cbb4 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 2 Jan 2020 16:58:23 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/model/QueueJisModel.java | 100 --------------------- 1 file changed, 100 deletions(-) delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java deleted file mode 100644 index ce42085..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java +++ /dev/null @@ -1,100 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class MesEquTaskModel implements Serializable { - @ApiParam("id") - private Long id; - - @ApiParam("作业任务编号") - private String taskNo; - - @ApiParam("作业类型") - private Integer taskType; - - @ApiParam("作业状态") - private Integer taskStatus; - - @ApiParam(value="生产线") - private String workCenterCode; - - @ApiParam("计划日期") - private String planTime; - - @ApiParam("任务来源") - private Integer taskSource; - - @ApiParam("备注") - private String memo; - - @ApiParam("通知标识") - private Integer notifyFlag; - - @ApiParam("关联任务") - private String relateTask; - - @ApiParam("组织代码") - public String organizeCode; - - @ApiParam("有效性") - public Integer isValid; - - @ApiParam("是否已删除") - public Integer isDeleted; - - @ApiParam("创建用户") - public String createUser; - - @ApiParam("创建日期") - public String createDatetime; - - @ApiParam("修改人") - public String modifyUser; - - @ApiParam("修改日期") - public String modifyDatetime; - - @ApiParam("作业类型") - private String taskTypeName; - - @ApiParam("作业状态") - private String taskStatusName; - - @ApiParam("任务来源") - private String taskSourceName; - - @ApiParam("通知标识") - private String notifyFlagName; - - @ApiParam("mes设备作业任务页面按钮控制") - private MesButtonFlagModel mesButtonFlagModel; - - - public MesEquTaskModel() { - - } - - public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { - this.id = id; - this.taskNo = taskNo; - this.taskType = taskType; - this.taskStatus = taskStatus; - this.workCenterCode = workCenterCode; - this.planTime = planTime; - this.taskSource = taskSource; - this.memo = memo; - this.notifyFlag = notifyFlag; - this.relateTask = relateTask; - this.organizeCode = organizeCode; - this.isValid = isValid; - this.isDeleted = isDeleted; - this.createUser = createUser; - this.createDatetime = createDatetime; - this.modifyUser = modifyUser; - this.modifyDatetime = modifyDatetime; - } -}