From 58c9795b7c7e835faa52c4ffa8cca204e2eb2b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 8 Nov 2019 18:01:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=81=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 14 ++++++++++++-- 1 file changed, 12 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 3ae0e7f..57d06eb 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 @@ -543,7 +543,8 @@ public class WmsEnumUtil { IN_STORE(10, "IN", "入库"), OUT_STORE(20, "OUT", "出库"), MOVE_STORE(30, "MOVE", "移库"), - OTHER(40, "OTHER", "其他"); + OTHER(40, "OTHER", "其他"), + NC_HANDLE(50, "NC_HANDLE", "NC处理"); private int value; private String code; @@ -627,7 +628,16 @@ public class WmsEnumUtil { VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"), VDA_QC(290, "VDA_QC", "VDA质检"), VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"), - VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"); + VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"), + KT_RECEPTION(320, "KT_RECEPTION", "KT让步接收"), + KT_SCRAP(330, "KT_SCRAP", "KT报废"), + KT_QUARANTINE(330, "KT_QUARANTINE", "KT报废"), + KT_BACK_QUARANTINE(340, "KT_BACK_QUARANTINE", "KT反隔离"), + KT_DEFINITE_FAIL(350, "KT_DEFINITE_FAIL", "KT不合格"), + KT_RETURN(360, "KT_RETURN", "KT退货"), + KT_REWORK(370, "KT_REWORK", "KT返工"), + KT_MISCALCULATION(380, "KT_MISCALCULATION", "KT误判"), + KT_SORTING(390, "KT_SORTING", "KT分选"); private int value; From 84bf5ba64a023d027f133893e7fd4fd4fb640610 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 8 Nov 2019 18:39:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1162?= =?UTF-8?q?=EF=BC=8Cpcn=E7=99=BB=E9=99=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 8908c3e..6da43d5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2719,7 +2719,8 @@ public class MesEnumUtil { OPC_LINK_CALLBACK(140, "OPC_LINK", "OPC_LINK_CALLBACK"), SUPPLY_SWITCH(150,"SUPPLY_SWITCH",""), PCN_LOGIN(160, "PCN_LOGIN",""), - PCN_MENU(170, "PCN_MENU",""); + PCN_MENU(170, "PCN_MENU",""), + PCN_MODULE(180, "PCN_MODULE",""); private int value; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java index e2dbc11..53fad7f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java @@ -51,8 +51,18 @@ public class MesPcnSysUserOffline extends BaseBean { private Integer userType; @Lob + @Column(name="LOGIN_INFO") + @ApiParam(value ="登陆信息" , access ="登陆信息") + private String loginInfo; + + @Lob @Column(name="MENU_LIST") @ApiParam(value ="菜单" , access ="菜单") private String menuList; + @Lob + @Column(name="MODULE_LIST") + @ApiParam(value ="模块" , access ="模块") + private String moduleList; + }