From de991ff452a0eb496c779e9d6b134b720a9564fa Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 12 三月 2025 08:54:24 +0800
Subject: [PATCH] 1、切割版图推送数据新增工程号及原片顺序

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
index de9e648..b99bef0 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
@@ -1,5 +1,6 @@
 package com.mes.taskcache.controller;
 
+import cn.hutool.json.JSONObject;
 import com.mes.damage.entity.request.DamageRequest;
 import com.mes.edgstoragecage.entity.vo.CutDrawingVO;
 import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
@@ -50,9 +51,9 @@
 
     @ApiOperation("璇嗗埆鏄剧ず:褰撳墠鐗堝浘,闇�瑕佸綋鍓嶅崸寮忕悊鐗囪澶噄d銆佷笂鐗囩嚎璺�")
     @PostMapping("/queryCurrentCutDrawing")
-    public Result queryCurrentCutDrawing(int deviceId, int stationCell) {
-        List<CutDrawingVO> cutDrawingVOS = edgStorageCageDetailsService.queryCurrentCutDrawing(deviceId, stationCell);
-        return Result.build(200, "鎴愬姛", cutDrawingVOS);
+    public Result<JSONObject> queryCurrentCutDrawing(int deviceId, int stationCell) {
+        JSONObject jsonObject = edgStorageCageDetailsService.queryCurrentCutDrawing(deviceId, stationCell);
+        return Result.build(200, "鎴愬姛", jsonObject);
     }
 
     @ApiOperation("璇嗗埆鎿嶄綔锛�   鐮存崯/鎷胯蛋     鍙傛暟锛圛D,鍔熻兘[9锛氭嬁璧帮紝8:鐮存崯]锛�")

--
Gitblit v1.8.0