From d4d30bf63445a874c5770e023acbc09288dda716 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 16 Dec 2019 23:27:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=20=E9=9B=B6=E4=BB=B6=E5=8F=B7?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=EF=BC=8C=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=90=8E=E9=9C=80=E8=A6=81=E6=8F=90=E7=A4=BA=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E9=9B=B6=E4=BB=B6=EF=BC=8C=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=EF=BC=8C=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=EF=BC=88=E6=A0=87=E5=8C=85?= =?UTF-8?q?=E5=87=8F=E5=8E=BB=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=EF=BC=89?= =?UTF-8?q?=E3=80=82=E3=80=91=E3=80=90bug7020=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 13 +++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 5 +++++ 2 files changed, 18 insertions(+) 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 85d93c7..878db14 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 @@ -119,6 +119,19 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam(value = "物料数量", example = "1") public Double sumPartQty; + /** + * 条码状态:1=创建,10=已收货,20=已质检, + * 30=已入库,40=待出库,50=已出库, + * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 + */ + @Transient + @ApiParam(value = "条码状态", example = "1") + public Integer snStatus; + + @Transient + @ApiParam(value = "条码状态(冻结时)", example = "1") + public Integer destSnStatus; + @Transient @ApiParam("存储区编号组") public String[] zoneNos; 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 bcbb261..3b6b4bc 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 @@ -93,6 +93,11 @@ public class WmsCSOrderDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer snStatus; + @Column(name = "DEST_SN_STATUS") + @ApiParam(value = "条码状态(冻结时)", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + public Integer destSnStatus; + /** * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 */ From d0ddf208c354f971791bd9d325857648d4a0f610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 17 Dec 2019 13:36:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90KT-1297=20=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E7=9A=84=E3=80=90=E9=80=82=E7=94=A8=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E3=80=91=E4=BC=98=E5=8C=96=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/WmsRouting.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java index af87b92..1ac54c6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java @@ -53,8 +53,6 @@ public class WmsRouting extends BaseBean { @Column(name = "FOR_PRODUCT") @ApiParam(value = "适用产品") - - private Integer forProduct; @Transient