From c6cb57f307b0c62a05cac78cfd828c313f10e611 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 15 四月 2025 10:58:25 +0800
Subject: [PATCH] 1、卧式理片笼新增任务逻辑 2、入参时间加入时区
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
index 2dfceff..fdd61c2 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
@@ -1,9 +1,11 @@
package com.mes.edgstoragecage.service;
+import cn.hutool.json.JSONObject;
import com.github.yulichang.base.MPJBaseService;
-import com.mes.edgglasstask.entity.request.IdentWornRequest;
+import com.mes.damage.entity.request.DamageRequest;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
-import com.mes.edgstoragecage.entity.vo.CutDrawingVO;
+import com.mes.edgstoragecage.entity.vo.EdgSlotRemainVO;
+import com.mes.largenscreen.entity.PieChartVO;
import java.util.List;
import java.util.Map;
@@ -18,16 +20,20 @@
*/
public interface EdgStorageCageDetailsService extends MPJBaseService<EdgStorageCageDetails> {
-// boolean identWorn(Map<String, Object> arguments);
-
/**
* 鎸夌収璁惧鍙婄嚎璺紝鑾峰彇褰撳墠绾胯矾姝ｅ湪鍒囧壊鐨勭増鍥句俊鎭�
* @param deviceId
* @param stationCell
* @return
*/
- List<CutDrawingVO> queryCurrentCutDrawing(int deviceId, int stationCell);
+ JSONObject queryCurrentCutDrawing(int deviceId, int stationCell);
+ /**
+ * 鎸夌収宸ョ▼id鍙婄増搴忚幏鍙栧垏鍓茬増鍥� 榛樿鐗堝簭涓�1
+ * @param engineerId
+ * @param patternSequence
+ * @return
+ */
Map<String, Object> queryCutDrawingByEngineerId(String engineerId, int patternSequence);
/**
@@ -62,7 +68,7 @@
* @param request
* @return
*/
- String identControls(IdentWornRequest request);
+ String identControls(DamageRequest request);
/**
* 纾ㄨ竟妯″潡姹囨姤鐜荤拑鐘舵�� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愮牬鎹�/鎷胯蛋銆�
@@ -70,7 +76,7 @@
* @param request
* @return
*/
- String edgReportStatus(IdentWornRequest request);
+ String edgReportStatus(DamageRequest request);
/**
* 杩涚墖 鎵爜ID楠岃瘉閲嶅
@@ -89,4 +95,20 @@
* @return
*/
EdgStorageCageDetails queryEdgStorageDetailsBySize(int deviceId, int currentSlot, double width, double height);
+
+ /**
+ * 鎸夌収灏哄,绾胯矾銆佺嚎璺渶澶ф渶灏忓昂瀵歌幏鍙栫鍚堣姹傜殑鐜荤拑灏忕墖鏁版嵁
+ *
+ * @param deviceId
+ * @param width
+ * @param height
+ * @return
+ */
+ EdgStorageCageDetails queryEdgStorageDetailsByLimitSize(int deviceId, Integer currentCell, double width, double height, int cell, int minOneFirstLength, int minOneSecondLength, int maxTwoFirstLength, int maxTwoSecondLength);
+
+ String edgDetailsOperate(DamageRequest request);
+
+ List<EdgSlotRemainVO> querySlotRemainWidth(int cellLength, int glassGap);
+
+ List<PieChartVO> queryPieChart();
}
--
Gitblit v1.8.0