From ebd3f852553044687b2539c2625f4ba266cd9e1e Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 22 Apr 2021 17:30:25 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B3=B0=E5=9B=BD=E6=89=AD=E7=9F=A9?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index ba16832..b47da7f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -129,6 +129,10 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("物料名称") private String partName; + @Transient + @ApiParam("数据范围") + private String torqueValRange; + public double getKeyDataCountVal() { return this.keyDataCount == null ? 0 : this.keyDataCount; From 05f805f227898628130bba5ae048982721683b3f Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Thu, 22 Apr 2021 18:28:03 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java index 14a5354..a96437f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java @@ -63,6 +63,11 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable { @ApiParam(value = "是否物理删除", example = "0") private Integer isPhysicalDelete; + //枚举：CommonEnumUtil.DATA_SOURCE_TYPE + @Column(name = "IS_PHYSICAL_DELETE") + @ApiParam(value = "数据源类型") + private Integer dataSourceType; + @Column(name = "LAST_EXECUTION_TIME") @ApiParam("末次迁移时间") private String lastExecutionTime; From 28d512021e15da4c7e0be8734f35124154ed7b30 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Thu, 22 Apr 2021 19:24:52 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.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/MesDataMigrationCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java index a96437f..9caec9d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataMigrationCfg.java @@ -64,7 +64,7 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable { private Integer isPhysicalDelete; //枚举：CommonEnumUtil.DATA_SOURCE_TYPE - @Column(name = "IS_PHYSICAL_DELETE") + @Column(name = "DATASOURCE_TYPE") @ApiParam(value = "数据源类型") private Integer dataSourceType; From e18b726369740484d3b0119c6ec6516d26930516 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 23 Apr 2021 00:23:36 +0800 Subject: [PATCH 4/6] =?UTF-8?q?MesPackageTravelRepository=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=20Repository=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java index 3bef25a..323ee9e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTravelRepository.java @@ -3,11 +3,13 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.bean.MesPackageTravel; +import org.springframework.stereotype.Repository; /** * @Author: Wynne.Lu * @CreateDate: 2019/10/19 2:57 下午 * @Description: **/ +@Repository public interface MesPackageTravelRepository extends BaseRepository { } From 92e0acee583207dda92013d5e302fea08c85ae68 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 23 Apr 2021 11:00:00 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 1cc212f..7a56fa4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -4,17 +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 javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; 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; import java.io.Serializable; /** @@ -30,7 +27,12 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "IF_PACKAGE_DETAIL") +@Table(name = "IF_PACKAGE_DETAIL", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PART_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER", "IF_CODE"}) +}) @Api("包装明细表") public class IfPackageDetail extends BaseBean implements Serializable { From a9881bc01f0b5d17aaa85406dce6c3328bb3c384 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 23 Apr 2021 11:46:08 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B3=B0=E5=9B=BD?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=9D=A1=E7=A0=81=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base/pom.xml | 4 ---- modules/i3plus-pojo-model/pom.xml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..c49b26f 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -31,10 +31,6 @@ fastjson - com.alibaba - fastjson - - com.thoughtworks.xstream xstream diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..24d1c96 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -29,10 +29,6 @@ i3plus-pojo-report - - i3plus.pojo - i3plus-pojo-form - i3plus.pojo