From e50878bcff82386a373ae7be88872f97f5ff9e09 Mon Sep 17 00:00:00 2001 From: yxheli Date: Thu, 23 Jan 2025 16:54:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../materialplandetail/MaterialPlanDetailDO.java | 4 ++-- .../dal/dataobject/pgmaster/PgMasterLineDO.java | 4 ++-- .../module/heli/dal/dataobject/plan/PlanDO.java | 4 ++-- .../dataobject/storagelogNow/StorageLogNowDO.java | 4 ++-- .../dataobject/taskdispatch/TaskDispatchDO.java | 4 ++-- .../dataobject/zjpgmaster/ZjPgMasterLineDO.java | 3 ++- .../bdgzsomthing/bdgzsomthingServiceImpl.java | 14 +++++++------- 7 files changed, 19 insertions(+), 18 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplandetail/MaterialPlanDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplandetail/MaterialPlanDetailDO.java index a0d7fb1..0895962 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplandetail/MaterialPlanDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplandetail/MaterialPlanDetailDO.java @@ -74,7 +74,7 @@ public class MaterialPlanDetailDO extends BaseDO { private String projectMaterialPlanNo; @TableField(exist = false) private String named; - @TableField(exist = false) - private Long creator; + + private String creator; } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pgmaster/PgMasterLineDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pgmaster/PgMasterLineDO.java index 5e3b6e0..9150970 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pgmaster/PgMasterLineDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/pgmaster/PgMasterLineDO.java @@ -155,7 +155,7 @@ public class PgMasterLineDO extends BaseDO { @TableField(exist = false) private String nickName; - @TableField(exist = false) - private Long creator; + + private String creator; } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plan/PlanDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plan/PlanDO.java index 9ee5e92..7f95d0e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plan/PlanDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plan/PlanDO.java @@ -199,8 +199,8 @@ public class PlanDO extends BaseDO { private String mouldName; @TableField(exist = false) private String processDesignType; - @TableField(exist = false) - private Long creator; + + private String creator; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogNow/StorageLogNowDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogNow/StorageLogNowDO.java index ff3ea8d..9677eec 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogNow/StorageLogNowDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagelogNow/StorageLogNowDO.java @@ -58,6 +58,6 @@ public class StorageLogNowDO extends BaseDO { @TableField(exist = false) private Long matUnitId; - @TableField(exist = false) - private Long creator; + + private String creator; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java index 8572d17..945dabb 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java @@ -133,8 +133,8 @@ public class TaskDispatchDO extends BaseDO { @TableField(exist = false) private Long requiredEndDate; - @TableField(exist = false) - private Long creator; + + private String creator; @TableField(exist = false) private String craftContent; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjpgmaster/ZjPgMasterLineDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjpgmaster/ZjPgMasterLineDO.java index 445c70a..a8abf8c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjpgmaster/ZjPgMasterLineDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjpgmaster/ZjPgMasterLineDO.java @@ -130,8 +130,9 @@ public class ZjPgMasterLineDO extends BaseDO { @TableField(exist = false) private String nickName; + @TableField(exist = false) - private Long creator; + private String creator; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java index b039231..cb39f8e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java @@ -238,7 +238,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); attentiontodoDO.setEvent("库存低于安全库存"); attentiontodoDO.setAttr5("1"); - attentiontodoDO.setAttr4(userApi.getUser( storageLogNowDO.getCreator()).getNickname()); + attentiontodoDO.setAttr4(userApi.getUser( Long.parseLong(storageLogNowDO.getCreator())).getNickname()); attentiontodoDO.setLevel("1"); attentiontodook.add(attentiontodoDO); @@ -381,7 +381,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); attentiontodoDO.setEvent("生产任务到期"); //改内容 attentiontodoDO.setAttr5("1"); - attentiontodoDO.setAttr4(userApi.getUser( storageLogNowDO.getCreator()).getNickname()); //改对应 + attentiontodoDO.setAttr4(userApi.getUser( Long.parseLong(storageLogNowDO.getCreator())).getNickname()); //改对应 attentiontodoDO.setLevel("1"); attentiontodookddfh6.add(attentiontodoDO); @@ -481,7 +481,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); attentiontodoDO.setEvent("装配任务到期"); //改内容 attentiontodoDO.setAttr5("1"); - attentiontodoDO.setAttr4(userApi.getUser( storageLogNowDO.getCreator()).getNickname()); //改对应 + attentiontodoDO.setAttr4(userApi.getUser( Long.parseLong(storageLogNowDO.getCreator())).getNickname()); //改对应 attentiontodoDO.setLevel("1"); attentiontodookddfh5.add(attentiontodoDO); @@ -568,7 +568,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); attentiontodoDO.setEvent("质检任务到期前"); //改内容 attentiontodoDO.setAttr5("1"); - attentiontodoDO.setAttr4(userApi.getUser( storageLogNowDO.getCreator()).getNickname()); //改对应 + attentiontodoDO.setAttr4(userApi.getUser( Long.parseLong(storageLogNowDO.getCreator())).getNickname()); //改对应 attentiontodoDO.setLevel("1"); attentiontodookddfh7.add(attentiontodoDO); @@ -666,7 +666,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); attentiontodoDO.setEvent("质检任务到期前"); //改内容 attentiontodoDO.setAttr5("1"); - attentiontodoDO.setAttr4(userApi.getUser( storageLogNowDO.getCreator()).getNickname()); //改对应 + attentiontodoDO.setAttr4(userApi.getUser( Long.parseLong(storageLogNowDO.getCreator())).getNickname()); //改对应 attentiontodoDO.setLevel("1"); attentiontodookddfh7o.add(attentiontodoDO); @@ -760,7 +760,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); attentiontodoDO.setEvent("设计任务到期"); //改内容 attentiontodoDO.setAttr5("1"); - attentiontodoDO.setAttr4(userApi.getUser( storageLogNowDO.getCreator()).getNickname()); //改对应 + attentiontodoDO.setAttr4(userApi.getUser( Long.parseLong(storageLogNowDO.getCreator())).getNickname()); //改对应 attentiontodoDO.setLevel("1"); attentiontodookddfh4.add(attentiontodoDO); @@ -864,7 +864,7 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { AttentiontodoDO attentiontodoDO = new AttentiontodoDO(); attentiontodoDO.setEvent("《物料需求计划》的采购"); //改内容 attentiontodoDO.setAttr5("1"); - attentiontodoDO.setAttr4(userApi.getUser( storageLogNowDO.getCreator()).getNickname()); //改对应 + attentiontodoDO.setAttr4(userApi.getUser( Long.parseLong(storageLogNowDO.getCreator())).getNickname()); //改对应 attentiontodoDO.setLevel("1"); attentiontodookddfh9.add(attentiontodoDO);