diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index 004fb69..bc7071b 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-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 9302dfc..3d6cbc0 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-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index 9f9717e..807bef5 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/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-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index 712a842..3937425 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-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index a44418c..e12eaee 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-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..8b15a31 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-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 50ab2c2..7637865 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-TEST-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 d800ecf..bf96e57 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/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-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 8664dd2..409b79a 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-TEST-SNAPSHOT
../../pom.xml
4.0.0
i3plus-pojo-mes
jar
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
index 4c9c79d..dc419c2 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.model.ProductDataModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@@ -127,7 +128,7 @@ public class MesPlc extends BaseBean implements Serializable {
@Transient
@ApiParam("OPC值")
- private String opcValue;
+ private List opcValue;
@Column(name = "TOOLING_CODE ")
@ApiParam("工装代码")
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 84375d0..9ed95ba 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
@@ -82,6 +82,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
@ApiParam("生产组代码")
private String pgCode;
+ @Column(name = "JIT_SEQ")
+ @ApiParam("JIT排序号")
+ private String jitSeq;
+
@Transient
@ApiParam("客户需求开始时间")
private String custPointStartDate;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
index 3e4272d..9280efe 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
@@ -92,6 +92,14 @@ public class MesQueueOrder extends BaseBean implements Serializable {
@ApiParam("生产组代码")
private String pgCode;
+ @Column(name = "JIT_LOT_NO")
+ @ApiParam("JIT队列批次")
+ private String jitLotNo;
+
+ @Column(name = "JIT_ACTUAL_NO")
+ @ApiParam("客户JIT队列编号")
+ private String jitActualNo;
+
@Transient
@ApiParam("起始车号")
private String custFlagNoStart;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java
index 45dcf3d..aabd924 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java
@@ -63,4 +63,12 @@ public class MesQueueShipping extends BaseBean implements Serializable {
@ApiParam("客户产线代码")
private String custPlantCode;
+ @Column(name = "JIT_LOT_NO")
+ @ApiParam("JIT队列批次")
+ private String jitLotNo;
+
+ @Column(name = "JIT_ACTUAL_NO")
+ @ApiParam("客户JIT队列编号")
+ private String jitActualNo;
+
}
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index d65e031..efacfd2 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/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-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index 0080b0c..23f68bd 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-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index 24de8cf..28cf55f 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-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index 0fbfb69..26a7311 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-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 76739f9..eaf2544 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/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-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 590b56c..910d630 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-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index ac9e7dd..e5b4e5c 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-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
index 2e8445e..35f31e4 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
@@ -68,6 +68,10 @@ public class WmsMoveMaster extends BaseBean {
@ApiParam(value = "车牌号")
private String carNo;
+ @Column(name = "DRIVER_NO")
+ @ApiParam("司机")
+ public String driverNo;
+
@Column(name = "BUSI_TYPE_CODE")
@ApiParam(value = "业务类型编码")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
index 2833b2f..c3f31f2 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
@@ -65,6 +65,10 @@ public class WmsMoveToERP extends BaseBean {
@ApiParam(value = "车牌号")
private String carNo;
+ @Column(name = "DRIVER_NO")
+ @ApiParam("司机")
+ public String driverNo;
+
@Column(name="ITEM")
@ApiParam(value = "行号")
public String item;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index e048183..647c116 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -318,6 +318,14 @@ public class WmsStockSn extends BaseBean {
@ApiParam(value = "箱数")
private Integer boxQty;
+ @Transient
+ @ApiParam(value = "是否报工")
+ private String isReport;
+
+ @Transient
+ @ApiParam(value = "是否需要报工")
+ private Integer isReportPartNo;
+
public WmsStockSn() {
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java
index d34d0e6..8d9a807 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java
@@ -79,7 +79,7 @@ public class WmsTransportRule extends BaseBean {
@ApiParam("是否安排运输")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE")
- public int isTransport;
+ public Integer isTransport;
@Column(name = "REMARK",length = 255)
@ApiParam("备注")
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index f153994..0ecf190 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-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index ff1cd2d..c6f0ba4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
i3plus.pojo
i3plus-pojo
pom
- 1.0-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
modules/i3plus-pojo-base
modules/i3plus-pojo-platform