diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index a3ab756..f286942 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -86,6 +86,9 @@ public class AndonBoardModel implements Serializable { @ApiParam(value = "事件原因描述") public String ecNameRdd; + @ApiParam(value = "具体事件原因描述") + public String ecDesc; + @ApiParam(value = "小时") public String hour; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 46f2e1f..2b079df 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -83,11 +83,6 @@ public class ProductOrder extends BaseOrder { @FieldAnnotation(modify = false) private String calcLeadTime; -// @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") -// @ApiParam(value ="多余量") -// @FieldAnnotation(modify = false) -// private Double excessCount; - @Column(name="LACK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="缺少量") @FieldAnnotation(modify = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index fa58935..2b8979f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -72,14 +72,14 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="生产开始时间") @FieldAnnotation(modify = false) @RippleAnnotation(dependence = {"MainWork.PrevRelations.PrevWork.MainPlan.produceBegin", - "PrevPlan.produceBegin"}, method = "calcPositive") + "PrevPlan.produceBegin", "PrevFurnace.produceBegin"}, method = "calcPositive") private Date produceBegin; @Column(name="PRODUCE_END") @ApiParam(value ="生产结束时间") @FieldAnnotation(modify = false) @RippleAnnotation(dependence = {"MainWork.PostRelations.PostWork.MainPlan.produceEnd", - "PostPlan.produceEnd"}, method = "calcReverse") + "PostPlan.produceEnd", "PostFurnace.produceEnd"}, method = "calcReverse") private Date produceEnd; @Column(name="PRODUCE_TIME") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java index 025e156..cec9e5a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java @@ -7,5 +7,7 @@ public enum EWorkPlan { WorkResource, PrevPlan, PostPlan, + PrevFurnace, + PostFurnace, FurnacePlan, } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml index 49eb584..47d45a9 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -4,4 +4,6 @@ + + \ No newline at end of file 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; 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; +} 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/bean/template/BasImportTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java index 4b5934f..6385abe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java @@ -4,14 +4,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import java.util.List; @@ -72,6 +72,10 @@ public class BasImportTemplate extends BaseBean{ @ApiParam(value = "起始行", example = "0") private Integer startRow; + @Column(name = "REMARK") + @ApiParam(value = "备注") + private String remark; + @Transient @ApiParam("模板明细列表") private List templateDetailsList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java index 21c1237..a7da14f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java @@ -122,4 +122,8 @@ public class BasImportTemplateDetails extends BaseBean{ @Column(name = "IS_EXPORT_TITLE") @ApiParam("是否导出表头") private Integer isExportTitle; + + @Column(name = "ANNOTATE_COMMENT") + @ApiParam("批注") + private String annotateComment; } \ No newline at end of file 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(); + } +}