From 6929e8857089842bcbce468085dd4a330490eb09 Mon Sep 17 00:00:00 2001 From: wangjie Date: Fri, 30 Aug 2019 11:47:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?mes-pcn=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 39 +++++++++++++++++++++- .../estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java | 12 +++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java | 12 +++++++ 3 files changed, 62 insertions(+), 1 deletion(-) 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 ec57bec..4643e50 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 @@ -12,8 +12,45 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesPcnEnumUtil { /** + * mes-pcn定时任务状态 + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PCN_TASK_STATUS{ + + OPEN(1,"OPEN"), + CLOSE(2,"CLOSE"); + + private int value; + private String description; + + MES_PCN_TASK_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-pcn定时任务同步结果状态 - * 10. + * */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_PCN_TASK_SYNC_STATUS{ diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java index 0ccb531..054bb21 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java @@ -37,6 +37,10 @@ public class MesPcnTask extends BaseBean { @ApiParam("任务名称") private String taskName; + @Column(name="TASK_GROUP_NAME") + @ApiParam("任务组名称") + private String taskGroupName; + @Column(name="TASK_DESCRIPTION") @ApiParam("任务描述") private String taskDescription; @@ -69,7 +73,15 @@ public class MesPcnTask extends BaseBean { @ApiParam("任务周期描述") private String taskCycleDescription; + @Column(name="TASK_STATUS") + @ApiParam("任务状态") + private Integer taskStatus; + public int getTaskTypeVal() { return this.taskType == null ? 0 : this.taskType; } + + public int getTaskStatusVal() { + return this.taskStatus == null ? 0 : this.taskStatus; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java index 27daf23..5f2e53d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -37,6 +37,10 @@ public class MesPcnTask extends BaseBean { @ApiParam("任务名称") private String taskName; + @Column(name="TASK_GROUP_NAME") + @ApiParam("任务组名称") + private String taskGroupName; + @Column(name="TASK_DESCRIPTION") @ApiParam("任务描述") private String taskDescription; @@ -69,7 +73,15 @@ public class MesPcnTask extends BaseBean { @ApiParam("任务周期描述") private String taskCycleDescription; + @Column(name="TASK_STATUS") + @ApiParam("任务状态") + private Integer taskStatus; + public int getTaskTypeVal() { return this.taskType == null ? 0 : this.taskType; } + + public int getTaskStatusVal() { + return this.taskStatus == null ? 0 : this.taskStatus; + } } From d7ddf4d5a06a318f62d6f702f12382629f843fd6 Mon Sep 17 00:00:00 2001 From: wangjie Date: Fri, 30 Aug 2019 14:21:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?mes-pcn=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E6=97=A5=E5=BF=97=E8=A1=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java index 9a0d1d1..8b5c605 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java @@ -43,7 +43,7 @@ public class MesPcnTaskLog extends BaseBean { @Column(name="ERROR_CONTENT") @ApiParam("异常内容") - private String errorContent; + private Long errorContent; public int getSyncStatusVal() { return this.syncStatus == null ? 0 : this.syncStatus; From ac1090d6614e5eeb3b16e0723c97ad71db8a8271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 30 Aug 2019 14:42:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index d3a23e6..d80e4b2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -177,7 +177,8 @@ public class WmsMoveDetails extends BaseBean { public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo, String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo, - Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode){ + Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode, + String createUser,String createDatetime){ this.organizeCode = organizeCode; this.partNo = partNo; this.orderNo = orderNo; @@ -199,5 +200,7 @@ public class WmsMoveDetails extends BaseBean { this.vendorNo = vendorNo; this.custNo = custNo; this.busiTypeCode = busiTypeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index fb9ac40..8a6324a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -142,7 +142,7 @@ public class WmsMoveMaster extends BaseBean { public WmsMoveMaster(){}; public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, - String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode) { + String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc) { this.id = id; this.orderNo = orderNo; this.organizeCode = organizeCode; @@ -160,5 +160,6 @@ public class WmsMoveMaster extends BaseBean { this.rejectQty = rejectQty; this.fixId = fixId; this.busiTypeCode = busiTypeCode; + this.refSrc = refSrc; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 2b3be7c..bc36b7c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -211,7 +211,8 @@ public class WmsMoveSn extends BaseBean { } public WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd, String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus, - Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode,String sn){ + Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode,String sn, + String createUser,String createDatetime){ this.organizeCode=organizeCode; this.orderNo=orderNo; this.item=item; @@ -237,5 +238,7 @@ public class WmsMoveSn extends BaseBean { this.destWhNo =destWhNo; this.busiTypeCode = busiTypeCode; this.sn = sn; + this.createUser = createUser; + this.createDatetime = createDatetime; } }