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 650ee5b..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-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-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 7b4d582..c36a8f9 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
@@ -6505,8 +6505,9 @@ public class WmsEnumUtil {
public enum REWORK_STATUS {
INIT(10, "INIT", "初始化"),
BE_HANDLE(20, "BE_HANDLE", "待处理"),
- FINISH(30, "FINISH", "已处理"),
- NONE(40, "NONE", "不处理");
+ HANDLING(30, "HANDLING", "处理中"),
+ FINISH(40, "FINISH", "已处理"),
+ NONE(50, "NONE", "不处理");
private int value;
private String code;
@@ -7166,4 +7167,86 @@ public class WmsEnumUtil {
return null;
}
}
+
+
+ /**
+ * BH处理状态
+ */
+ @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+ public enum BH_WORK_STATUS {
+ WAIT_CHECK(10, "WAIT_CHECK", "待检验"),
+ SUBMIT_CHECK(20, "SUBMIT_CHECK", "已送检"),
+ IN_CHECK(30, "IN_CHECK", "检验中"),
+ WAIT_CONFIRM(40, "WAIT_CONFIRM", "待确认"),
+ WAIT_REPARI(50, "WAIT_OUT", "待返修"),
+ WAIT_PICK(60, "WAIT_OUT", "待挑选"),
+ IN_REPARI(70, "WAIT_OUT", "返修中"),
+ IN_PICK(80, "WAIT_OUT", "挑选中"),
+ WAIT_OUT(90, "WAIT_OUT", "待出库"),
+ OUT(100, "WAIT_OUT", "已出库");
+
+ private int value;
+ private String code;
+ private String description;
+
+ BH_WORK_STATUS(int value, String code, String description) {
+ this.value = value;
+ this.code = code;
+ this.description = description;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public static String valueOf(int val) {
+ String tmp = null;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == val) {
+ tmp = values()[i].description;
+ }
+ }
+ return tmp;
+ }
+
+ public static String valueOfDescription(int val) {
+ return valueOf(val);
+ }
+
+ public static int descriptionOfValue(String desc) {
+ return descOf(desc);
+ }
+
+
+ public static int descOf(String desc) {
+ int tmp = 1;
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].description.equals(desc)) {
+ tmp = values()[i].value;
+ }
+ }
+ return tmp;
+ }
+
+ public static BH_WORK_STATUS codeOf(Integer value) {
+ if (value == null) {
+ return null;
+ } else {
+ for (int i = 0; i < values().length; i++) {
+ if (values()[i].value == value) {
+ return values()[i];
+ }
+ }
+ }
+ return null;
+ }
+ }
}
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index a9e288f..b948580 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-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml
index 2de88b5..c338f71 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 123fdc9..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-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-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml
index 7f94617..d98b7d8 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-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 60fc467..a758a6a 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-DEV-SNAPSHOT
+ 1.0-TEST-SNAPSHOT
../../pom.xml
4.0.0
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 a785f21..dba12cc 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 d6d2f8e..81670b2 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 0368700..0f615b6 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 b2eedd4..9e5f745 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/QmsStockSnExtBh.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java
index ba0e85d..91870be 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java
@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
+import javax.persistence.Transient;
/**
* @Description : BH库存条码扩展表
@@ -27,7 +28,7 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="QMS_STOCK_SN_EXT_BH")
-@Api("BH检测大类表")
+@Api("BH库存条码扩展表")
public class QmsStockSnExtBh extends BaseBean {
@Column(name="sn")
@@ -43,4 +44,77 @@ public class QmsStockSnExtBh extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class)
private Integer bhType;
+ @Transient
+ @ApiParam("处理状态")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.BH_WORK_STATUS.class, refForeignKey = "value", value = "description")
+ private Integer workStatus;
+
+ /*****汇总查询结果信息****/
+ @Transient
+ @ApiParam("产线代码")
+ public String workCenterCode;
+
+ @Transient
+ @ApiParam("是否合格")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+ public Integer isQualified;
+
+
+ @Transient
+ @ApiParam("返修状态")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
+ public Integer reworkStatus;
+
+ @Transient
+ @ApiParam("返修结果")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+ public Integer reworkResult;
+
+ @Transient
+ @ApiParam("挑选状态")
+ @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
+ public Integer pickStatus;
+
+ @Transient
+ @ApiParam("物料号")
+ public String partNo;
+
+ @Transient
+ @ApiParam("物料名称")
+ public String partName;
+
+ @Transient
+ @ApiParam("客户发往地")
+ public String flagNo;
+
+ @Transient
+ @ApiParam("挑选状态")
+ public Integer pickResult;
+
+ @Transient
+ @ApiParam("二维码")
+ public String serialSn;
+
+
+ public QmsStockSnExtBh(String organizeCode, String bhCode,
+ String workCenterCode, String partNo,
+ String partName, String flagNo, Integer isQualified,
+ Integer reworkStatus, Integer reworkResult, Integer pickStatus, Integer pickResult, Integer bhType) {
+ this.organizeCode = organizeCode;
+ this.batchNo = bhCode;
+ this.workCenterCode = workCenterCode;
+ this.partNo = partNo;
+ this.partName = partName;
+ this.flagNo = flagNo;
+ this.isQualified = isQualified;
+ this.reworkStatus = reworkStatus;
+ this.reworkResult = reworkResult;
+ this.pickStatus = pickStatus;
+ this.pickResult = pickResult;
+ this.bhType = bhType;
+ }
+
+ public QmsStockSnExtBh() {
+ }
+
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java
index 82917a0..8ee1297 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java
@@ -88,4 +88,21 @@ public class WmsSerialSn extends BaseBean {
@ApiParam(value = "数量", example = "0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
private Double qty;
+
+ public WmsSerialSn() {
+
+ }
+
+ public WmsSerialSn(String organizeCode, String batchNo, String stockSn, String partNo, String partNameRdd, String serialSn, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+ this.organizeCode = organizeCode;
+ this.batchNo = batchNo;
+ this.stockSn = stockSn;
+ this.partNo = partNo;
+ this.partNameRdd = partNameRdd;
+ this.serialSn = serialSn;
+ this.createUser = createUser;
+ this.createDatetime = createDatetime;
+ this.modifyUser = modifyUser;
+ this.modifyDatetime = modifyDatetime;
+ }
}
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 3ba3899..f2fb8c4 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
@@ -416,6 +416,18 @@ public class WmsStockSn extends BaseBean {
@ApiParam("样本数")
private Integer sampleSize;
+ @Transient
+ @ApiParam("BATCH号")
+ private String batchNo;
+
+ @Transient
+ @ApiParam(value = "产品条码")
+ private String serialSn;
+
+ @Transient
+ @ApiParam("BH类型")
+ private Integer bhType;
+
public WmsStockSn() {
}
@@ -594,6 +606,7 @@ public class WmsStockSn extends BaseBean {
public WmsStockSn(WmsStockSn stockSn, String batchCode) {
+ this.id = stockSn.getId();
this.organizeCode = stockSn.getOrganizeCode();
this.refSrc = stockSn.getRefSrc();
this.partNo = stockSn.getPartNo();
@@ -616,4 +629,24 @@ public class WmsStockSn extends BaseBean {
this.refSrc = batchCode;
}
+ public WmsStockSn(String organizeCode, String batchNo, String sn, String workCenterCode, String partNo,
+ String partNameRdd, String shippingFlag, String leftCode, String createUser, String createDatetime,
+ String modifyUser, String modifyDatetime) {
+ this.organizeCode = organizeCode;
+ this.batchNo = partNo;
+ this.sn = sn;
+ this.workCenterCode = workCenterCode;
+ this.partNo = partNo;
+ this.partNameRdd = partNameRdd;
+ this.shippingFlag = shippingFlag;
+ this.leftCode = leftCode;
+ this.createUser = createUser;
+ this.createDatetime = createDatetime;
+ this.modifyUser = modifyUser;
+ this.modifyDatetime = modifyDatetime;
+
+ }
+
+
+
}
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 eff8e6c..7873a6a 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
@@ -74,6 +74,10 @@ public class WmsTestResultDetails extends BaseBean {
@ApiParam("已检测数")
private Long checkSize;
+ @Transient
+ @ApiParam("移动单单号")
+ private String moveNo;
+
public WmsTestResultDetails() {
}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java
index a13a31f..6370543 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultSummary.java
@@ -84,6 +84,31 @@ public class WmsTestResultSummary extends BaseBean {
@ApiParam("BH类型")
private Integer bhType;
+ @Transient
+ @ApiParam("库存条码")
+ private String sn;
+
+ @Transient
+ @ApiParam("库存条码二维码")
+ private String serialSn;
+
+ public WmsTestResultSummary(String organizeCode, String bhCode,
+ String workCenterCode, String partNo,
+ String partName, String flagNo, Integer isQualified,
+ Integer reworkStatus, Integer reworkResult, Integer pickStatus, Integer pickResult) {
+ this.organizeCode = organizeCode;
+ this.bhCode = bhCode;
+ this.workCenterCode = workCenterCode;
+ this.partNo = partNo;
+ this.partName = partName;
+ this.flagNo = flagNo;
+ this.isQualified = isQualified;
+ this.reworkStatus = reworkStatus;
+ this.reworkResult = reworkResult;
+ this.pickStatus = pickStatus;
+ this.pickResult = pickResult;
+ }
+
public WmsTestResultSummary(String organizeCode, String bhCode,
String workCenterCode, String partNo,
String partName, String flagNo, Integer isQualified,
@@ -100,7 +125,6 @@ public class WmsTestResultSummary extends BaseBean {
this.pickStatus = pickStatus;
this.pickResult = pickResult;
this.bhType = bhType;
-
}
public WmsTestResultSummary() {
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index 5fcd08a..0fea52b 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 2eddf76..cc8fce6 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