From 48cbf9d47170d7dfe18f9c104beb98c05afd541a Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 15 Nov 2019 15:57:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90NC=E5=86=BB=E7=BB=93=E3=80=91=E3=80=90?= =?UTF-8?q?350=20NC=E5=86=BB=E7=BB=93-4.2=20=E6=89=B9=E9=87=8FNC=E5=86=BB?= =?UTF-8?q?=E7=BB=93=E3=80=91=E3=80=901187=20NC=E5=86=BB=E7=BB=93-4.2=20?= =?UTF-8?q?=E6=89=B9=E9=87=8FNC=E5=86=BB=E7=BB=93=E3=80=91=20=E3=80=90=09?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8A=A5=E8=A1=A8=E4=B8=AD=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E7=9C=8B=E5=88=B0=E5=AF=84=E5=94=AE=E9=9B=B6=E4=BB=B6=E3=80=91?= =?UTF-8?q?=E3=80=90bug6331=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 5 files changed, 19 insertions(+) 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);