From f9eac5d6afc04a125dec6d6b3aa20fc208203a55 Mon Sep 17 00:00:00 2001 From: nies Date: Mon, 5 Jul 2021 17:34:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0AccountExportModel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java index 740c511..f5a4e92 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.model.platform; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiParam; @@ -39,12 +41,13 @@ public class AccountExportModel implements Serializable { @ApiModelProperty(value ="部门名称" , access ="部门名称") private String departmentNameRdd; - @ApiParam(value = "登录次数", example = "0") + @ApiModelProperty(value = "登录次数", example = "0") private Integer userLoginNum; - @ApiParam(value = "账号最后登录时间") + @ApiModelProperty(value = "账号最后登录时间") private String userLoginLastDateTime; - @ApiParam(value = "账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)", example = "-1") + @ApiModelProperty(value ="账号状态" , example ="-1") + @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class) private Integer userStatus; } From c3a018dc1f03685b614a4f3049e9093ca429d7ab Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 7 Jul 2021 19:44:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E6=B6=88=E8=80=97?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/model/mgn/bj/PartConsumeCountModel.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/PartConsumeCountModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/PartConsumeCountModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/PartConsumeCountModel.java new file mode 100644 index 0000000..8a27541 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/PartConsumeCountModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 零件消耗数量模型 + * @Reference : + * @Author : dominic + * @CreateDate : 2021/7/1 14:40 + * @Modify: + **/ +@Data +public class PartConsumeCountModel { + + @ApiParam("零件号") + private String partNo; + + @ApiParam("消耗数量") + private Integer consumeQty; + + @ApiParam("需求数量") + private Integer demandQty; +} From e029090e0347a027c5c9eb77183377c4abcea6ea Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 7 Jul 2021 20:13:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8D=97=E9=9D=9E=E9=A2=86=E6=96=99?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=91=BD=E5=90=8D=E8=A7=84=E5=88=99=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=C2=A0=20=E9=9B=B6=E4=BB=B6=E5=8F=B7*yyMMddsequenceNo?= =?UTF-8?q?=20--20210707?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java index acddd7b..e7246eb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsECartOrderNoBuild.java @@ -37,7 +37,7 @@ public class WmsECartOrderNoBuild extends BaseBean { @Column(name = "CREATE_DATE") @ApiParam(value = "创建日期") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private String creatDate; + private String createDate; @Column(name = "SERIAL_NO") @ApiParam(value = "序列号") @@ -47,26 +47,16 @@ public class WmsECartOrderNoBuild extends BaseBean { @Column(name = "DEST_LOCATE_NO") @ApiParam(value = "目标库位") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private Integer destLocateNo; + private String destLocateNo; @Column(name = "SRC_ZONE_NO") @ApiParam(value = "源存储区") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) - private Integer srcZoneNo; + private String srcZoneNo; - public Integer getUnitPrecisionValue(){ - return this.serialNo == null?0:this.serialNo.intValue(); - } - - public WmsECartOrderNoBuild(String partNo, String creatDate, Integer serialNo) { - this.partNo = partNo; - this.creatDate = creatDate; - this.serialNo = serialNo; - } - - public WmsECartOrderNoBuild(String partNo, String creatDate, Integer serialNo, Integer destLocateNo, Integer srcZoneNo) { + public WmsECartOrderNoBuild(String partNo, String createDate, Integer serialNo, String destLocateNo, String srcZoneNo) { this.partNo = partNo; - this.creatDate = creatDate; + this.createDate = createDate; this.serialNo = serialNo; this.destLocateNo = destLocateNo; this.srcZoneNo = srcZoneNo; From 3136ba43b17e14d152350cc7966cbc6cb4f200d2 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 8 Jul 2021 09:32:01 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index f17dccb..a65a085 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -517,6 +517,14 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("完成时间") public String complateDateTime; + @Transient + @ApiParam("供应商名称") + public String vendorName; + + @Transient + @ApiParam(value = "供应商编号") + private String vendorNo; +