From 457e10bc75b5846271125ae06d73aa049c8368cb Mon Sep 17 00:00:00 2001 From: qianhs Date: Sat, 2 Nov 2019 14:06:01 +0800 Subject: [PATCH] =?UTF-8?q?1,=E3=80=90=E6=8B=86=E5=8C=85=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=91=E3=80=90305-4.3=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E3=80=91=E3=80=901122=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) 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 a07f3fd..457f5e5 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 @@ -801,8 +801,9 @@ public class WmsEnumUtil { VDA_NC_FREEZE("VDA_NC_FREEZE", "VDA_NC冻结"), VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"), VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"), - VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"); - + VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"), + VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"), + VDA_SN_("VDA_SN_MERGE", "VDA条码合并"); private String value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 5f647ca..d44f335 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -175,6 +175,10 @@ public class WmsPart extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description") private String stockLevelStatus; + @Column(name="verb_num") + @ApiParam(value = "单次拆包数") + private Double verbNum; + @Column(name = "IS_PROD_LOT") @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2;