diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index 004fb69..11691be 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-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 9302dfc..0cf8b6d 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index a933723..8f44402 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,14 +5,14 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-base
jar
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index 712a842..0bfac69 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index a44418c..b7991cc 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml
index 375d0fd..5bfdd66 100644
--- a/modules/i3plus-pojo-ics/pom.xml
+++ b/modules/i3plus-pojo-ics/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index d1ea30d..91f8894 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 50ab2c2..3b9e57a 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index a2bb2df..06ec837 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,14 +5,14 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-mes-pcn
jar
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 8664dd2..c7bebed 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,14 +5,14 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-mes
jar
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store
new file mode 100644
index 0000000..cc05df3
Binary files /dev/null and b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store differ
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index 265f98d..6ae777d 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,14 +5,14 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-model
jar
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index 0080b0c..8767603 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index 24de8cf..977c14a 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index 0fbfb69..dc4ea86 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 069a4e2..cb6c1ce 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,14 +5,14 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-softswitch
jar
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 590b56c..3930e69 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index ac9e7dd..284329f 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java
index d091e87..697f6dd 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java
@@ -55,4 +55,12 @@ public class MesPpTemplate extends BaseBean {
@ApiParam(value = "工单数量")
@AnnoOutputColumn
private Double qty;
+
+ @ApiParam(value = "序号")
+ @AnnoOutputColumn
+ private Integer seq;
+
+ @ApiParam(value = "零件组号")
+ @AnnoOutputColumn
+ public String partGroupNo;
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index 92a70bb..574361d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
@@ -185,6 +186,15 @@ public class WmsDocMovementDetails extends BaseBean {
private String soOrderNo;
@Transient
+ @ApiParam(value = "替代物料编码")
+ private String subPartNo;
+
+
+ @Transient
+ @ApiParam(value = "替代物料名称")
+ private String subPartName;
+
+ @Transient
@ApiParam("实际批次")
private String actualLot;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
index ead19c3..3fe234b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
@@ -11,7 +11,11 @@ import lombok.ToString;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
import java.util.List;
/**
@@ -115,6 +119,10 @@ public class WmsDocMovementMaster extends BaseBean {
@ApiParam(value = "客户单号")
private String custOrderNo;
+ @Column(name = "REMARK")
+ @ApiParam("备注")
+ private String remark;
+
@Transient
private List movementDetailsList;
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index f153994..8bc1aa2 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index 1bef72c..c4793b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
i3plus.pojo
i3plus-pojo
pom
- 1.0-DEV-SNAPSHOT
+ 1.0-PROD-SNAPSHOT
modules/i3plus-pojo-base
modules/i3plus-pojo-platform
diff --git a/sonar-project.properties b/sonar-project.properties
index 55e4e84..3428e74 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-DEV-SNAPSHOT
+sonar.projectVersion=1.0-PROD-SNAPSHOT
# Path is relative to the sonar-project.properties file. Defaults to .
#sonar.sources=./