From e7044a6dfe96fb01e95dd273d6e6cd46db4e4525 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Sun, 26 Sep 2021 16:04:33 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=A0=A1=E9=AA=8C=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); From 923a9563c9f18519415658a75a397c4adf7a4e10 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 24 Sep 2021 18:25:21 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=9B=A0=E9=95=BF=E5=BA=A6=E8=BF=87?= =?UTF-8?q?=E9=95=BF,=E5=8E=BB=E9=99=A4content=E5=AD=97=E6=AE=B5=E7=9A=84?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java index 3ac9292..ed75a18 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java @@ -28,7 +28,7 @@ import java.io.Serializable; @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_EDI_INITIAL_DATA", indexes = { @Index(columnList = "PROGRAM_DATA"), - @Index(columnList = "CONTENT"), +// @Index(columnList = "CONTENT"), @Index(columnList = "SYNC_STATUS") }) @Api("EDI_初始数据表") From a1aaf07a96c766732620aa3dbb45dd0a7c4e6dd0 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 28 Sep 2021 11:22:48 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=8C=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E7=A1=AB=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/model/GanttResourceModel.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttResourceModel.java 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; +} From 1f307b709a667764c452f75876bf94defd691ea6 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 28 Sep 2021 13:21:35 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=97=A0=E9=94=A1=E5=96=9C=E5=BE=B7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=A2=9E=E6=89=B9=E6=AC=A1=E8=B6=85?= =?UTF-8?q?=E6=9C=9F=E9=A2=84=E8=AD=A6=E6=8A=A5=E8=A1=A8=20=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E5=80=BC=E4=B8=89=E5=8D=81=E5=A4=A9,?= =?UTF-8?q?=E5=85=AD=E5=8D=81=E5=A4=A9,=E4=B9=9D=E5=8D=81=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) 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..acc368f 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) { + setZoneNo(zoneNo); + setLotNo(lotNo); + setPartNo(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; From 1493cf59e158a02ee26f2a06d8166a1ca58c3a1b Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 28 Sep 2021 13:38:40 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=97=A0=E9=94=A1=E5=96=9C=E5=BE=B7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=A2=9E=E6=89=B9=E6=AC=A1=E8=B6=85?= =?UTF-8?q?=E6=9C=9F=E9=A2=84=E8=AD=A6=E6=8A=A5=E8=A1=A8=20=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E5=80=BC=E4=B8=89=E5=8D=81=E5=A4=A9,?= =?UTF-8?q?=E5=85=AD=E5=8D=81=E5=A4=A9,=E4=B9=9D=E5=8D=81=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) 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..ec68170 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; From e4ee9c5ce5c675e012ab848514f82c9d71147e75 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 28 Sep 2021 13:48:13 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=97=A0=E9=94=A1=E5=96=9C=E5=BE=B7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=A2=9E=E6=89=B9=E6=AC=A1=E8=B6=85?= =?UTF-8?q?=E6=9C=9F=E9=A2=84=E8=AD=A6=E6=8A=A5=E8=A1=A8=20=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E5=80=BC=E4=B8=89=E5=8D=81=E5=A4=A9,?= =?UTF-8?q?=E5=85=AD=E5=8D=81=E5=A4=A9,=E4=B9=9D=E5=8D=81=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) 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; From 685166caf7cbe14ff5c1e7941e36331726d93408 Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Tue, 28 Sep 2021 20:20:10 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=8D=8E=E5=9F=9F=E6=9E=9A=E4=B8=BEOUT?= =?UTF-8?q?=5FMOVEMENT=5FBUSI=5FTYPE=20=E6=96=B0=E5=A2=9E=20=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E5=BA=93=E5=AD=98=E8=A1=A5=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 d3613aa..3e95368 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; From 8406b0c3e8fa4b0a3e255b6e84f2e18e65cdfb97 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 7 Oct 2021 10:12:31 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=8C=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E7=A1=AB=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 22 ------------------ .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 26 ---------------------- .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 4 ++-- .../estsh/i3plus/pojo/aps/holders/EMaterial.java | 2 -- .../estsh/i3plus/pojo/aps/holders/EWorkPlan.java | 2 ++ .../src/main/resources/relations/Material.xml | 2 -- .../src/main/resources/relations/WorkPlan.xml | 2 ++ 7 files changed, 6 insertions(+), 54 deletions(-) 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/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 From f8d1d85c8639c00ea37e1fa4c651778f9b6b3ff0 Mon Sep 17 00:00:00 2001 From: nies Date: Tue, 12 Oct 2021 16:25:14 +0800 Subject: [PATCH 09/10] =?UTF-8?q?platform=20=E5=A2=9E=E5=8A=A0job=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E8=AE=B0=E5=BD=95=E7=9B=B8=E5=85=B3=E7=9A=84bean?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/repository/SysLogTaskTimeRepository.java | 13 ++++++++ .../pojo/platform/platbean/SysLogTaskTime.java | 39 ++++++++++++++++++++-- 2 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/job/repository/SysLogTaskTimeRepository.java 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; } + From cbba75032a9e891d4e7e241de50464c0334668df Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Wed, 13 Oct 2021 16:41:13 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BA=8C=E5=BC=80=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=9B=AE=E5=89=8Dpojo=E7=B1=BB=E6=97=A0=E6=B3=95=E5=90=8C?= =?UTF-8?q?=E6=AD=A5,=E5=9C=A8=E6=A0=B8=E5=BF=83=E5=8C=85=E6=96=B0?= =?UTF-8?q?=E5=A2=9Epojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesUnlockPassword.java | 45 ++++++++++++++++++++++ .../repository/MesUnlockPasswordRepository.java | 16 ++++++++ 2 files changed, 61 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUnlockPassword.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesUnlockPasswordRepository.java 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 { +}