From af11605d46030f37034130c9fff0016118121f57 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 19 Mar 2021 17:03:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=B7=A5=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java index 7e880f4..1a8f7c8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java @@ -93,6 +93,10 @@ public class StepResult { return new StepResult<>(true, data, ""); } + public static StepResult getNewSuccessData(T data, String nextTriggerEvent) { + return new StepResult<>(true, data, "", nextTriggerEvent); + } + public static StepResult getSuccessData(Collection data, String msg) { return new StepResult(true, data, msg); } @@ -126,6 +130,13 @@ public class StepResult { this.msg = msg; } + public StepResult(boolean isCompleted, T data, String msg, String nextTriggerEvent) { + this.isCompleted = isCompleted; + this.data = data; + this.msg = msg; + this.nextTriggerEvent = nextTriggerEvent; + } + public StepResult(boolean isCompleted, Collection dataCollection, String msg) { this.isCompleted = isCompleted; this.dataCollection = dataCollection; From cd5773fb2ef5918c914d0032269deac288937939 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 19 Mar 2021 17:42:15 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 32ce910..00a3cce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -170,6 +170,10 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam("客户零件号") private String custPartNo; + @Transient + @ApiParam("配方项") + private String recipeItem; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 2dc6a886fe7cec075df14086742cb5bf41ff4bea Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Mon, 22 Mar 2021 11:23:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?14492=2019048-=E4=BA=A7=E5=93=81=E8=BF=BD?= =?UTF-8?q?=E6=BA=AF=E6=8A=A5=E8=A1=A8OP10-OP70=E5=B7=A5=E4=BD=8D=EF=BC=8C?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=AF=B9-20210316=EF=BC=88=E6=97=B6?= =?UTF-8?q?=E5=8C=BA=E9=97=AE=E9=A2=98=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) 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 aeaa624..f41a6f6 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 @@ -1978,6 +1978,21 @@ public class CommonEnumUtil { return null; } + public String getJDBCUrlToMysql(String database, String host, Integer port) { + if (this.getValue() == SOURCE_MARIA_DB.getValue()) { + return getJDBCUrlMySQLBy8x(database, host, port); + } else if (this.getValue() == SOURCE_ORACLE.getValue()) { + return getJDBCUrlOracle(database, host, port); + } else if (this.getValue() == SOURCE_POSTGRE_SQL.getValue()) { + return getJDBCUrlPostgreSQL(database, host, port); + } else if (this.getValue() == SOURCE_SQL_SERVER.getValue()) { + return getJDBCUrlSQLServer(database, host, port); + } else if (this.getValue() == SOURCE_SAP_HANA.getValue()) { + return getJDBCUrlSapHana(database, host, port); + } + return null; + } + public String getJDBCUrl(String database, String host, Integer port, String instanceName) { if (this.getValue() == SOURCE_MARIA_DB.getValue()) { return getJDBCUrlMySQL(database, host, port); @@ -2020,6 +2035,16 @@ public class CommonEnumUtil { "&serverTimezone=CST"; } + //MySQL8.x时区设置 + private String getJDBCUrlMySQLBy8x(String database, String host, Integer port) { + return "jdbc:mysql://" + host + ":" + port + "/" + database + + "?autoReconnect=true" + + "&useSSL=false" + + "&characterEncoding=utf-8" + + "&allowPublicKeyRetrieval=true" + + "&serverTimezone=Asia/Shanghai"; + } + private String getJDBCUrlOracle(String database, String host, Integer port) { return "jdbc:oracle:thin:@" + host + ":" + port + ":" + database; } From d129a3863b1d894df9251b953b18f16b7f00a35a Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Mon, 22 Mar 2021 14:25:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=A9=E6=B4=A5-=E6=96=B0=E6=B3=A8?= =?UTF-8?q?=E5=A1=91=E5=8C=BA=E5=9F=9F=E9=9B=86=E4=B8=AD=E4=B8=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.java index 9413a87..423e06c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.bean.MesPlc; +import org.springframework.stereotype.Repository; /** * @Description: @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPlc; * @CreateDate:2019\10\9 0009 11:16 * @Modify: **/ +@Repository public interface MesPlcRepository extends BaseRepository { }