Merge branch 'dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -1134,4 +1134,51 @@ public class CommonEnumUtil {
     // 数据未删除的静态常量
     public static final int FALSE = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 
+    /**
+     * 日志记录方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum  LOG_DETAIL_SHOW_TYPE {
+        DEBUG(1, "DEBUG"),
+        OVER_TIME(2, "记录超时服务"),
+        ALL_METHOD(3, "所有服务"),
+        ALL_METHOD_PARAMETER(4, "所有服务和入参");
+
+        private int value;
+        private String description;
+
+        private LOG_DETAIL_SHOW_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -2712,7 +2712,8 @@ public class MesEnumUtil {
         PCN_PUSH(70, "PCN_PUSH"),
         FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"),
         REWORK_REPAIR(90, "REWORK_REPAIR"),
-        PCN_LOGIN(100, "PCN_LOGIN");
+        PCN_LOGIN(100, "PCN_LOGIN"),
+        PCN_MENU(110, "PCN_MENU");
 
         private int value;
         private String description;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java

@@ -85,6 +85,10 @@ public class MesDismantleRecord extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Column(name = "LOT_NO")
+    @ApiParam("关联批次")
+    private String lotNo;
+
     @Transient
     private String serialNumber;
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java

@@ -46,15 +46,6 @@ public class MesPcnSysUserOffline extends BaseBean {
     @ApiParam(value = "登陆名称", access = "登陆名称")
     private String loginName;
 
-    @Column(name = "ORGANIZE_ID")
-    @ApiParam(value = "部门ID", example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long organizeId;
-
-    @Column(name = "ORGANIZE_NAME")
-    @ApiParam(value = "部门名称", access = "部门名称")
-    private String organizeName;
-
     @Column(name="USER_TYPE")
     @ApiParam(value ="账号类型（枚举，待定）" , example ="-1")
     private Integer userType;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java

@@ -46,11 +46,13 @@ public class MesProdBindRecordModel {
     private String modifyDatetime;
     @ApiParam("产品条码")
     private String serialNumber;
+    @ApiParam("关联批次")
+    private String lotNo;
     public MesProdBindRecordModel() {
 
     }
 
-    public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) {
+    public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty, String lotNo) {
         this.id = id;
         this.itemPartNo = itemPartNo;
         this.itemPartName = itemPartName;
@@ -64,9 +66,10 @@ public class MesProdBindRecordModel {
         this.parentPartNo = parentPartNo;
         this.parentPartName = parentPartName;
         this.dismantleQty = dismantleQty;
+        this.lotNo = lotNo;
     }
 
-    public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName) {
+    public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String lotNo) {
         this.id = id;
         this.itemPartNo = itemPartNo;
         this.itemPartName = itemPartName;
@@ -80,9 +83,10 @@ public class MesProdBindRecordModel {
         this.kpSn = kpSn;
         this.parentPartNo = parentPartNo;
         this.parentPartName = parentPartName;
+        this.lotNo = lotNo;
     }
 
-    public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber) {
+    public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber, String lotNo) {
         this.id = id;
         this.itemPartNo = itemPartNo;
         this.itemPartName = itemPartName;
@@ -101,9 +105,10 @@ public class MesProdBindRecordModel {
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
         this.serialNumber = serialNumber;
+        this.lotNo = lotNo;
     }
 
-    public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber) {
+    public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber, String lotNo) {
         this.itemPartNo = itemPartNo;
         this.qty = qty;
         this.isValid = isValid;
@@ -115,5 +120,6 @@ public class MesProdBindRecordModel {
         this.kpSn = kpSn;
         this.parentPartNo = parentPartNo;
         this.serialNumber = serialNumber;
+        this.lotNo = lotNo;
     }
 }