diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index 4f1acff..cb1c5e3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -62,11 +62,6 @@ public class Material extends BaseAPS { @FieldAnnotation(defaultValue = "ONEBYONE") private ApsEnumUtil.REPLENISHMENT_TYPE replType; - @Column(name="GROUP_ID") - @ApiParam(value ="物料组") - @FieldAnnotation(relation = "Material") - private Long groupId; - @Column(name="PURCHASE_LEAD_TIME") @ApiParam(value ="采购提前期") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) @@ -140,11 +135,6 @@ public class Material extends BaseAPS { @FieldAnnotation(property = false) private Double maxStockCount; - @Column(name="ORDER_BATCH_PERIOD") - @ApiParam(value ="订单合并期间") - @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) - private String orderBatchPeriod; - @Column(name="LABEL_NAME") @ApiParam(value ="标签名称") private String labelName; @@ -158,18 +148,6 @@ public class Material extends BaseAPS { @FieldAnnotation(relation = "WorkShop") private Long workShopId; - public Material getGroup() { - return BeanRelation.get(this, EMaterial.Group); - } - - public void setGroup(Material material) { - this.groupId = material != null ? material.getId() : 0l; - BeanRelation.set(this, EMaterial.Group, material); - } - - @JsonBackReference - public List getChilds() { return BeanRelation.list(this, EMaterial.Childs); } - @JsonBackReference public List getProductRoutings() { return BeanRelation.list(this, EMaterial.ProductRoutings); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index b5dbeae..63692bd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -18,7 +18,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.Date; import java.util.List; /** @@ -80,14 +79,6 @@ public class Resource extends BaseAPS { @ApiParam(value ="最大生产批量") private Double maxProduceBatch; - @Column(name="TIME_TAIL_ADJUST") - @ApiParam(value ="时间尾数圆整") - private String timeTailAdjust; - - @Column(name="TIME_ADJUST") - @ApiParam(value ="时间圆整") - private String timeAdjust; - @Column(name="MAX_PREV_SD_TIME") @ApiParam(value ="最大前设置中断时间") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) @@ -103,33 +94,16 @@ public class Resource extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxPostSdTime; - @Column(name="ROUND_TYPE") - @ApiParam(value ="圆整类型") - @FieldAnnotation(defaultValue = "ROUNDING") - private ApsEnumUtil.TIME_ROUND_TYPE roundType; - @Column(name="EFFICIENCY_EFFECT") @ApiParam(value ="效率影响类型") @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer EfficiencyEffect; - @Column(name="TIME_ROUND") - @ApiParam(value ="时间圆整影响") - @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) - private Integer timeRound; - - @Column(name="TIME_TAIL_ROUND") - @ApiParam(value ="时间尾数影响") - @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) - private Integer timeTailRound; - @ApiParam(value ="是否存在任务冲突") @FieldAnnotation(property = false) @Transient private boolean hasConflict; - private transient Date rightLimit; - public WorkShop getWorkShop() { return BeanRelation.get(this, EResource.WorkShop); } public void setWorkShop(WorkShop workShop) { 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 dcbecdd..54aa79b 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", "PrevFurnace.produceBegin"}, method = "calcPositive") + "PrevPlan.produceBegin", "PrevFurnace.produceBegin", "PrevAssPlan.produceBegin"}, method = "calcPositive") private Date produceBegin; @Column(name="PRODUCE_END") @ApiParam(value ="生产结束时间") @FieldAnnotation(modify = false) @RippleAnnotation(dependence = {"MainWork.PostRelations.PostWork.MainPlan.produceEnd", - "PostPlan.produceEnd", "PostFurnace.produceEnd"}, method = "calcReverse") + "PostPlan.produceEnd", "PostFurnace.produceEnd", "PostAssPlan.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/EMaterial.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java index e4702ed..fb9fee4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java @@ -8,8 +8,6 @@ package cn.estsh.i3plus.pojo.aps.holders; * @Modify: **/ public enum EMaterial { - Group, - Childs, ProductRoutings, OperInputs, OperOutputs, 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 7398237..257d11e 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 @@ -17,4 +17,6 @@ public enum EWorkPlan { PrevFurnace, PostFurnace, FurnacePlan, + PrevAssPlan, + PostAssPlan, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttResourceModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttResourceModel.java new file mode 100644 index 0000000..7571c55 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttResourceModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import lombok.Data; + +import java.util.Date; + +/** + * @Description : 订单甘特图工作块 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ +@Data +public class GanttResourceModel extends APSPager { + private Boolean hasEmptyResource; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date begin; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date end; +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml index 6ce3798..ef83c89 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml @@ -2,8 +2,6 @@ - - \ No newline at end of file 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 47d45a9..6b2c8c0 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -6,4 +6,6 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 9a4ad89..9517965 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1862,8 +1862,8 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_SOURCE_TYPE { - SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null), - SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"), + SOURCE_MARIA_DB(100, "SOURCE_MARIA_DB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null), + SOURCE_SQL_SERVER(200, "SOURCE_SQL_SERVER", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"), SOURCE_ORACLE(300, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null), SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public"), SOURCE_SAP_HANA(500, "SapHana", "SapHana", "com.sap.db.jdbc.Driver", 39015, null); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b930e1d..4631f64 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -881,7 +881,8 @@ public class WmsEnumUtil { SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"), COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库"),//默认DMR PRODUCT_IN_STOCK(780, "PRODUCT_IN_STOCK", "成品入库"), - SUSPECT_IN_STOCK(790, "SUSPECT_IN_STOCK", "可疑品入库");//默认DMR + SUSPECT_IN_STOCK(790, "SUSPECT_IN_STOCK", "可疑品入库"),//默认DMR + SAFE_RESERVE(800, "SAFE_RESERVE", "安全库存补货");//默认DMR private int value; private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUnlockPassword.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUnlockPassword.java new file mode 100644 index 0000000..a3b17f2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUnlockPassword.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description :解锁密码 + * @Reference : + * @Author : dominic + * @CreateDate : 2021-10-08 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_UNLOCK_PASSWORD") +@Api("mes解锁密码表") +public class MesUnlockPassword extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3534232746289126115L; + + @Column(name = "EMPLOYEE_NUMBER") + @ApiParam("员工编号") + private String employeeNumber; + + @Column(name = "EMPLOYEE_NAME") + @ApiParam("员工姓名") + private String employeeName; + + @Column(name = "UNLOCK_PASSWORD") + @ApiParam("解锁密码") + private String unlockPassword; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesUnlockPasswordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesUnlockPasswordRepository.java new file mode 100644 index 0000000..7c2ee5b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesUnlockPasswordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesUnlockPassword; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesUnlockPasswordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/job/repository/SysLogTaskTimeRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/job/repository/SysLogTaskTimeRepository.java new file mode 100644 index 0000000..1f8069f --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/job/repository/SysLogTaskTimeRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.platform.job.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; +import org.springframework.stereotype.Repository; + +/** + * @author ns + * @create 2021/10/12 0012 下午 16:21 + */ +@Repository +public interface SysLogTaskTimeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index f94befb..3f6f1a9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -13,6 +13,9 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; /** * @Description : 定时任务执行记录 @@ -22,10 +25,12 @@ import javax.persistence.Column; * @Modify : **/ @Data -@DynamicInsert -@DynamicUpdate +//@DynamicInsert +//@DynamicUpdate +@Entity @EqualsAndHashCode(callSuper = true) @Api(value="定时任务执行日志",description = "定时任务执行记录") +@Table(name = "SYS_LOG_TASK_TIME") public class SysLogTaskTime extends BaseBean { private static final long serialVersionUID = -841008177433745529L; @@ -76,6 +81,36 @@ public class SysLogTaskTime extends BaseBean { return taskStatus == null ? CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() : taskStatus; } + @Lob @ApiParam(value ="任务异常日志") private String taskLogError; + + @ApiParam(value ="job类名") + private String jobClass; + + + @ApiParam(value ="触发器名称") + private String triggerName; + + @ApiParam(value ="描述") + private String description; + + @ApiParam(value ="触发时间") + private String fireTime; + + @ApiParam(value ="下次触发时间") + private String nextFireTime; + + @ApiParam(value ="上次触发时间") + private String prevFireTime; + + @ApiParam(value ="上次触发时间") + private String scheduleName; + + @ApiParam(value ="执行开始时间") + private String executeStartTime; + + @ApiParam(value ="执行结束时间") + private String executeEndTime; } + diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index e7cee0f..7cc1a9a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -604,6 +604,32 @@ public class WmsStockSn extends BaseBean { @ApiParam("打印类型") private Integer printType; + @Transient + @ApiParam("30天以下") + private double thirtyDays; + + @Transient + @ApiParam("30-60天") + private double thirtyToSixtyDays; + + @Transient + @ApiParam("60-90天") + private double sixtyToNinetyDays; + + @Transient + @ApiParam("90以上天") + private double morhanDays; + + public WmsStockSn(String zoneNo, String lotNo, String partNo, double thirtyDays, double thirtyToSixtyDays, double sixtyToNinetyDays, double morhanDays) { + this.zoneNo=zoneNo; + this.lotNo=lotNo; + this.partNo=partNo; + this.thirtyDays = thirtyDays; + this.thirtyToSixtyDays = thirtyToSixtyDays; + this.sixtyToNinetyDays = sixtyToNinetyDays; + this.morhanDays = morhanDays; + } + public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z, String lotNo, String dateCode, String leftCode, String fixLotNo, String qualityDate) { this.sn = sn;