Merge branch 'dev' into test

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;

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;

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;
+
 }