From 0824a58ead0ad6f5a80513251b1cdbf7ba6908bf Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 24 Oct 2019 21:03:08 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E8=87=AA=E5=A4=84=E7=90=86job,=20=E5=B9=BF=E6=92=AD=E6=92=AD?= =?UTF-8?q?=E6=8A=A5=E5=86=85=E5=AE=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java | 6 ++++++ .../main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 1 + 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java index ffdeef2..819f768 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.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 : ANDON_自处理配置 @@ -67,4 +69,8 @@ public class AndonDisposalCfg extends BaseBean { @Column(name = "FLOW_MEMO") @ApiParam(value = "审批意见") private String flowMemo; + + @Transient + @ApiParam(value = "审批意见集合") + private Integer[] flowStatusArray; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 833ebed..15572d5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -388,6 +388,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getWorkCellCode(),"workCellCode", result); DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAlarmCode(),"alarmCode", result); DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAcCode(),"acCode", result); + DdlPreparedPack.getInPackArray(andonDisposalCfg.getFlowStatusArray(), "flowStatus", result); DdlPreparedPack.getNumEqualPack(andonDisposalCfg.getFlowStatus(),"flowStatus", result); getStringBuilderPack(andonDisposalCfg, result); From a880160f3d57665249d517aeabb9eb912a1d45f0 Mon Sep 17 00:00:00 2001 From: "changjiang.gao" Date: Fri, 25 Oct 2019 10:28:46 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E3=80=91bug=206104?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 ac86f7e..b55e892 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 @@ -30,12 +30,12 @@ public class WmsInterfaceDataMapper extends BaseBean { * 排序编号 */ @Column(name = "SEQ") - public int seq; + public Integer seq; /** * 来源表的每次查询记录数，防止大量数据造成内存溢出 */ @Column(name = "SRC_GET_LIMIT") - public int srcGetLimit; + public Integer srcGetLimit; /** * 接口数据源编号（在动态表单中配置） */ @@ -132,23 +132,23 @@ public class WmsInterfaceDataMapper extends BaseBean { * 调用脚本方法获取数据 */ @Column(name = "USE_SCRIPT_PULL") - public int useScriptPull; + public Integer useScriptPull; /** * 调用脚本方法保存数据 */ - @Column(name = "USE_SCRIPT_PUSH") - public int useScriptPush; + @Column(name = "USE_SCRIPT_PUSH") + public Integer useScriptPush; /** * 调用脚本方法更新同步标志 */ @Column(name = "USE_SCRIPT_MARK") - public int useScriptMark; + public Integer useScriptMark; /** * 调用脚本方法过滤数据（查询来源数据后过滤） */ @Column(name = "USE_SCRIPT_FILTER") - public int useScriptFilter; + public Integer useScriptFilter; } From caf6dc17ab366beba3d6282ef8fdabfb91320260 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 25 Oct 2019 10:52:15 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E3=80=90NC=E5=86=BB=E7=BB=93=E3=80=91nc?= =?UTF-8?q?=E5=86=BB=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 1 + 1 file changed, 1 insertion(+) 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 822a771..332fe96 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 @@ -797,6 +797,7 @@ public class WmsEnumUtil { VDAREPORT("VDAREPORT", "VDA生产报工"), VDA_FINISH_GOODS("VDA_FINISH_GOODS", "VDA生产快速入库"), VDA_PICKING_GOODS("VDA_PICKING_GOODS", "VDA生产领料"), + VDA_NC_FREEZE("VDA_NC_FREEZE", "VDA_NC冻结"), VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"); private String value; From a537daee62ffcdf16521a4a0190ad3d60315246d Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 25 Oct 2019 10:55:53 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=8D=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=9C=89=E6=95=88=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 457b27d..5ed2462 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -67,7 +67,7 @@ public abstract class BaseBean implements Serializable { @Column(name="IS_VALID") @ApiParam(value = "有效性",example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED") From e5b5891d2311bbf8b938fae62e47ad06f5b4ef25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 25 Oct 2019 11:48:02 +0800 Subject: [PATCH 05/12] =?UTF-8?q?bom=E4=BF=A1=E6=81=AF=E4=B8=AD=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=86=97=E4=BD=99=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 13 +++++++++++++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 16 ++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index dfdad1f..01b1fea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -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 : @@ -84,6 +85,18 @@ public class WmsBom extends BaseBean { @Column(name = "EFF_END_TIME") private String effEndTime; + @ApiParam(value = "目标存储区") + @Transient + public String destZoneNo; + + @ApiParam(value = "交易类型") + @Transient + public String transTypeCode; + + @ApiParam(value = "线路代码") + @Transient + public String routingCode; + public Double getQty() { return this.qty == null ? 0 : this.qty.doubleValue(); } 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 46d6355..d30e639 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 @@ -2460,4 +2460,20 @@ public class WmsHqlPack { return result; } + + /** + * 根据父物料查询子物料的bom信息 + * + * @param wmsBom + * @return + */ + public static DdlPackBean packHqlWmsBomByItemPartNo(WmsBom wmsBom) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsBom.getPartNo(), "partNo", result); + + getStringBuilderPack(wmsBom, result); + + return result; + } } From 4c6f0b0d5716bb73c7d5711de3fc1beb88aa31d6 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 25 Oct 2019 13:00:37 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20CRUD=20Base?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java | 4 ++++ 1 file changed, 4 insertions(+) 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 4a864be..7a42440 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 @@ -88,4 +88,8 @@ public class LacCommandStackRecord extends BaseBean { @ApiParam(value ="执行状态") private Integer stackStatus; + @Column(name="EXECUTION_DESCRIPTION") + @ApiParam(value ="执行说明") + private String executionDescription; + } From ca0cf21a7c5277fb720ac2ff57ab89a803842bb0 Mon Sep 17 00:00:00 2001 From: lpx Date: Fri, 25 Oct 2019 13:21:40 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E3=80=90NC=E8=A7=A3=E5=86=BB-4.2=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=A4=8D=E7=94=A8=E3=80=91PR12-01~PR12-02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 332fe96..9546754 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 @@ -798,7 +798,8 @@ public class WmsEnumUtil { VDA_FINISH_GOODS("VDA_FINISH_GOODS", "VDA生产快速入库"), 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_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"), + VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"); private String value; private String description; From 16162542ba495392a633775bd93764f39e59e8c5 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 25 Oct 2019 13:47:02 +0800 Subject: [PATCH 08/12] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9listByPage?= =?UTF-8?q?=E7=94=B1GET=E6=96=B9=E6=B3=95=E4=B8=BAPOST=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 8 +++---- .../cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java | 15 +++++++++++++ .../cn/estsh/i3plus/pojo/aps/model/APSPager.java | 26 +++++++++++++++++++++- 3 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java 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 08be72e..95b5a20 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 @@ -42,7 +42,7 @@ public class WorkPlan extends BaseAPS { @Column(name="PREV_SET_TIME") @ApiParam(value ="前设置时间") - private Long prevSetTime; + private Integer prevSetTime; @Column(name="PRODUCE_BEGIN") @ApiParam(value ="生产开始时间") @@ -54,7 +54,7 @@ public class WorkPlan extends BaseAPS { @Column(name="PRODUCE_TIME") @ApiParam(value ="生产时间") - private Long produceTime; + private Integer produceTime; @Column(name="POST_SET_BEGIN") @ApiParam(value ="后设置开始时间") @@ -66,7 +66,7 @@ public class WorkPlan extends BaseAPS { @Column(name="POST_SET_TIME") @ApiParam(value ="后设置时间") - private Long postSetTime; + private Integer postSetTime; @Column(name="LOCK_BEGIN") @ApiParam(value ="锁定开始时间") @@ -78,7 +78,7 @@ public class WorkPlan extends BaseAPS { @Column(name="LOCK_TIME") @ApiParam(value ="锁定时间") - private Long lockTime; + private Integer lockTime; @Column(name="WORK_ID") @ApiParam(value ="工作对象id") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java new file mode 100644 index 0000000..8218c5b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +/** + * @Description :工作计划包含的时间类型 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +public enum PLAN_TYPE { + PREV_SET, + PRODUCE, + POST_SET, + LOCK +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java index 2cc398b..97f2c22 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java @@ -3,8 +3,32 @@ package cn.estsh.i3plus.pojo.aps.model; import cn.estsh.i3plus.pojo.base.common.Pager; import lombok.Data; +import java.util.List; + @Data public class APSPager extends Pager { + public static class SortData { + // 排序对象 + private String name; + // 排序类型，1为升序，0为降序 + private int orderType; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getOrderType() { + return orderType; + } + + public void setOrderType(int orderType) { + this.orderType = orderType; + } + } private String filter; - private String sort; + private List sorts; } From 2906667856cc9805b34bfb6d951072b066287cea Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 25 Oct 2019 15:01:00 +0800 Subject: [PATCH 09/12] =?UTF-8?q?mes=E5=AE=9A=E6=97=B6=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=AE=89=E7=81=AF=E4=BB=BB=E5=8A=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/andon/AndonManageQueueSyncModel.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonManageQueueSyncModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonManageQueueSyncModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonManageQueueSyncModel.java new file mode 100644 index 0000000..cf2a454 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonManageQueueSyncModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.model.andon; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description: mes定时获取安灯安灯任务信息请求DTO + * @Reference: + * @Author: Crish + * @CreateDate:2019-10-25-14:40 + * @Modify: + **/ +@Data +public class AndonManageQueueSyncModel{ + + @ApiParam("同步时间") + private String syscTime; + + @ApiParam("安灯状态") + private List statusList; + + @ApiParam("组织代码") + private String organizeCode; +} From a90aa8498f435f3b83b96a53af376a7dc0d71504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 25 Oct 2019 15:39:53 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E3=80=90int=E3=80=91?= =?UTF-8?q?=E6=94=B9=E6=88=90=E3=80=90Integer=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 ac86f7e..33e46a0 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 @@ -30,12 +30,12 @@ public class WmsInterfaceDataMapper extends BaseBean { * 排序编号 */ @Column(name = "SEQ") - public int seq; + public Integer seq; /** * 来源表的每次查询记录数，防止大量数据造成内存溢出 */ @Column(name = "SRC_GET_LIMIT") - public int srcGetLimit; + public Integer srcGetLimit; /** * 接口数据源编号（在动态表单中配置） */ @@ -132,23 +132,23 @@ public class WmsInterfaceDataMapper extends BaseBean { * 调用脚本方法获取数据 */ @Column(name = "USE_SCRIPT_PULL") - public int useScriptPull; + public Integer useScriptPull; /** * 调用脚本方法保存数据 */ @Column(name = "USE_SCRIPT_PUSH") - public int useScriptPush; + public Integer useScriptPush; /** * 调用脚本方法更新同步标志 */ @Column(name = "USE_SCRIPT_MARK") - public int useScriptMark; + public Integer useScriptMark; /** * 调用脚本方法过滤数据（查询来源数据后过滤） */ @Column(name = "USE_SCRIPT_FILTER") - public int useScriptFilter; + public Integer useScriptFilter; } From 3e9cc950178934473329c0caa3fd24d77cb45c47 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 25 Oct 2019 15:50:29 +0800 Subject: [PATCH 11/12] =?UTF-8?q?pojo-model=E5=8A=A0=E5=85=A5andon-pojo?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-model/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39a7704..7f12b9c 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -36,6 +36,11 @@ i3plus.pojo + i3plus-pojo-andon + + + + i3plus.pojo i3plus-pojo-wms From 00e849a62edbd9e6a7350a256874ca97e17d4613 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 25 Oct 2019 20:00:06 +0800 Subject: [PATCH 12/12] =?UTF-8?q?(1089=20=E8=BF=87=E7=A8=8B=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E6=A3=80=E6=B5=8B=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=9B1090=20=E8=BF=94=E5=8E=82=E8=BF=94=E4=BF=AE=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=95=B0=E6=8D=AE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 189 +++++++++++++++++++-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 162 ++++++++++++++++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java | 10 ++ .../i3plus/pojo/mes/pcn/bean/MesDefectRecord.java | 7 +- .../pojo/mes/pcn/bean/MesDismantleRecord.java | 2 +- .../pojo/mes/pcn/bean/MesProdBindRecord.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 2 +- .../estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesRepairRecord.java | 16 +- .../i3plus/pojo/mes/pcn/bean/MesScrapRecord.java | 4 +- .../i3plus/pojo/mes/pcn/bean/MesWorkCell.java | 2 +- .../i3plus/pojo/mes/pcn/model/MesDefectModel.java | 31 ++++ .../i3plus/pojo/mes/pcn/model/MesPartBomModel.java | 36 ---- .../pojo/mes/pcn/model/MesProcessBomModel.java | 61 +++++++ .../pojo/mes/pcn/model/MesProdBindRecordModel.java | 59 +++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesRepair.java | 2 +- .../i3plus/pojo/mes/bean/MesRepairRecord.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesScrapRecord.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 2 +- 19 files changed, 526 insertions(+), 67 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java 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 15ae3e1..1d8aa2a 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,159 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * mes 图片面位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_SIDE_LOCATION { + + A_SIDE(10, "A面"), + B_SIDE(20, "B面"), + C_SIDE(30, "C面"), + D_SIDE(40, "D面"); + + private int value; + private String description; + + MES_SIDE_LOCATION(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; + } + + } + + /** + * mes缺陷类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DEFECT_TYPE { + + DEFECT_TYPE1(10, "缺陷类型1"), + DEFECT_TYPE2(20, "缺陷类型2"), + DEFECT_TYPE3(30, "缺陷类型3"); + + private int value; + private String description; + + MES_DEFECT_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; + } + + } + + /** + * mes类型信息，业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_TYPE_CFG_BUSIN_TYPE { + + BUSIN_TYPE1(10, "业务类型1"), + BUSIN_TYPE2(20, "业务类型2"), + BUSIN_TYPE3(30, "业务类型3"); + + private int value; + private String description; + + MES_TYPE_CFG_BUSIN_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; + } + + } + + /** + * mes缺陷原因类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DEFECT_CAUSE_TYPE { + + QUALITY_DEFECTS(10, "质量缺陷"), + PROCESS_DEFECTS(20, "工艺缺陷"), + EQUIPMENT_DEFECT(30, "设备缺陷"); + + private int value; + private String description; + + MES_DEFECT_CAUSE_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; + } + + } + + /** * mes设备作业任务明细-执行状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -452,8 +605,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_WORK_CELL_TYPE { - NORMAL(1, "正常"), - REWORK(2, "返修"); + NORMAL(10, "正常"), + REWORK(20, "返修"); private int value; private String description; @@ -500,8 +653,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_ACTION_TYPE { - BIND(1, "绑定"), - UNTYING(2, "解绑"); + BIND(10, "绑定"), + UNTYING(20, "解绑"); private int value; private String description; @@ -548,8 +701,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_IS_KEY { - IS_KEY(1, "是"), - NO_KEY(2, "否"); + IS_KEY(10, "是"), + NO_KEY(20, "否"); private int value; private String description; @@ -596,8 +749,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_REPAIR_STATUS { - REPAIRED(1, "已维修"), - NO_REPAIR(2, "待维修"); + REPAIRED(10, "已维修"), + NO_REPAIR(20, "待维修"); private int value; private String description; @@ -644,11 +797,11 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_OPERATE_TYPE { - WORKSTATION_SCAN(1, "工位扫描"), - QUALITY_JUDGEMENT(2, "质量判定"), - MATERIAL_DISMANTLING(3, "物料拆解"), - REWORK(4, "返修作业"), - WORKSTATION_MONITORING(5, "工位监控"); + WORKSTATION_SCAN(10, "工位扫描"), + QUALITY_JUDGEMENT(20, "质量判定"), + MATERIAL_DISMANTLING(30, "物料拆解"), + REWORK(40, "返修作业"), + WORKSTATION_MONITORING(50, "工位监控"); private int value; private String description; @@ -1323,9 +1476,7 @@ public class MesEnumUtil { public enum PASS_FAIL { PASS(1, "合格"), - FAIL(2, "不合格"), - SCRAP(3, "报废"), - DISMANTLED(4, "已拆解"); + FAIL(2, "不合格"); private int value; private String description; @@ -1796,7 +1947,8 @@ public class MesEnumUtil { QUALIFIED(10, "合格"), DEFECTED(20, "不合格"), - SCRAPED(30, "报废"); + SCRAPED(30, "报废"), + DISMANTLED(40, "已拆解"); private int value; private String description; @@ -2104,7 +2256,8 @@ public class MesEnumUtil { UPDATE_SYNC_TIME(50, "UPDATE_SYNC_TIME"), PCN_PULL(60, "PCN_PULL"), PCN_PUSH(70, "PCN_PUSH"), - FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"); + FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"), + REWORK_REPAIR(90, "REWORK_REPAIR"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 34ce4d8..c6a96dc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -13,6 +13,168 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * mes缺陷原因类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DEFECT_CAUSE_TYPE { + + QUALITY_DEFECTS(10, "质量缺陷"), + PROCESS_DEFECTS(20, "工艺缺陷"), + EQUIPMENT_DEFECT(30, "设备缺陷"); + + private int value; + private String description; + + MES_DEFECT_CAUSE_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; + } + + } + + + /** + * mes 图片面位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_SIDE_LOCATION { + + A_SIDE(10, "A面"), + B_SIDE(20, "B面"), + C_SIDE(30, "C面"), + D_SIDE(40, "D面"); + + private int value; + private String description; + + MES_SIDE_LOCATION(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; + } + + } + + /** + * mes 维修状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_REPAIR_STATUS { + + REPAIRED(10, "已维修"), + NO_REPAIR(20, "待维修"); + + private int value; + private String description; + + MES_REPAIR_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; + } + + } + + /** + * mes过程质量检测类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QC_CHECK_TYPE { + + FIRST_CHECK(10, "首检"), + ON_SITE_CHECK(20, "巡检"), + END_CHECK(30, "尾检"); + + private int value; + private String description; + + MES_QC_CHECK_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 Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * mes-pcn定时任务状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java index 09d4d3d..fa5a461 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java @@ -11,6 +11,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: @@ -39,4 +41,12 @@ public class MesDefect extends BaseBean { @Column(name = "DEFECT_TYPE") @ApiParam("缺陷类型") private String defectType; + + @Transient + @ApiParam("缺陷位置") + private String defectLocation; + + @Transient + @ApiParam("缺陷类型子集") + private List mesDefectList; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java index 72d0b14..53f4b36 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java @@ -11,6 +11,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: @@ -49,7 +51,7 @@ public class MesDefectRecord extends BaseBean { @Column(name="DEFECT_LOCATION") @ApiParam("缺陷位置") - private Integer defectLocation; + private String defectLocation; @Column(name="REPAIR_STATUS") @ApiParam("维修状态") @@ -66,4 +68,7 @@ public class MesDefectRecord extends BaseBean { @Column(name="MEMO") @ApiParam("备注") private String memo; + + @Transient + private List mesDefectList; } 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 a114b7a..2775754 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 @@ -82,5 +82,5 @@ public class MesDismantleRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; } 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 d708cb3..abb7861 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 @@ -87,7 +87,7 @@ public class MesProdBindRecord extends BaseBean { @Column(name = "IS_KEY") @ApiParam(value = "是否关键件") - private String isKey; + private Integer isKey; @Column(name = "ACTION_TYPE") @ApiParam(value = "动作类型") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java index 43d8681..26bccb6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java @@ -80,7 +80,7 @@ public class MesQcCheckData extends BaseBean { @Column(name = "QTY") @ApiParam("产品数量") - private String qty; + private Integer qty; @Column(name = "MEMO") @ApiParam("备注") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java index 77c5220..9753ac8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java @@ -34,7 +34,7 @@ public class MesRepair extends BaseBean { @Column(name = "REPAIR_NAME") @ApiParam("维修名称") - private String repariName; + private String repairName; @Column(name = "REPAIR_TYPE") @ApiParam("维修类型") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java index a3ce644..92c37be 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java @@ -11,6 +11,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: @@ -82,5 +84,17 @@ public class MesRepairRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; + + @Transient + @ApiParam("备注") + private String spareMemo; + + @Transient + @ApiParam("不良记录id") + private Long defectRecordId; + + @Transient + @ApiParam("缺陷集合") + private List mesDefectList; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java index e83ca89..2c60f7a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java @@ -46,7 +46,7 @@ public class MesScrapRecord extends BaseBean { @Column(name = "SCRAP_CODE") @ApiParam("报废代码") - private String repairCode; + private String scrapCode; @Column(name = "SCRAP_NAME") @ApiParam("报废名称") @@ -66,5 +66,5 @@ public class MesScrapRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java index 753c9cb..efcf8fd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java @@ -45,5 +45,5 @@ public class MesWorkCell extends BaseBean { @Column(name = "WORK_CELL_TYPE") @ApiParam("工位类型") - private String workCellType; + private Integer workCellType; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java new file mode 100644 index 0000000..b9acba1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class MesDefectModel { + + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷类型") + private String defectType; + + @Transient + @ApiParam("缺陷分类子集") + private List mesDefectList; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java deleted file mode 100644 index 0f0fccd..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\18 19:15 - * @Modify: - **/ -@Data -@Api("mes 物料BOM") -public class MesPartBomModel { - - @ApiParam("物料编号") - private String partNo; - - @ApiParam("物料名称") - private String partName; - - @ApiParam("数量") - private Integer qty; - - public MesPartBomModel() { - - } - - public MesPartBomModel(String partNo, String partName, Integer qty) { - this.partNo = partNo; - this.partName = partName; - this.qty = qty; - } -} 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 new file mode 100644 index 0000000..11940aa --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class MesProcessBomModel { + + private Long id; + @ApiParam("子物料编码") + private String itemPartNo; + @ApiParam("子物料名称") + private String itemPartName; + @ApiParam("产品数量") + private Double qty; + private Integer isValid; + private Integer isDeleted; + private String organizeCode; + private Integer isFeed; + private String workCenterCode; + private String workCellCode; + @ApiParam("拆解数") + private Double dismantleQty; + + @ApiParam("产品物料编码") + private String parentPartNo; + @ApiParam("产品物料名称") + private String parentPartName; + @ApiParam("合格数") + private Integer okQty; + @ApiParam("缺失数") + private Integer missQty; + @ApiParam("报废数") + private Integer scrapQty; + + public MesProcessBomModel() { + + } + + public MesProcessBomModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { + this.id = id; + 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 new file mode 100644 index 0000000..9dece32 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:05 + * @Modify: + **/ +@Data +public class MesProdBindRecordModel { + private Long id; + private String itemPartNo; + private String itemPartName; + private Double qty; + private Integer isValid; + private Integer isDeleted; + private String organizeCode; + private Integer isFeed; + private String workCenterCode; + private String workCellCode; + private String kpSn; + @ApiParam("拆解数") + private Double dismantleQty; + + @ApiParam("产品物料编码") + private String parentPartNo; + @ApiParam("产品物料名称") + private String parentPartName; + @ApiParam("合格数") + private Integer okQty; + @ApiParam("缺失数") + private Integer missQty; + @ApiParam("报废数") + private Integer scrapQty; + public 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) { + this.id = id; + 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.kpSn = kpSn; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + this.dismantleQty = dismantleQty; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java index 98709ec..08f1544 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java @@ -38,5 +38,5 @@ public class MesRepair extends BaseBean { @Column(name = "REPAIR_TYPE") @ApiParam("维修类型") - private Integer repairType; + private String repairType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java index ba6331c..5e3e15f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java @@ -82,5 +82,5 @@ public class MesRepairRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java index 4dd7e2c..22086da 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java @@ -62,5 +62,5 @@ public class MesScrapRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 68ef0b4..b0992b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -49,7 +49,7 @@ public class MesWorkCell extends BaseBean { @Column(name = "WORK_CELL_TYPE") @ApiParam("工位类型") - private String workCellType; + private Integer workCellType; @Transient @ApiParam(value = "子集列表")