From e0277363645a08019518a8635fd9e748e4a50a78 Mon Sep 17 00:00:00 2001 From: gsz Date: Mon, 28 Jun 2021 09:31:06 +0800 Subject: [PATCH 1/8] =?UTF-8?q?16409=2020063-PDA=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E9=A2=86=E6=96=99=E4=BB=BB=E5=8A=A1-=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AD=90=E9=9B=B6=E4=BB=B6=E5=92=8C=E6=9B=BF?= =?UTF-8?q?=E4=BB=A3=E6=96=99=E7=BB=B4=E6=8A=A4=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 9f83850..59aa838 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -257,6 +257,15 @@ public class WmsMoveToERP extends BaseBean { @Transient private Double transQtySum; + @Transient + private Integer totalNum; + + @Transient + private Integer successNum; + + @Transient + private Integer falseNum; + public Double getTransQtySumVal() { return this.transQtySum == null ? 0 : this.transQtySum.doubleValue(); } From 6eff18d60b4bf284aa7f501e392c4b315e046eae Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Mon, 28 Jun 2021 09:55:31 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=9D=BE=E4=B8=8B=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9B=B4=E6=96=B0=E8=AE=B0=E5=BD=95=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6=E8=BF=87=E9=95=BF?= =?UTF-8?q?=E6=8A=A5=E9=94=99,=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 --- .../java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java index 9fd30fc..bac76fd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java @@ -42,11 +42,11 @@ public class SysLogRoleChange extends BaseBean { @ApiModelProperty(value = "用户名", access = "用户名") private String userName; - @Column(name = "PREVIOUS_ROLES") + @Column(name = "PREVIOUS_ROLES",columnDefinition = "TEXT") @ApiModelProperty(value = "之前的角色", access = "之前的角色") private String previousRoles; - @Column(name = "CURRENT_ROLES") + @Column(name = "CURRENT_ROLES",columnDefinition = "TEXT") @ApiModelProperty(value = "当前的角色", access = "当前的角色") private String currentRoles; From c8b994a596615bb415fe1b20f22f9e3c40222910 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 29 Jun 2021 13:17:00 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java index d8bb734..bcbd776 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java @@ -91,6 +91,9 @@ public class MesEquTaskModel implements Serializable { @ApiParam("优先级") private String priorityName; + @ApiParam("设备代码") + private String equipmentCode; + public MesEquTaskModel() { @@ -99,7 +102,7 @@ public class MesEquTaskModel implements Serializable { public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, - String modifyUser, String modifyDatetime, String faultLocation, Integer repairType, Integer priority, String designator) { + String modifyUser, String modifyDatetime, String faultLocation, Integer repairType, Integer priority, String designator, String equipmentCode) { this.id = id; this.taskNo = taskNo; this.taskType = taskType; @@ -121,5 +124,6 @@ public class MesEquTaskModel implements Serializable { this.repairType = repairType; this.priority = priority; this.designator = designator; + this.equipmentCode = equipmentCode; } } From 72a2a24cf732019c3ea0e404d1cdd217f155ccc7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 29 Jun 2021 14:25:05 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) 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 6de9de8..d513d0d 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 @@ -8605,4 +8605,38 @@ public class MesEnumUtil { return description; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TOOLING_TYPE { + + WORK_CLOTHES(10, "工装"), + INSPECTION_TOOL(20, "检具"), + MOULD(30, "模具"); + + private int value; + private String description; + + TOOLING_TYPE(int value, String description) { + this.value = value; + this.description = 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 int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } From cfcb4bda039caffe2ef5bb2d12834c6b83cf2434 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 30 Jun 2021 10:39:11 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E7=8E=B0=E8=B1=A1=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java index 12ba1c4..ae1c1a8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java @@ -44,4 +44,8 @@ public class MesEquFaultPhenomenon extends BaseBean implements Serializable { @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; + + @Column(name = "FILE_ID") + @ApiParam("文件id") + private String fileId; } 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 6/8] =?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 7/8] =?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 8/8] =?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; +}