workshopCode

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

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")