From 257bd43a8fe9ab4c1a4e3b9c7e11e3dccae8bdb7 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 30 Jun 2021 15:16:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0plc=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index 92cfc51..3581c46 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -69,6 +69,10 @@ public class MesObjectCfg extends BaseBean implements Serializable { @ApiParam("是否显示") private Integer isShow; + @Column(name = "PLC_CODE") + @ApiParam("PLC代码") + private String plcCode; + @Transient @ApiParam("是否存储名") private String isSaveName; From c557d715e42b58919b60dc97bb25b2a73dedaaa0 Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 30 Jun 2021 15:26:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?3578=2020063-=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=88=B0=E8=B4=A7=E7=AA=97=E5=8F=A3=E6=97=B6=E9=97=B4=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF-202106=2016556=2020063-=E6=8E=A5=E5=8F=A3=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=9B=91=E6=8E=A7=E6=8A=A5=E8=A1=A8-=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=95=B0=E6=8D=AE=E5=8F=AA=E6=9F=A5=E8=AF=A2=E6=9C=AA?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsVendorWindow.java | 11 ++++ .../i3plus/pojo/wms/dto/WmsVendorWindowDto.java | 66 ++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsVendorWindowDto.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java index 10e60d3..75e14fb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java @@ -51,4 +51,15 @@ public class WmsVendorWindow extends BaseBean { @Column(name = "WEEK_DAY") @ApiParam(value = "星期") private String weekDay; + + public WmsVendorWindow(WmsVendorWindow wmsVendorWindow) { + this.vendorNo = wmsVendorWindow.getVendorNo(); + this.vendorName = wmsVendorWindow.getVendorName(); + this.windowTime = wmsVendorWindow.getWindowTime(); + this.delayHour = wmsVendorWindow.getDelayHour(); + this.weekDay = wmsVendorWindow.getWeekDay(); + } + + public WmsVendorWindow() { + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsVendorWindowDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsVendorWindowDto.java new file mode 100644 index 0000000..8c2a287 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsVendorWindowDto.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.Column; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +/** + * @Description : WmsVendorWindowDto + * @Author :gsz + * @Date 2021/6/29 16:32 + * @Modify + **/ +@Data +@Api("到货窗口输出类") +public class WmsVendorWindowDto { + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name = "ID") + @ApiParam(value = "主键", example = "0") + public Long id; + + + @ApiParam(value = "窗口时间") + private String vendorWindowTime; + + @ApiParam(value = "星期一供应商") + private String mondayVendor; + + @ApiParam(value = "星期二供应商") + private String tuesdayVendor; + + @ApiParam(value = "星期三供应商") + private String wednesdayVendor; + + @ApiParam(value = "星期四供应商") + private String thursdayVendor; + + @ApiParam(value = "星期五供应商") + private String fridayVendor; + + @ApiParam(value = "星期六供应商") + private String saturdayVendor; + + @ApiParam(value = "星期日供应商") + private String sundayVendor; + + public WmsVendorWindowDto() { + } + + public WmsVendorWindowDto(WmsVendorWindowDto wmsVendorWindowDto) { + this.vendorWindowTime = wmsVendorWindowDto.getVendorWindowTime(); + this.mondayVendor = wmsVendorWindowDto.getMondayVendor(); + this.tuesdayVendor = wmsVendorWindowDto.getTuesdayVendor(); + this.wednesdayVendor = wmsVendorWindowDto.getWednesdayVendor(); + this.thursdayVendor = wmsVendorWindowDto.getThursdayVendor(); + this.fridayVendor = wmsVendorWindowDto.getFridayVendor(); + this.saturdayVendor = wmsVendorWindowDto.getSaturdayVendor(); + this.sundayVendor = wmsVendorWindowDto.getSundayVendor(); + } +} From 9879d6a7b9b855567cddce244ffbb11e1daadab8 Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 30 Jun 2021 15:52:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/platform/AccountExportModel.java | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java 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 new file mode 100644 index 0000000..740c511 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/AccountExportModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.Column; +import java.io.Serializable; + +/** + * @author ns + * @create 2021/6/28 0028 下午 13:26 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel +public class AccountExportModel implements Serializable { + //用户名 登录名 部门 邮箱 手机 登录次数 最后登录时间 状态 + + + @ApiModelProperty(value ="姓名" , access ="名称") + private String infoName; + + + @ApiModelProperty(value ="登陆名称" , access ="登陆名称") + private String userLoginName; + + + @ApiModelProperty(value ="邮箱" , access ="邮箱") + private String userEmail; + + @ApiModelProperty(value ="手机号" , access ="手机号") + private String userPhone; + + @ApiModelProperty(value ="部门名称" , access ="部门名称") + private String departmentNameRdd; + + @ApiParam(value = "登录次数", example = "0") + private Integer userLoginNum; + + @ApiParam(value = "账号最后登录时间") + private String userLoginLastDateTime; + + @ApiParam(value = "账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)", example = "-1") + private Integer userStatus; +}