From 258c1ccbe8dfc2390bb17edc223e20f1755132f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 16 Dec 2019 14:24:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AF=BC=E5=85=A5=EF=BC=9A?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8BCELL?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C+=E6=9C=89=E4=BA=9BSHEET=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=E6=97=A0=E9=9C=80=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?+=E5=BF=AB=E9=80=9F=E7=A7=BB=E5=BA=93=EF=BC=9A=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E7=A7=BB=E5=85=A5=E5=BA=93=E7=8A=B6=E6=80=81=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=EF=BC=9B=E4=B8=8D=E5=8F=AF=E5=A4=9A=E4=BA=BA?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=90=8C=E4=B8=80=E4=B8=AA=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=95=B4=E5=BA=93=E7=A7=BB=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 -- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java | 1 + 2 files changed, 1 insertion(+), 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 d6d917c..68528f9 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 @@ -981,7 +981,6 @@ public class WmsEnumUtil { /** * 业务表：库存条码状态 - * 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_STATUS { @@ -991,7 +990,6 @@ public class WmsEnumUtil { INSTOCKED(40, "入库"), PICKED(50, "配料"), OUT_STOCK(60, "出库"), - //SCRAP(70, "报废"), COMMING(80, "在途"); private int value; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 5878561..2926428 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -112,6 +112,7 @@ public class WmsActionGroupDetails extends BaseBean { @Column(name = "IS_AUTO_OPEN_WINDOW",nullable = false) @ApiParam(value = "是否自动开窗") + @AnnoOutputColumn private Integer isAutoOpenWindow; @Column(name = "SEARCH_KEY", columnDefinition = "varchar(225) default ''")