diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index 57e0a76..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.0.1
+ 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 5730ec1..f902a7c 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.0.1
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-base-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml
index 04f33d2..5868e20 100644
--- a/modules/i3plus-pojo-base-mongo/pom.xml
+++ b/modules/i3plus-pojo-base-mongo/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0.0.1
+ 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 42a8d25..d2521de 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.0.1
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index ca44117..49ad9fc 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -1656,6 +1656,11 @@ public class WmsEnumUtil {
return description;
}
+ public static String valueOfDescription(int val) {
+ return valueOf(val);
+ }
+
+
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index bc6545f..b599490 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.0.1
+ 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 d68e1ab..9f5788e 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.0.1
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml
index 891ddeb..ae38208 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.0.1
+ 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 c169cc4..1674a47 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.0.1
+ 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 860f573..04b40d4 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.0.1
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml
index fe03472..6854e65 100644
--- a/modules/i3plus-pojo-mdm/pom.xml
+++ b/modules/i3plus-pojo-mdm/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0.0.1
+ 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 2b2428f..ac387fd 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.0.1
+ 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 6eab360..bbe0ff9 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,7 +5,7 @@
i3plus-pojo
i3plus.pojo
- 1.0.0.1
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java
index c1348d8..8c97553 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java
@@ -59,4 +59,8 @@ public class MesNumberRule extends BaseBean implements Serializable {
@Column(name = "IS_CYCLE")
@ApiParam("最大值后循环")
private Integer isCycle;
+
+ @Column(name = "SPILT_RULE")
+ @ApiParam("拼接规则")
+ private String spiltRule;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
index bd2895c..34ddf5f 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
@@ -138,6 +138,14 @@ public class MesPart extends BaseBean implements Serializable {
@ApiParam(value = "包装数量")
private Double qty2;
+ @Column(name = "PROD_CFG_TYPE_CODE")
+ @ApiParam("项目代码")
+ private String prodCfgTypeCode;
+
+ @Column(name = "VERSION_NO")
+ @ApiParam("版本号")
+ private String versionNo;
+
@Transient
@ApiParam("产品类型名称")
private String produceCategoryName;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java
index 77997e5..55cf9e7 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java
@@ -40,10 +40,7 @@ public class DataReviewModel {
@ApiParam("显示标识")
private String showFlag;
- @ApiParam("关键件颜色")
- private String keyPartColor;
-
- @ApiParam("生产数据颜色")
- private String prodDataColor;
+ @ApiParam("颜色")
+ private String color;
}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java
index 94dacc2..03b6571 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java
@@ -94,6 +94,12 @@ public class GenSerialNoModel {
@ApiParam("工序代码")
private String processCode;
+ @ApiParam("项目代码")
+ private String prodCfgTypeCode;
+
+ @ApiParam("版本号")
+ private String versionNo;
+
public GenSerialNoModel(String ruleCode) {
this.ruleCode = ruleCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageUnPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageUnPackModel.java
new file mode 100644
index 0000000..1ae1fbe
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageUnPackModel.java
@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description: UNPACK
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate: 2020-06-28-11:44
+ * @Modify:
+ **/
+@Data
+public class PackageUnPackModel {
+
+ @ApiParam("工厂")
+ private String organizeCode;
+
+ @ApiParam("包装条码")
+ private String packageNo;
+
+ @ApiParam("过程条码")
+ private String serialNumber;
+
+ @ApiParam("物料号")
+ private String partNo;
+
+ @ApiParam("物料名称")
+ private String partName;
+
+ @ApiParam("批次")
+ private String lotNo;
+
+ @ApiParam("状态")
+ private Integer status;
+
+ @ApiParam("状态名称")
+ private String statusName;
+
+ @ApiParam("更新时间")
+ private String modifyDatetime;
+
+ @ApiParam("包装数量")
+ private String partSpecQty;
+
+ @ApiParam("UNPACK数据")
+ private List unPackList;
+}
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index de71a5d..be533a6 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.0.1
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java
index b92fbbe..e175815 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails;
import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn;
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
import lombok.Data;
import java.io.Serializable;
@@ -19,6 +20,7 @@ public class WmsMoveDetailsModel implements Serializable {
private static final long serialVersionUID = -6968143574442339454L;
private WmsMoveDetails details;
private List moveSnList;
+ private List wmsStockSnList;
public WmsMoveDetailsModel(WmsMoveDetails details, List moveSnList) {
this.details = details;
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index 51a2226..14e8567 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.0.1
+ 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 4e15179..102ab0e 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.0.1
+ 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 0c96be2..864c56a 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.0.1
+ 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 47eeb2a..e755225 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.0.1
+ 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 90165f3..194f0cb 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.0.1
+ 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 6cd210c..60543fe 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.0.1
+ 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/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
index 0f92e3d..1861799 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
@@ -41,15 +41,15 @@ public class WmsCSFactTrans extends BaseBean {
public String orderNo;
@Column(name="WH_NO")
- @ApiParam("仓库代码")
+ @ApiParam("仓库编码")
public String whNo;
@Column(name="ZONE_NO")
- @ApiParam("存储区编号")
+ @ApiParam("存储区编码")
public String zoneNo;
@Column(name="LOCATE_NO")
- @ApiParam("库位编号")
+ @ApiParam("库位编码")
public String locateNo;
@Column(name="PART_NO")
@@ -73,9 +73,12 @@ public class WmsCSFactTrans extends BaseBean {
@ApiParam("单位")
public String unit;
+ /**
+ * 实盘数量
+ **/
@Column(name="FACT_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
- @ApiParam(value = "实盘数量", example = "0")
+ @ApiParam(value = "数量", example = "0")
public Double factQty;
/**
@@ -83,7 +86,7 @@ public class WmsCSFactTrans extends BaseBean {
*/
@Column(name="ITEM_STATUS")
@ApiParam(value = "状态", example = "1")
- @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ITEM_STATUS.class, refForeignKey = "value", value = "description")
public Integer itemStatus;
@Column(name="REMARK")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
index ee1f1d8..97c1591 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
@@ -56,7 +56,7 @@ public class WmsCSOrderDetails extends BaseBean {
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
- @ApiParam(value = "需求数量", example = "0")
+ @ApiParam(value = "数量", example = "0")
public Double qty;
@Column(name = "UNIT")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java
index 2b45dc9..1bc0430 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java
@@ -103,6 +103,7 @@ public class WmsCSRange extends BaseBean {
public WmsCSRange(){}
+
public WmsCSRange(String zoneNo,String partNo,String partNameRdd){
this.zoneNo = zoneNo;
this.partNo = partNo;
@@ -120,7 +121,10 @@ public class WmsCSRange extends BaseBean {
public WmsCSRange(String zoneNo, String locateNo) {
this.zoneNo = zoneNo;
this.locateNo = locateNo;
+ }
+ public WmsCSRange(String zoneNo) {
+ this.zoneNo = zoneNo;
}
public WmsCSRange(String orderNo, String partNo, String zoneNo, Integer orderStatus) {
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 8f1226a..efa9891 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
@@ -269,6 +269,10 @@ public class WmsDocMovementMaster extends BaseBean {
isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_MOVEMENT_DEPARTMENT_REMARK", listColumnName = "name", explicitColumnName = "dictionaryValue")
private String fourthRemake;
+ @Column(name = "IS_REMOVE_ORDER")
+ @ApiParam(value = "是否撤销单据")
+ private Integer isRemoveOrder = CommonEnumUtil.FALSE;
+
@Transient
@ApiParam(value = "发运单号")
private String shipOrderNo;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
index b10c820..8ab7b56 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
@@ -61,7 +61,7 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("行号")
private Integer item;
- @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false)
+ @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "需求数量", example = "0")
private Double qty;
@@ -78,14 +78,14 @@ public class WmsPOMasterDetails extends BaseBean {
@ApiParam("订单号")
private String orderNo;
- @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false)
+ @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "条码打印数量", example = "0")
private Double printQty;
//private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; }
- @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)", nullable = false)
+ @Column(name = "RC_QTY", columnDefinition = "decimal(18,8) default 0", nullable = false)
@ColumnDefault("0")
@ApiParam(value = "收货数量", example = "0")
private Double rcQty = 0d;
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 8689812..4173305 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
@@ -552,7 +552,8 @@ public class WmsStockSn extends BaseBean {
@ApiParam("库位Z")
private Integer z;
- public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z) {
+ public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z,
+ String lotNo, String dateCode, String leftCode, String fixLotNo, String qualityDate) {
this.sn = sn;
this.vendorNo = vendorNo;
this.snStatus = snStatus;
@@ -564,6 +565,11 @@ public class WmsStockSn extends BaseBean {
this.x = x;
this.y = y;
this.z = z;
+ this.lotNo = lotNo;
+ this.dateCode = dateCode;
+ this.leftCode = leftCode;
+ this.fixLotNo = fixLotNo;
+ this.qualityDate = qualityDate;
}
public WmsStockSn() {
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index f3a601d..bdc4cab 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.0.1
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index 271e23a..f611147 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
i3plus.pojo
i3plus-pojo
pom
- 1.0.0.1
+ 1.0-TEST-SNAPSHOT
modules/i3plus-pojo-base
modules/i3plus-pojo-platform