From e24bb4c39bf96318b7e596ce0db6f44a8353287c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 18 Oct 2020 17:14:43 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=BF=BD=E7=95=A5=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java index cc636ce..e5ac585 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java @@ -80,6 +80,10 @@ public class MesPcnSyncCfg extends BaseBean implements Serializable { @ApiParam(value = "同步的时候是否区分工厂") private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + @Column(name = "IGNORE_FIELDS") + @ApiParam(value = "同步的时候部分字段不同步") + private String ignoreFields; + @Transient @ApiParam("同步方式") private String syncPatternName; From df063af038faf320e66d7a934bb31aaf7ed47706 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sun, 18 Oct 2020 18:42:32 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 42 ++++++++++++++++++++++ 1 file changed, 42 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 e4b2f2d..7b8ff0e 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 @@ -7859,4 +7859,46 @@ public class MesEnumUtil { } } + + + /** + * 物料 物料类型1 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_CATEGORY1 { + RAW_PART(10, "原材料"), + SEMI_FINISHED_PRODUCT(20, "半成品"), + FINISHED_PRODUCT(30, "成品"); + + private int value; + private String description; + + PART_CATEGORY1(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return 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; + } + } + } From 9c1a9be165830cb973339f8ba1ee947512cf1a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Sun, 18 Oct 2020 23:03:18 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 9b7067b..856f210 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3443,6 +3443,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(paintPolishingReportModel.getPartNo())) { DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getPartNo(), "partNo", packBean); } + if (!StringUtils.isEmpty(paintPolishingReportModel.getWorkOrderNo())) { + DdlPreparedPack.getStringEqualPack(paintPolishingReportModel.getWorkOrderNo(), "workOrderNo", packBean); + } if (!StringUtils.isEmpty(paintPolishingReportModel.getModifyStartDate()) || !StringUtils.isEmpty(paintPolishingReportModel.getModifyEndDate())) { DdlPreparedPack.timeBuilder(paintPolishingReportModel.getModifyStartDate(), paintPolishingReportModel.getModifyEndDate(), "modifyDatetime", packBean, true); From fc36e55a38b8650914ba7809c192194aa23733a3 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 19 Oct 2020 03:31:30 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=96=B0=E5=A2=9Emes=20=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=91=A8=E6=9C=9F=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 38 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 3 ++ 2 files changed, 41 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 e4b2f2d..3567ab2 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 @@ -7859,4 +7859,42 @@ public class MesEnumUtil { } } + /** + * 查询周期 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUERY_GAP_TYPE { + MINUTE("MINUTE", "分钟"), + HOUR("HOUR", "小时"), + DAY("DAY", " 日"), + WEEK("WEEK", " 周"), + MONTH("MONTH", " 月"); + + private String value; + private String description; + + QUERY_GAP_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index b737470..9f15432 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -116,6 +116,9 @@ public class QueueOrderModel implements Serializable { @ApiParam("特殊标识") private Integer specialFlag; + @ApiParam("箱条码") + private String packageNo; + public QueueOrderModel() { } From 1aebc6761c6d3a1973c38f3eadf4ac65eadaf21e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 19 Oct 2020 14:25:15 +0800 Subject: [PATCH 5/8] =?UTF-8?q?Fix=20bug#11878=2019081-=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BA=A4=E6=98=93=E6=8E=A8=E7=AE=97=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8-1016?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java index afcb69b..8457f27 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java @@ -98,4 +98,8 @@ public class WmsDocSoDetails extends BaseBean { @ApiParam("业务类型") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") public Integer busiType; + + @Transient + @ApiParam(value = "客户发往地代码") + private String custDeliveryCode; } From a4bc17b0a60a2ad23ab757d359182f9ad85e2ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 19 Oct 2020 21:28:05 +0800 Subject: [PATCH 6/8] =?UTF-8?q?feat(form):sap=5Fhana=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) 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 d2c673a..f401265 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 @@ -1816,7 +1816,8 @@ public class CommonEnumUtil { 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_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_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); private int value; private String code; @@ -1908,6 +1909,13 @@ public class CommonEnumUtil { return tmp; } + public String getSchemaPattern(String schema) { + if(this.equals(SOURCE_SAP_HANA)){ + return schema; + } + return defaultSchemaPattern; + } + public String getJDBCUrl(String database,String host,Integer port){ if(this.getValue() == SOURCE_MARIA_DB.getValue()){ return getJDBCUrlMySQL(database,host,port); @@ -1917,6 +1925,8 @@ public class CommonEnumUtil { 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; } @@ -1944,6 +1954,8 @@ public class CommonEnumUtil { return SOURCE_POSTGRE_SQL; }else if(databaseProductName.indexOf(":sqlserver:") != -1){ return SOURCE_SQL_SERVER; + }else if(databaseProductName.indexOf(":sap:") != -1){ + return SOURCE_SAP_HANA; } } return null; @@ -1965,6 +1977,10 @@ public class CommonEnumUtil { return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true"; } + private String getJDBCUrlSapHana(String database,String host,Integer port){ + return "jdbc:sap://" + host + ":" + port + "?reconnect=true"; + } + private String getJDBCUrlSQLServer(String database,String host,Integer port,String instanceName){ StringBuffer sb = new StringBuffer(); sb.append("jdbc:sqlserver://").append(host); From 5d73afd17faa2452249f8e7de25fee83a5c949a1 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 19 Oct 2020 21:40:10 +0800 Subject: [PATCH 7/8] =?UTF-8?q?jisa=E5=B0=8F=E6=97=B6=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java | 5 +++++ .../pojo/mes/model/mgnbj/JisaJphReportModel.java | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index dd46d65..ad5c91b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -14,6 +14,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.io.Serializable; +import java.util.Date; /** * @Description : @@ -145,6 +146,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable { private Integer noticeSign = 10; @Transient + @ApiParam("创建时间") + private String cdtTruncated; + + @Transient @ApiParam("客户需求开始时间") private String custPointStartDate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java new file mode 100644 index 0000000..4c4035b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/JisaJphReportModel.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import lombok.Data; + +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/10/19 15:02 + * @desc + */ +@Data +public class JisaJphReportModel { + + private Double jphVal; + + private Map detailsMap; + +} From bf416281140f177eb7bc658a5e023e4d3a91647b Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 20 Oct 2020 10:32:15 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=9A=84=E6=A0=87=E5=87=86=E8=B4=A8=E6=A3=80=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E6=B5=AE=E7=82=B9=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E4=B8=BA2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index acce643..15d26d2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -221,10 +221,10 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double proportion; - @Column(name = "STD_CHECK_TIME") + @Column(name = "STD_CHECK_TIME", columnDefinition = "decimal(10,2)") @ApiParam(value = "标准质检时间") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Integer stdCheckTime; + private Double stdCheckTime; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重")