diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 9d6017f..2036d64 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -53,7 +53,7 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("客户编号") public String custNo; - @Column(name="QTY") + @Transient @ApiParam(value = "需求数量", example = "0") public Double qty; @@ -61,6 +61,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "处理数量", example = "0") public Double transQty; + @Column(name="REJECT_QTY") + @ApiParam(value = "不合格处理数量", example = "0") + public Double rejectQty; + @Column(name="UNIT") @ApiParam("单位") public String unit; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index f1016d5..b4d7163 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -100,6 +100,22 @@ public class WmsMoveSn extends BaseBean { @ApiParam(value = "数量", example = "0") public Double qty; + @Column(name="SRC_QC_STATUS") + @ApiParam(value = "源质量状态", example = "1") + public Integer srcQcStatus; + + @Column(name="SRC_SN_STATUS") + @ApiParam(value = "源条码状态", example = "1") + public Integer srcSnStatus; + + @Column(name="DEST_QC_STATUS") + @ApiParam(value = "目的质量状态", example = "1") + public Integer descQcStatus; + + @Column(name="DEST_SN_STATUS") + @ApiParam(value = "目的条码状态", example = "1") + public Integer destSnStatus; + public WmsMoveSn(){} public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index f931e6e..fa7b83f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -67,9 +67,13 @@ public class WmsTransQuan extends BaseBean { @ApiParam(value = "交易数量", example = "0") public Double qty; + @Column(name = "REJECT_QTY") + @ApiParam(value = "不合格交易数量", example = "0") + public Double rejectQty; + @Column(name = "TRANS_NO") - @ApiParam(value = "事务编号", example = "1") - public Long transNo; + @ApiParam(value = "事务编号") + public String transNo; /** * ASN,PO,SO diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java index dc0af8b..4a69c08 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java @@ -68,9 +68,13 @@ public class WmsTransSn extends BaseBean { @ApiParam(value = "交易数量", example = "0") public Double qty; + @Column(name="REJECT_QTY") + @ApiParam(value = "不合格交易数量", example = "0") + public Double rejectQty; + @Column(name="TRANS_NO") @ApiParam("事务编号") - public Long transNo; + public String transNo; @Column(name = "QC_STATUS") @ApiParam(value = "质检状态", example = "0") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 9be52e1..e2e2f47 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -809,11 +809,11 @@ public class WmsHqlPack { * @param tranNo * @return */ - public static String packWmsTransSn(Long tranNo) { + public static String packWmsTransSn(String tranNo) { StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getNumEqualPack(tranNo, "transNo", result); + HqlPack.getStringEqualPack(tranNo, "transNo", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString();