From 78e5175a05eeb3776d3f21f603fb6fb7a18b3d54 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 08 八月 2024 10:14:59 +0800
Subject: [PATCH] 1、任务表中新增是否删除字段 0：未删除 1：已删除 2、磨边队列方法改造：增加设置参数接口，websocket推送数据时可按照设置的参数推送对应的数据 3、任务新增破损、拿走状态处理 4、破损数据新增批量新增 5、工位流程卡玻璃是否到齐方法完善
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java
index cea55e5..1aa6fbb 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.downglassinfo.entity.DownGlassInfo;
+import com.mes.downglassinfo.entity.request.DownGlassInfoRequest;
+import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.entity.dto.DownGlassInfoDTO;
import java.util.List;
@@ -13,7 +15,7 @@
* @param flowCardId
* @return // 鏍规嵁娴佺▼鍗″彿鏌ヨ鏈�澶у簭鍙�
*/
- Integer getMaxSequenceByFlowCardId(String flowCardId);
+ Integer getMaxSequenceByFlowCardId(String flowCardId, int layer);
/**
* @param downGlassInfo 鎻掑叆涓嬬墖淇℃伅
@@ -25,5 +27,40 @@
Integer queryMaxSequence(String flowCardId, int layer);
- List<DownGlassInfoDTO> queryWorkStationNotIn();
+ /**
+ * 鑾峰彇鏋跺瓙缁戝畾 娴佺▼鍗＄殑鐜荤拑淇℃伅锛堝凡钀芥灦/鏈惤鏋讹級
+ *
+ * @param isDownload true/false
+ * @return
+ */
+ List<DownGlassInfoDTO> queryWorkStationIsIn(List<Integer> workList, Boolean isDownload);
+
+ /**
+ * 鑾峰彇鎸囧畾鏋跺瓙宸茬粦瀹氭祦绋嬪崱鐨勬灦瀛愭湭钀界幓鐠冪殑鏁版嵁淇℃伅
+ *
+ * @param workList 鎸囧畾鐨勬灦瀛愬彿
+ * @return
+ */
+ List<DownGlassInfoDTO> queryWorkStationFlowCard(List<Integer> workList);
+
+ /**
+ * 鐢熸垚鍑虹墖浠诲姟
+ *
+ * @param glassId
+ * @return
+ */
+ boolean generateOutGlassTask(String glassId);
+
+ /**
+ * 璁剧疆鏋跺瓙瀹氭椂浠诲姟鏌ヨ鏉′欢
+ *
+ * @param request
+ * @return
+ */
+ String setDownGlassInfoRequest(DownGlassInfoRequest request);
+
+ /**
+ * 鏌ヨ鏋跺瓙涓婄粦瀹氭祦绋嬪崱鐨勭幓鐠冩槸鍚﹀埌榻�
+ */
+ List<DownWorkstation> queryWorkStationIsFull();
}
--
Gitblit v1.8.0