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 208e2ca..8e6d27e 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 @@ -190,6 +190,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam(value = "车号") private String carNo; + @Column(name = "CONSIGNATION") + @ApiParam("是否寄售 1-是 2-否") + private Integer consignation; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } 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 96ffb91..4581410 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 @@ -196,6 +196,10 @@ public class WmsMoveSn extends BaseBean { @Transient private Integer isSnapshot; + @Column(name = "CONSIGNATION") + @ApiParam("是否寄售 1-是 2-否") + private Integer consignation; + public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 0c9c9bf..f4c6c39 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -67,6 +67,11 @@ public class WmsPoSn extends BaseBean { @Column(name="SN_STATUS") @ApiParam(value = "状态", example = "10") public Integer snStatus; + /** + * 质量:10-合格 20-不合格 30-隔离 40-报废 + */ + @ApiParam(value = "质量状态", example = "10") + public Integer qcStatus; @Column(name="PACKAGE") @ApiParam("包装名称") 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 a3e8927..f98e0a0 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 @@ -274,6 +274,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("批次校验规则") private String lotCheckRule; + @Column(name = "CONSIGNATION") + @ApiParam("是否寄售 1-是 2-否") + private Integer consignation; + public WmsStockSn() { } 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 dd901c0..41a0b9e 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 @@ -1510,7 +1510,9 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "sn", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(wmsPoSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result); DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result);