From 275f7f86f108290a9b7ef3659d4c0bf50ef19b82 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Wed, 26 Jun 2024 17:45:47 +0800
Subject: [PATCH] workshopCode

---
 .../controller/admin/taskdispatch/TaskDispatchController.java   | 2 +-
 .../biz/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/TaskDispatchController.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/TaskDispatchController.java
index 48f9cdde..0466947e 100644
--- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/TaskDispatchController.java
+++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/taskdispatch/TaskDispatchController.java
@@ -327,7 +327,7 @@ public class TaskDispatchController {
         SystemParametersDO systemParametersDO = systemParametersMapper.selectOne("code", SystemParmetersEnum.OVERTASK_CENTER_LIST.getDescription());
 
         pageResult.getList().forEach(map->{
-            map.setOverTask(Arrays.stream(systemParametersDO.getCurrentValue().split(",")).filter(o->o.equals(map.getWorkshopId().toString())).count()>0?1:0);
+            map.setOverTask(Arrays.stream(systemParametersDO.getCurrentValue().split(",")).filter(o->o.equals(map.getWorkshopCode())).count()>0?1:0);
         });
         return success(pageResult);
     }
diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
index 8ed6cd07..ecdae6d4 100644
--- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
+++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
@@ -106,6 +106,7 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
                 .select("d.name as materialName")
                 .select("d.spec")
                 .select("g.name as workshopName")
+                .select("g.code as workshopCode")
                 .select("e.name as procedureName")
                 .select("d.unit")
                 .select("u.nickname as ownerName")