diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index 1d3bb9e..004fb69 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-DEV-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java
index d6bba54..81e32c2 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java
@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
+import java.util.List;
+
/**
* @Description:
@@ -79,6 +81,9 @@ public class ProductInfoManageModel {
@ApiParam("明细队列序列")
private Double queDetailSeq;
+ @ApiParam("总队列类型")
+ private List queueTypeList;
+
public ProductInfoManageModel() {
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java
index 7873a6a..aeb6e6a 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -24,10 +25,14 @@ import javax.persistence.Transient;
**/
@Data
@Entity
+@Table(name = "WMS_TEST_RESULT_DETAILS", indexes = {
+ @Index(columnList = "BH_CODE"),
+ @Index(columnList = "PART_NO"),
+ @Index(columnList = "WORK_CENTER_CODE")
+})
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_TEST_RESULT_DETAILS")
@Api("检测结果明细表")
public class WmsTestResultDetails extends BaseBean {
@@ -70,6 +75,11 @@ public class WmsTestResultDetails extends BaseBean {
@ApiParam("检测值")
public String checkValue;
+ @Column(name = "IS_SYNC", nullable = false)
+ @ApiParam("是否同步")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.BH_SUMMARY_IS_SYNC.class, refForeignKey = "value", value = "description")
+ public Integer isSync = WmsEnumUtil.BH_SUMMARY_IS_SYNC.INIT.getValue();
+
@Transient
@ApiParam("已检测数")
private Long checkSize;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java
index 96ed7f1..60bcda8 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTractics.java
@@ -73,6 +73,11 @@ public class WmsTractics extends BaseBean {
searchColumnName = "partGroupNo,partGroupName", listColumnName = "partGroupNo,partGroupName", explicitColumnName = "partGroupNo")
private String tracticsPartGroup;
+ @Column(name = "TRACTICS_PART_GROUP_NAME")
+ @ApiParam(value = "策略适用物料组名称")
+ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+ private String tracticsPartGroupName;
+
@Column(name="TRACTICS_ZONE")
@ApiParam(value ="策略适用存储区")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ,
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java
index b64d25b..0e85791 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java
@@ -48,6 +48,9 @@ public class WmsMoveInfoModel {
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
private Integer itemStatus;
+ @ApiParam(value = "关联单号")
+ private String refSrc;
+
public WmsMoveInfoModel() {
}
diff --git a/sonar-project.properties b/sonar-project.properties
index 932bdd9..55e4e84 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
# defaults to project key
sonar.projectName=i3plus-pojo
# defaults to 'not provided'
-sonar.projectVersion=1.0-TEST-SNAPSHOT
+sonar.projectVersion=1.0-DEV-SNAPSHOT
# Path is relative to the sonar-project.properties file. Defaults to .
#sonar.sources=./