diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 42a8d25..4cd7e33 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-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 {
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..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
@@ -63,6 +63,11 @@ public class MesDataMigrationCfg extends BaseBean implements Serializable {
@ApiParam(value = "是否物理删除", example = "0")
private Integer isPhysicalDelete;
+ //枚举:CommonEnumUtil.DATA_SOURCE_TYPE
+ @Column(name = "DATASOURCE_TYPE")
+ @ApiParam(value = "数据源类型")
+ private Integer dataSourceType;
+
@Column(name = "LAST_EXECUTION_TIME")
@ApiParam("末次迁移时间")
private String lastExecutionTime;
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;
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 {
}
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index de71a5d..af4c429 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