From bbcd0c8f695ee2e78c09352b5512c89da7ba506b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 25 Aug 2020 13:42:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 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 39932c2..7e2af1b 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 @@ -2591,7 +2591,7 @@ public class MesPcnEnumUtil { RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"), PROCESS_CONTENT("processContent", "过程组件内容"), TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"), - TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"), +// TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"), TIME_MODULE_START("timeModuleStart", "定时组件开始"), TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"), TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"); From 53d392ebe118b71f56c8ffd49cfca12aa3f3ef5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 25 Aug 2020 16:07:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B5=B7=E7=BA=B3=E5=B7=9D=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=E6=9E=AA=E5=A4=B4=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=B9=E6=A1=86=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/model/TorqueHeadChangeModel.java | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueHeadChangeModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueHeadChangeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueHeadChangeModel.java new file mode 100644 index 0000000..ada9108 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueHeadChangeModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author adair.song + * @date 2020/6/16 14:21 + * @desc 枪头更换计数弹框model + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("枪头更换计数弹框model") +public class TorqueHeadChangeModel { + + @ApiParam(name = "确认密码") + private String passWord; + + @ApiParam(name = "工厂") + private String organizeCode; + + @ApiParam(name = "工作中心") + private String workCenterCode; + + @ApiParam(name = "工作单元") + private String workCellCode; + +} From ec7aee68a7fa06b8f07d9a183caa1e993b9455d1 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 25 Aug 2020 18:20:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=9010744=2020011--=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E6=94=B6=E8=B4=A7=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E8=AF=A5=E9=9B=B6=E4=BB=B6=E5=8F=B7=E8=AE=BE=E7=BD=AE=E4=BA=86?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E6=89=B9=E6=AC=A1=EF=BC=8C=E5=88=99=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E7=B3=BB=E7=BB=9F=E8=87=AA=E5=B7=B1=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=9A=84=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=97=B6=E6=B0=B8=E8=BF=9C?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E2=80=9C=E6=9D=A1=E7=A0=81=E6=9C=AA=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E4=BE=9B=E5=BA=94=E5=95=86=E6=89=B9=E6=AC=A1=20?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=88=90=E5=8A=9F=E8=AF=B7=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E2=80=9D=EF=BC=8C=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=B7=B2=E7=BB=8F=E5=AD=98=E5=9C=A8=E4=B8=8E?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B8=AD--0830=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 20 +++++++++++++++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 12 ++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) 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 28a59c5..7d1d04e 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 @@ -173,6 +173,10 @@ public class WmsDocMovementSn extends BaseBean { private String whNo; @Transient + @ApiParam("源仓库") + private String srcWhNo; + + @Transient @ApiParam(value = "ERP单号") private String erpSrcNo; @@ -254,7 +258,20 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, - String version,String vendorNo,Integer snStatus,Double sumQty) { + String version,String whNo,Integer snStatus,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.version = version; + this.whNo = whNo; + this.snStatus = snStatus; + this.sumQty = sumQty; + } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, + String version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; this.lotNo = lotNo; @@ -262,6 +279,7 @@ public class WmsDocMovementSn extends BaseBean { this.partNameRdd = partNameRdd; this.version = version; this.whNo = whNo; + this.srcWhNo = assignSrcWhNo; this.snStatus = snStatus; this.sumQty = sumQty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index 67fd34b..df42ed8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -92,6 +92,18 @@ public class WmsTaskInfo extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") public Integer isCheckSn; + @Column(name = "SYNC_STATUS") + @ApiParam("是否同步") + public Integer syncStatus = 10; + + @Column(name = "SYNC_DATE_TIME") + @ApiParam(value = "同步时间", example = "1") + public String syncDateTime; + + @Column(name = "SYNC_USER") + @ApiParam(value = "同步人", example = "1") + public String syncUser; + @Transient @ApiParam("计划日期") private String zdate;