From ef45387ac4b65538bb965dd7fe9c40d28bceca64 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:21:48 +0800
Subject: [PATCH] 1、卧理进出片任务功能初步完成，待调试
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java | 19 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/device/EdgStorageDeviceOneTask.java | 9
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskHistoryService.java | 15 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageDetailsMapper.java | 1
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTask.java | 57 +++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 10
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageMapper.java | 12
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java | 9
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/device/EdgStorageDeviceTwoTask.java | 9
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceController.java | 9
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageDetailsMapper.xml | 58 +++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml | 34 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTaskHistory.java | 63 ++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskService.java | 21 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml | 26 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java | 86 +++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java | 332 ++++++++++++++++++++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 27 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java | 32 ++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 24 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskHistoryMapper.java | 15 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java | 14
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskMapper.java | 15 +
24 files changed, 876 insertions(+), 23 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
index 2a9f2a9..c2ee1cc 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -57,13 +57,22 @@
public static final List<Integer> GLASS_STATE_IN_ALL_ZERO = Arrays.asList(0, 100, 102, 103, 104);
/**
- * 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
- * 杩涚墖浠诲姟1
- * 鍑虹墖浠诲姟2
+ * 鍗х浠诲姟绫诲瀷
+ * 绌轰换鍔� 0
+ * 杩涚墖浠诲姟 1
+ * 鍑虹墖浠诲姟 2
+ * 鐩撮�氫换鍔� 3
+ * 杩涜涓� 4
+ * 缁撴潫 5
+ * 鍏朵粬 6
*/
+ public static final Integer GLASS_CACHE_TYPE_EMPTY = 0;
public static final Integer GLASS_CACHE_TYPE_IN = 1;
public static final Integer GLASS_CACHE_TYPE_OUT = 2;
public static final Integer GLASS_CACHE_TYPE_THROUGH = 3;
+ public static final Integer GLASS_CACHE_TYPE_RUNNING = 4;
+ public static final Integer GLASS_CACHE_TYPE_FINISH = 5;
+ public static final Integer GLASS_CACHE_TYPE_OTHER = 6;
public static final List<Integer> GLASS_CACHE_TYPE_OUT_ALL = Arrays.asList(2, 3);
/**
@@ -185,6 +194,9 @@
* 鍘熺墖浠撳偍浠诲姟绫诲瀷
* 杩涚墖浠诲姟1
* 鍑虹墖浠诲姟2
+ * 璋冨害浠诲姟3
+ * 杩涚墖璇锋眰4
+ * 鍑虹墖璇锋眰5
*/
public static final Integer RAW_GLASS_TASK_TYPE_IN = 1;
public static final Integer RAW_GLASS_TASK_TYPE_OUT = 2;
@@ -193,9 +205,9 @@
public static final Integer RAW_GLASS_TASK_TYPE_OUT_REQUEST = 5;
/**
- * 鍘熺墖浠撳偍浠诲姟绫诲瀷
- * 杩涚墖浠诲姟1
- * 鍑虹墖浠诲姟2
+ * 鍘熺墖浠撳偍浠诲姟鐘舵��
+ * 鏂板缓0
+ * 宸插畬鎴�1
*/
public static final Integer ENGINEERING_NEW = 0;
public static final Integer ENGINEERING_RUNNING = 1;
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageDetailsMapper.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageDetailsMapper.java
index 5b857ef..c7ddd26 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageDetailsMapper.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageDetailsMapper.java
@@ -13,4 +13,5 @@
*/
public interface EdgStorageCageDetailsMapper extends MPJBaseMapper<EdgStorageCageDetails> {
+ EdgStorageCageDetails queryEdgStorageDetailsBySize(double width, double height);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageMapper.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageMapper.java
index bfc7ed2..b727e12 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageMapper.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageMapper.java
@@ -1,8 +1,8 @@
package com.mes.edgstoragecage.mapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.mes.edgstoragecage.entity.EdgStorageCage;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -14,4 +14,14 @@
*/
public interface EdgStorageCageMapper extends MPJBaseMapper<EdgStorageCage> {
+ /**
+ * 鐩稿悓灏哄鍙互鏀句笅鐨勬牸瀛�
+ *
+ * @param deviceId
+ * @param width
+ * @param height
+ * @param slot
+ * @return
+ */
+ EdgStorageCage getEdgStorageCageBySize(@Param("deviceId") int deviceId, @Param("width") double width, @Param("height") double height, @Param("slot") int slot);
}
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 afc41fc..d8be128 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
@@ -78,4 +78,13 @@
* @return
*/
boolean inToVerify(String glassId);
+
+ /**
+ * 鎸夌収灏哄
+ *
+ * @param width
+ * @param height
+ * @return
+ */
+ EdgStorageCageDetails queryEdgStorageDetailsBySize(double width, double height);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
index 73b2bd4..2a998da 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
@@ -26,14 +26,17 @@
EdgStorageCage selectNearestEmpty(int currentSlot, boolean flag);
List<EdgStorageCage> selectCacheEmpty();
+
/**
* 鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏
+ *
* @return
*/
List<Map<String, Object>> selectCacheOut();
/**
* 鏌ヨ绗煎唴璇︽儏
+ *
* @return
*/
List<Map<String, Object>> selectEdgStorageCages();
@@ -55,4 +58,15 @@
*/
boolean updateEdgStorageCageDetails(int edgStorageCageId, EdgStorageCageDetails edgStorageCageDetails);
+ /**
+ * 鐩稿悓灏哄鍙互鏀句笅鐨勬牸瀛�
+ *
+ * @param deviceId
+ * @param width
+ * @param height
+ * @param slot
+ * @return
+ */
+ EdgStorageCage getEdgStorageCageBySize(int deviceId, double width, double height, int slot);
+
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index 16a8ff2..08b79ea 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -334,22 +334,22 @@
for (int i = 1; i <= groupBy.keySet().size(); i++) {
String key = i + "";
if (key != null) {
- List<Map<String, Object>> galssInfo=groupBy.get(key);//褰撳墠閽㈠寲鐗堝浘鍐呯幓鐠冨皬鐗囬泦鍚�
- if(!galssInfo.isEmpty()){
- Map<String, Object> item=new HashMap<>();//鏂版牸寮忕紪鎺�
+ List<Map<String, Object>> galssInfo = groupBy.get(key);//褰撳墠閽㈠寲鐗堝浘鍐呯幓鐠冨皬鐗囬泦鍚�
+ if (!galssInfo.isEmpty()) {
+ Map<String, Object> item = new HashMap<>();//鏂版牸寮忕紪鎺�
//浠ヤ笅涓哄悓灞� {key:"groupBy.get(key)",olLayoutRate:"灏忕墖闆嗗悎"}
// {key:"groupBy.get(key)",olLayoutRate:[{},{},{},{}]}
- item.put("listGlass",groupBy.get(key));
- item.put("LayoutId",key);
- item.put("olWidth",galssInfo.get(0).get("olWidth").toString());
- item.put("olHeight",galssInfo.get(0).get("olHeight").toString());
- item.put("olLayoutRate",galssInfo.get(0).get("olLayoutRate").toString());
+ item.put("listGlass", groupBy.get(key));
+ item.put("LayoutId", key);
+ item.put("olWidth", galssInfo.get(0).get("olWidth").toString());
+ item.put("olHeight", galssInfo.get(0).get("olHeight").toString());
+ item.put("olLayoutRate", galssInfo.get(0).get("olLayoutRate").toString());
result.add(item);
- }else{
- log.info("褰撳墠閽㈠寲鐗堝浘涓嶅瓨鍦ㄥ皬鐗囨暟鎹妫�鏌ワ紝鐗堝浘鍙�:{}"+key);
- return null ;
+ } else {
+ log.info("褰撳墠閽㈠寲鐗堝浘涓嶅瓨鍦ㄥ皬鐗囨暟鎹妫�鏌ワ紝鐗堝浘鍙�:{}" + key);
+ return null;
}
}
}
@@ -523,4 +523,9 @@
}
return false;
}
+
+ @Override
+ public EdgStorageCageDetails queryEdgStorageDetailsBySize(double width, double height) {
+ return baseMapper.queryEdgStorageDetailsBySize(width, height);
+ }
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
index 68cace1..55ba683 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -19,7 +19,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,9 +35,9 @@
@Service
public class EdgStorageCageServiceImpl extends MPJBaseServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
- @Resource
+ @Autowired
EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
- @Resource
+ @Autowired
UpPattenUsageMapper upPattenUsageMapper;
@Autowired
@@ -183,5 +182,10 @@
return true;
}
+ @Override
+ public EdgStorageCage getEdgStorageCageBySize(int deviceId, double width, double height, int slot) {
+ return baseMapper.getEdgStorageCageBySize(deviceId, width, height, slot);
+ }
+
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
index 165ff7f..0211d1e 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
@@ -1,11 +1,32 @@
package com.mes.job;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.kangaroohy.milo.service.MiloService;
+import com.mes.common.config.Const;
+import com.mes.edgstoragecage.entity.EdgStorageCage;
+import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
+import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
+import com.mes.edgstoragecage.service.EdgStorageCageService;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.opctask.entity.EdgStorageDeviceTask;
+import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
+import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
+import com.mes.opctask.service.EdgStorageDeviceTaskService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.util.Arrays;
+import javax.annotation.Resource;
+import java.util.List;
/**
* @Author : zhoush
@@ -16,8 +37,28 @@
@Slf4j
public class OpcCacheGlassTask {
+ @Autowired(required = false)
+ MiloService miloService;
+ @Resource
+ EdgStorageDeviceTaskService edgStorageDeviceTaskService;
+ @Resource
+ GlassInfoService glassInfoService;
+ @Resource
+ EdgStorageCageDetailsService edgStorageCageDetailsService;
+ @Resource
+ EdgStorageCageService edgStorageCageService;
+ @Resource
+ EdgStorageDeviceTaskHistoryService edgStorageDeviceTaskHistoryService;
+
+ @Value("${mes.glassGap}")
+ private int glassGap;
+ @Value("${mes.cellLength}")
+ private int cellLength;
+
+ @Value("${mes.threshold}")
+ private int threshold;
// @Autowired
-// MiloService miloService;
+// MPJBaseService edgStorageDeviceTaskService;
//
// @Autowired
// SubscriptionCallback cacheGlassSubscriptionCallback;
@@ -26,4 +67,291 @@
// public void startOpcTask() throws Exception {
// miloService.subscriptionFromOpcUa(Arrays.asList("my.device.x1", "my.device.x2"), cacheGlassSubscriptionCallback);
// }
+
+ @Scheduled(fixedDelay = 1000)
+ public void startOpcTask() throws Exception {
+ int request = 1;
+// 鑾峰彇绗煎唴鐜荤拑淇℃伅
+ taskByDevice();
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void finishOpcTask() throws Exception {
+ EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage("edg_storage_device_one_task");
+ if (task == null) {
+ log.info("浠诲姟琛ㄥ熀纭�鏁版嵁褰曞叆澶辫触锛岃妫�鏌ユ暟鎹槸鍚﹀綍鍏ユ垚鍔�");
+ return;
+ }
+ if (task.getTaskState() <= 3) {
+ log.info("涓嶅瓨鍦ㄦ湭瀹屾垚鐨勪换鍔�");
+ return;
+ }
+ Integer cell = task.getStartCell();
+ Integer state = task.getTaskState();
+ task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
+ task.setTaskState(Const.GLASS_CACHE_TYPE_EMPTY);
+ task.setStartCell(-1);
+ edgStorageDeviceTaskService.updateTaskMessage("edg_storage_device_one_task", task);
+ edgStorageDeviceTaskHistoryService.update(new LambdaUpdateWrapper<EdgStorageDeviceTaskHistory>()
+ .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .set(EdgStorageDeviceTaskHistory::getTaskState,
+ Const.GLASS_CACHE_TYPE_RUNNING.equals(state) ? Const.RAW_GLASS_TASK_SUCCESS : Const.RAW_GLASS_TASK_FAILURE)
+ );
+ updateCellRemainWidth(cell);
+ }
+
+ private void taskByDevice() throws Exception {
+ EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage("edg_storage_device_one_task");
+ if (task == null) {
+ log.info("浠诲姟琛ㄥ熀纭�鏁版嵁褰曞叆澶辫触锛岃妫�鏌ユ暟鎹槸鍚﹀綍鍏ユ垚鍔�");
+ return;
+ }
+ int request = task.getTaskState();
+ if (request == 0) {
+ log.info("鏈敹鍒颁换鍔¤姹傦紝缁撴潫鏈浠诲姟");
+ } else if (request == 1) {
+ //杩涚墖浠诲姟
+ intoTask(task);
+ } else if (request == 2) {
+ //鍑虹墖浠诲姟
+ outTask(task);
+ } else if (request == 3) {
+ //todo:鐩撮�氫换鍔�
+
+ } else {
+ log.info("寮傚父鏁版嵁锛岀粨鏉熸湰娆′换鍔�");
+ }
+ }
+
+ private boolean intoTask(EdgStorageDeviceTask task) {
+ //鑾峰彇鐜荤拑鐨勫熀鏈俊鎭�
+ GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, task.getGlassIdIn()));
+ if (null == glassInfo) {
+ log.info("杩涚墖鐜荤拑淇℃伅涓嶅瓨鍦紝鐜荤拑id:{}", task.getGlassIdIn());
+ return Boolean.FALSE;
+ }
+ //鑾峰彇褰撳墠杩涚墖鐜荤拑id鍜岃繘鐗囨牸瀛� 鐩稿悓灏哄鍙互鏀句笅鐨勬牸瀛�
+// select * from edg_storage_cage t left join edg_storage_cage_details t1 on t.slot = t1.slot
+// where t.device_id =1 and t1.state = 100 and t.remain_width >= 827 and t1.width = 827 and t1.height = 1124 order by abs(t.slot - 10)
+ EdgStorageCage edgStorageCage = edgStorageCageService.getEdgStorageCageBySize(1, glassInfo.getWidth(), glassInfo.getHeight(), task.getCurrentCell());
+ if (edgStorageCage == null) {
+ log.info("鐩稿悓灏哄鍙互鏀句笅鐨勬牸瀛愭湭鎵惧埌锛屾牸瀛恑d:{}", task.getCurrentCell());
+// SELECT * from edg_storage_cage where device_id = 1 and remain_width > 1000 order by abs(slot - 10)
+ List<EdgStorageCage> storageCageList = edgStorageCageService.list(new LambdaQueryWrapper<EdgStorageCage>().eq(EdgStorageCage::getDeviceId, 1)
+ .eq(EdgStorageCage::getEnableState, Const.SLOT_ON)
+ .ge(EdgStorageCage::getRemainWidth, glassInfo.getWidth()).last("order by abs(slot - " + task.getCurrentCell() + ")"));
+// //鐩撮�氫换鍔�
+// if (flag && CollectionUtil.isNotEmpty(emptyList)) {
+// return emptyList.get(0);
+// }
+ if (CollectionUtil.isEmpty(storageCageList) || storageCageList.size() == 1) {
+ log.info("娌℃湁澶氫綑鐨勭┖鏍煎瓙");
+ return Boolean.FALSE;
+ }
+ edgStorageCage = storageCageList.get(0);
+ }
+ log.info("4銆佸皢鐜荤拑淇℃伅鎻掑叆鍗у紡鐞嗙墖绗�,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
+ EdgStorageCageDetails details = new EdgStorageCageDetails();
+ BeanUtils.copyProperties(glassInfo, details);
+ details.setState(Const.GLASS_STATE_IN);
+ details.setSlot(edgStorageCage.getSlot());
+ details.setDeviceId(edgStorageCage.getDeviceId());
+ edgStorageCageDetailsService.save(details);
+
+ //鏇存柊浠诲姟淇℃伅
+ task.setStartCell(edgStorageCage.getSlot());
+ task.setTaskRunning(task.getTaskState());
+ edgStorageDeviceTaskService.updateTaskMessage("edg_storage_device_one_task", task);
+ saveHistoryTask(task);
+ return Boolean.TRUE;
+ }
+
+ private boolean outTask(EdgStorageDeviceTask task) {
+ EdgStorageCageDetails edgStorageCageDetails = null;
+ //绗煎唴鏄増鍥剧浉宸槸鍚﹁秴杩囬槇鍊�
+ boolean flag = queryMaxMinDiff(threshold);
+ if (flag) {
+ EdgStorageCageDetails minEdgDetails = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .inSql(EdgStorageCageDetails::getSlot, "select slot from edg_storage_cage where enable_state = " + Const.SLOT_ON)
+ .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId)
+ .orderBy(Boolean.TRUE, Boolean.TRUE, EdgStorageCageDetails::getTemperingFeedSequence)
+ .last("limit 1"));
+// select * from edg_storage_cage_details where width = 551 and height = 1151 and id in (select min(id ) from edg_storage_cage_details where state = 100 group by slot )
+ edgStorageCageDetails = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getWidth, minEdgDetails.getWidth())
+ .eq(EdgStorageCageDetails::getHeight, minEdgDetails.getHeight())
+ .inSql(EdgStorageCageDetails::getId, "select min(id ) from edg_storage_cage_details where state = 100 group by slot ")
+ .last("order by abs(t.slot - " + task.getCurrentCell() + ") asc limit 1")
+ );
+ if (null == edgStorageCageDetails) {
+ edgStorageCageDetails = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ .eq(EdgStorageCageDetails::getSlot, minEdgDetails.getSlot())
+ .orderByAsc(EdgStorageCageDetails::getId)
+ .last("limit 1")
+ );
+ }
+ }
+ if (null == edgStorageCageDetails) {
+ // 鑾峰彇涓婃浠诲姟
+// 鑾峰彇鍘嗗彶琛ㄤ腑涓婃浠诲姟鏈�鍚庝竴鐗囧昂瀵�
+ EdgStorageDeviceTaskHistory edgeData = edgStorageDeviceTaskHistoryService.getOne(new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
+ .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_SUCCESS).
+ orderByDesc(EdgStorageDeviceTaskHistory::getId).last("limit 1"));
+ GlassInfo one = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, edgeData.getGlassIdOut()));
+ //绗煎唴鐨勭幓鐠冪殑灏哄鏄惁鍜屼笂涓�娆′换鍔′竴鑷�
+ edgStorageCageDetails = edgStorageCageDetailsService.queryEdgStorageDetailsBySize(one.getWidth(), one.getHeight());
+ }
+ if (null == edgStorageCageDetails) {
+ edgStorageCageDetails = edgStorageCageDetailsService.queryEdgStorageDetailsBySize(0, 0);
+ }
+ if (edgStorageCageDetails == null) {
+ //鍜屼笂娆′换鍔′笉瀛樺湪鐩稿悓灏哄
+ log.info("绗煎唴娌℃湁鐜荤拑浜�");
+ return Boolean.FALSE;
+ }
+ //鐜荤拑淇℃伅鏇挎崲
+ String glassIdChange = queryAndChangeGlass(edgStorageCageDetails.getGlassId());
+ //澶勭悊鍦ㄥ崸鐞嗗唴鐨勭幓鐠冧俊鎭細绗煎唴鐨勬暟鎹鐞�
+ queryEdgAndChangeGlass(edgStorageCageDetails.getGlassId(), glassIdChange);
+ //鐢熸垚鍑虹墖浠诲姟
+ task.setGlassIdOut(edgStorageCageDetails.getGlassId());
+ task.setCurrentCell(edgStorageCageDetails.getSlot());
+ task.setTaskRunning(Const.GLASS_CACHE_TYPE_OUT);
+ edgStorageDeviceTaskService.updateTaskMessage("edg_storage_device_one_task", task);
+ saveHistoryTask(task);
+ //鏇存柊璇︽儏琛ㄤ换鍔″嚭鐗囦腑
+ edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>()
+ .set(EdgStorageCageDetails::getState, Const.GLASS_STATE_OUT)
+ .eq(EdgStorageCageDetails::getGlassId, edgStorageCageDetails.getGlassId()));
+ return Boolean.TRUE;
+ }
+
+ private boolean updateCellRemainWidth(int slot) {
+ List<EdgStorageCageDetails> list = edgStorageCageDetailsService.list(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getSlot, slot)
+ .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));
+ if (CollectionUtil.isEmpty(list)) {
+ log.info("鏍煎瓙{}鍐呮棤鐜荤拑锛屾棤娉曟洿鏂�", slot);
+ return Boolean.FALSE;
+ }
+ int widthTotal = (int) list.stream().map(e -> e.getWidth() + glassGap).mapToDouble(Double::intValue).sum();
+ int remainWidth = cellLength - widthTotal >= 0 ? cellLength - widthTotal : 0;
+ edgStorageCageService.update(new LambdaUpdateWrapper<EdgStorageCage>().
+ set(EdgStorageCage::getRemainWidth, remainWidth).eq(EdgStorageCage::getSlot, slot));
+ return Boolean.FALSE;
+ }
+
+
+ /**
+ * 鏌ヨ鐜荤拑骞惰繘琛屼氦鎹�
+ *
+ * @param glassId
+ * @return
+ */
+ public String queryAndChangeGlass(String glassId) {
+ GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
+// .inSql(GlassInfo::getEngineerId, "select engineer_id from engineering where state = 1"));
+ Assert.isFalse(null == glassInfo, "鐜荤拑淇℃伅涓嶅瓨鍦�"); //鎸夌収鐜荤拑灏哄
+ LambdaQueryWrapper<GlassInfo> queryWrapper = new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getWidth, glassInfo.getWidth())
+ .eq(GlassInfo::getHeight, glassInfo.getHeight())
+ .eq(GlassInfo::getThickness, glassInfo.getThickness())
+ .eq(GlassInfo::getFilmsid, glassInfo.getFilmsid())
+ .eq(GlassInfo::getFlowCardId, glassInfo.getFlowCardId())
+ .eq(GlassInfo::getTotalLayer, glassInfo.getTotalLayer())
+ .eq(GlassInfo::getLayer, glassInfo.getLayer())
+ .eq(GlassInfo::getEngineerId, glassInfo.getEngineerId())
+ .notInSql(GlassInfo::getGlassId, "select distinct glass_id from edg_storage_cage_details " +
+ "where engineer_id = '" + glassInfo.getEngineerId() + "' and width = " + glassInfo.getWidth() + " and height = " + glassInfo.getHeight()
+ + " and state != 100")
+ .orderByAsc(GlassInfo::getTemperingLayoutId)
+ .orderBy(Boolean.TRUE, Boolean.TRUE, GlassInfo::getTemperingFeedSequence)
+ .last("Limit 1");
+ GlassInfo swapGlassInfo = glassInfoService.getOne(queryWrapper);
+ if (swapGlassInfo != null && !glassInfo.getGlassId().equals(swapGlassInfo.getGlassId())) {
+ String swapGlassId = swapGlassInfo.getGlassId();
+ log.info("灏嗙幓鐠儃}鍜岀幓鐠儃}锛屼俊鎭簰鎹�,杩涚幓鐠� {}", glassInfo, swapGlassInfo, swapGlassInfo);
+ swapGlassInfo.setGlassId(glassId);
+ glassInfo.setGlassId(swapGlassId);
+ glassInfoService.updateById(swapGlassInfo);
+ glassInfoService.updateById(glassInfo);
+ return swapGlassId;
+ }
+ return "";
+ }
+
+
+ /**
+ * 鏌ヨ鍗у紡鐞嗙墖鐜荤拑骞惰繘琛屼氦鎹�
+ *
+ * @param glassId
+ * @return
+ */
+ public void queryEdgAndChangeGlass(String glassId, String swapGlassId) {
+ if (StringUtils.isBlank(swapGlassId)) {
+ log.info("褰撳墠鍑虹鐜荤拑涓嶅瓨鍦ㄩ渶瑕佹浛鎹㈢殑鐜荤拑");
+ return;
+ }
+ //鑾峰彇寰呭嚭绗肩殑鐜荤拑
+ EdgStorageCageDetails glassInfo = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getGlassId, glassId).eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));
+// 鑾峰彇寰呭嚭绗肩殑鐜荤拑闇�瑕佹浛鎹㈢殑鐜荤拑淇℃伅
+ EdgStorageCageDetails swapGlassDetailInfo = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getGlassId, swapGlassId).eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));
+
+// 鐜荤拑灏忕墖琛ㄤ腑鐜荤拑宸茬粡鏇挎崲锛屾洿鏂板崸鐞嗙鍐呯幇鏈夌殑鍑嗗鍑虹鐨勭幓鐠冧俊鎭紝
+ if (null == swapGlassDetailInfo) {
+ GlassInfo glassInfoBase = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, glassId));
+ //闇�瑕佹浛鎹㈢殑鐜荤拑涓哄瓨杩涘崸鐞嗭紝浠呴渶鏇存柊褰撳墠闇�瑕佸嚭绗肩殑鐜荤拑淇℃伅鍗冲彲
+ edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getGlassId, glassId)
+ .set(EdgStorageCageDetails::getTemperingLayoutId, glassInfoBase.getTemperingLayoutId())
+ .set(EdgStorageCageDetails::getTemperingFeedSequence, glassInfoBase.getTemperingFeedSequence()));
+ } else {
+ //闇�瑕佹浛鎹㈢殑鐜荤拑閮藉湪鍗х悊鍐咃紝鎸夌収鐜荤拑id瀵硅皟鐜荤拑淇℃伅锛氬璋冪幓鐠僫d鍗冲彲
+ edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getId, glassInfo.getId())
+ .set(EdgStorageCageDetails::getTemperingLayoutId, swapGlassDetailInfo.getTemperingLayoutId())
+ .set(EdgStorageCageDetails::getTemperingFeedSequence, swapGlassDetailInfo.getTemperingFeedSequence())
+ );
+ edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getId, swapGlassDetailInfo.getId())
+ .set(EdgStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
+ .set(EdgStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence())
+ );
+ }
+ }
+
+ /**
+ * 鑾峰彇璇︽儏琛ㄥ唴鏈�澶ф渶灏忕増鍥緄d鐨勫樊鍊硷紝鍒ゆ柇鏄惁鍑烘渶灏忕増鍥剧幓鐠�
+ *
+ * @return
+ */
+ public boolean queryMaxMinDiff(int threshold) {
+ //鑾峰彇绗煎瓙鍐呮渶澶х増鍥緄d鍜屾渶灏忕増鍥緄d鎻掑�硷紝鍒ゆ柇鏄惁澶т簬闃堝�硷紝澶т簬闃堝�肩洿鎺ュ嚭鏈�灏忕増鍥剧幓鐠�
+ QueryWrapper<EdgStorageCageDetails> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("max(tempering_layout_id)-min(tempering_layout_id) as diff")
+ .eq("state", Const.GLASS_STATE_IN)
+ .inSql("slot", "select slot from edg_storage_cage where enable_state = " + Const.SLOT_ON);
+ List<Object> list = edgStorageCageDetailsService.listObjs(queryWrapper);
+ //鑾峰彇绗煎唴鐜荤拑鐗堝浘宸�兼槸鍚﹀ぇ浜庨槇鍊�
+ if (CollectionUtil.isNotEmpty(list)) {
+ Long diff = (Long) list.get(0);
+ return diff > threshold;
+ } else {
+ return Boolean.FALSE;
+ }
+ }
+
+ public boolean saveHistoryTask(EdgStorageDeviceTask task) {
+ EdgStorageDeviceTaskHistory taskHistory = new EdgStorageDeviceTaskHistory();
+ BeanUtils.copyProperties(task, taskHistory);
+ task.setTaskType(task.getTaskRunning());
+ task.setTaskState(Const.RAW_GLASS_TASK_NEW);
+ edgStorageDeviceTaskHistoryService.save(taskHistory);
+ return Boolean.TRUE;
+ }
+
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceController.java
new file mode 100644
index 0000000..5021252
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceController.java
@@ -0,0 +1,9 @@
+package com.mes.opctask.controller;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/10/24 15:35
+ * @Description:
+ */
+public class EdgStorageDeviceController {
+}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java
new file mode 100644
index 0000000..362b306
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java
@@ -0,0 +1,86 @@
+package com.mes.opctask.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
+import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
+import com.mes.utils.Result;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * (EdgStorageDeviceTaskHistory)琛ㄦ帶鍒跺眰
+ *
+ * @author makejava
+ * @since 2024-10-27 21:04:29
+ */
+@RestController
+@RequestMapping("edgStorageDeviceTaskHistory")
+public class EdgStorageDeviceTaskHistoryController {
+ /**
+ * 鏈嶅姟瀵硅薄
+ */
+ @Resource
+ private EdgStorageDeviceTaskHistoryService edgStorageDeviceTaskHistoryService;
+
+ /**
+ * 鍒嗛〉鏌ヨ鎵�鏈夋暟鎹�
+ *
+ * @param page 鍒嗛〉瀵硅薄
+ * @param edgStorageDeviceTaskHistory 鏌ヨ瀹炰綋
+ * @return 鎵�鏈夋暟鎹�
+ */
+ @GetMapping
+ public Result selectAll(Page<EdgStorageDeviceTaskHistory> page, EdgStorageDeviceTaskHistory edgStorageDeviceTaskHistory) {
+ return Result.success(this.edgStorageDeviceTaskHistoryService.page(page, new QueryWrapper<>(edgStorageDeviceTaskHistory)));
+ }
+
+ /**
+ * 閫氳繃涓婚敭鏌ヨ鍗曟潯鏁版嵁
+ *
+ * @param id 涓婚敭
+ * @return 鍗曟潯鏁版嵁
+ */
+ @GetMapping("{id}")
+ public Result selectOne(@PathVariable Serializable id) {
+ return Result.success(this.edgStorageDeviceTaskHistoryService.getById(id));
+ }
+
+ /**
+ * 鏂板鏁版嵁
+ *
+ * @param edgStorageDeviceTaskHistory 瀹炰綋瀵硅薄
+ * @return 鏂板缁撴灉
+ */
+ @PostMapping
+ public Result insert(@RequestBody EdgStorageDeviceTaskHistory edgStorageDeviceTaskHistory) {
+ return Result.success(this.edgStorageDeviceTaskHistoryService.save(edgStorageDeviceTaskHistory));
+ }
+
+ /**
+ * 淇敼鏁版嵁
+ *
+ * @param edgStorageDeviceTaskHistory 瀹炰綋瀵硅薄
+ * @return 淇敼缁撴灉
+ */
+ @PutMapping
+ public Result update(@RequestBody EdgStorageDeviceTaskHistory edgStorageDeviceTaskHistory) {
+ return Result.success(this.edgStorageDeviceTaskHistoryService.updateById(edgStorageDeviceTaskHistory));
+ }
+
+ /**
+ * 鍒犻櫎鏁版嵁
+ *
+ * @param idList 涓婚敭缁撳悎
+ * @return 鍒犻櫎缁撴灉
+ */
+ @DeleteMapping
+ public Result delete(@RequestParam("idList") List<Long> idList) {
+ return Result.success(this.edgStorageDeviceTaskHistoryService.removeByIds(idList));
+ }
+}
+
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTask.java
new file mode 100644
index 0000000..0c0f832
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTask.java
@@ -0,0 +1,57 @@
+package com.mes.opctask.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/10/24 10:22
+ * @Description:
+ */
+@Data
+public class EdgStorageDeviceTask {
+
+ /**
+ * 浠诲姟璇锋眰 0鏃犱换鍔� 1杩涚墖 2鍑虹墖 3鐩撮��
+ */
+ private Integer taskRunning;
+ /**
+ * 杩涚墖鐜荤拑id
+ */
+ private String glassIdIn;
+ /**
+ * 鍑虹墖鐜荤拑id
+ */
+ private String glassIdOut;
+ /**
+ * 褰撳墠灞傚彿
+ */
+ private Integer currentCell;
+ /**
+ * 灞傚彿
+ */
+ private Integer startCell;
+ /**
+ * 棰勭暀灞傚彿
+ */
+ private Integer endCell;
+ /**
+ * 浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1鎵ц涓� 2缁撴潫浠诲姟
+ */
+ private Integer taskState;
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ private Integer taskType;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date createTime;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ private Date updateTime;
+
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTaskHistory.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTaskHistory.java
new file mode 100644
index 0000000..9a992c4
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTaskHistory.java
@@ -0,0 +1,63 @@
+package com.mes.opctask.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * (EdgStorageDeviceTaskHistory)琛ㄥ疄浣撶被
+ *
+ * @author makejava
+ * @since 2024-10-27 21:04:33
+ */
+@SuppressWarnings("serial")
+@Data
+public class EdgStorageDeviceTaskHistory extends Model<EdgStorageDeviceTaskHistory> {
+ /**
+ * 宸ョ▼琛╥d
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+ /**
+ * 杩涚墖鐜荤拑id
+ */
+ private String glassIdIn;
+ /**
+ * 鍑虹墖鐜荤拑id
+ */
+ private String glassIdOut;
+ /**
+ * 褰撳墠灞傚彿
+ */
+ private Integer currentCell;
+ /**
+ * 灞傚彿
+ */
+ private Integer startCell;
+ /**
+ * 棰勭暀灞傚彿
+ */
+ private Integer endCell;
+ /**
+ * 浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1 杩涚墖 2鍑虹墖 3 鐩撮�� 4鎵ц涓� 5缁撴潫浠诲姟 6鍏朵粬
+ */
+ private Integer taskState;
+ /**
+ * 浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1 杩涚墖 2鍑虹墖 3 鐩撮�� 4鎵ц涓� 5缁撴潫浠诲姟 6鍏朵粬
+ */
+ private Integer taskType;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ private Date createTime;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ private Date updateTime;
+
+
+}
+
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/device/EdgStorageDeviceOneTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/device/EdgStorageDeviceOneTask.java
new file mode 100644
index 0000000..1b974ef
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/device/EdgStorageDeviceOneTask.java
@@ -0,0 +1,9 @@
+package com.mes.opctask.entity.device;
+
+import com.mes.opctask.entity.EdgStorageDeviceTask;
+import lombok.Data;
+
+@Data
+public class EdgStorageDeviceOneTask extends EdgStorageDeviceTask {
+}
+
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/device/EdgStorageDeviceTwoTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/device/EdgStorageDeviceTwoTask.java
new file mode 100644
index 0000000..c8e90b8
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/device/EdgStorageDeviceTwoTask.java
@@ -0,0 +1,9 @@
+package com.mes.opctask.entity.device;
+
+import com.mes.opctask.entity.EdgStorageDeviceTask;
+import lombok.Data;
+
+@Data
+public class EdgStorageDeviceTwoTask extends EdgStorageDeviceTask {
+}
+
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskHistoryMapper.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskHistoryMapper.java
new file mode 100644
index 0000000..9499b45
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskHistoryMapper.java
@@ -0,0 +1,15 @@
+package com.mes.opctask.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
+
+/**
+ * (EdgStorageDeviceTaskHistory)琛ㄦ暟鎹簱璁块棶灞�
+ *
+ * @author makejava
+ * @since 2024-10-27 21:04:29
+ */
+public interface EdgStorageDeviceTaskHistoryMapper extends BaseMapper<EdgStorageDeviceTaskHistory> {
+
+}
+
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskMapper.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskMapper.java
new file mode 100644
index 0000000..380ca07
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskMapper.java
@@ -0,0 +1,15 @@
+package com.mes.opctask.mapper;
+
+import com.mes.opctask.entity.EdgStorageDeviceTask;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/10/24 15:39
+ * @Description:
+ */
+public interface EdgStorageDeviceTaskMapper {
+
+ EdgStorageDeviceTask queryTaskMessage(String tableName);
+
+ boolean updateTaskMessage(String tableName, EdgStorageDeviceTask edgStorageDeviceTask);
+}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskHistoryService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskHistoryService.java
new file mode 100644
index 0000000..3eb12cb
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskHistoryService.java
@@ -0,0 +1,15 @@
+package com.mes.opctask.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
+
+/**
+ * (EdgStorageDeviceTaskHistory)琛ㄦ湇鍔℃帴鍙�
+ *
+ * @author makejava
+ * @since 2024-10-27 21:04:33
+ */
+public interface EdgStorageDeviceTaskHistoryService extends IService<EdgStorageDeviceTaskHistory> {
+
+}
+
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskService.java
new file mode 100644
index 0000000..78b51f2
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskService.java
@@ -0,0 +1,21 @@
+package com.mes.opctask.service;
+
+import com.mes.opctask.entity.EdgStorageDeviceTask;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/10/24 15:35
+ * @Description:
+ */
+public interface EdgStorageDeviceTaskService {
+
+ /**
+ * 鏌ヨ浠诲姟淇℃伅
+ *
+ * @return
+ */
+ EdgStorageDeviceTask queryTaskMessage(String tableName);
+
+ boolean updateTaskMessage(String tableName, EdgStorageDeviceTask edgStorageDeviceTask);
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java
new file mode 100644
index 0000000..2eaa927
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java
@@ -0,0 +1,19 @@
+package com.mes.opctask.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
+import com.mes.opctask.mapper.EdgStorageDeviceTaskHistoryMapper;
+import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
+import org.springframework.stereotype.Service;
+
+/**
+ * (EdgStorageDeviceTaskHistory)琛ㄦ湇鍔″疄鐜扮被
+ *
+ * @author makejava
+ * @since 2024-10-27 21:04:33
+ */
+@Service("edgStorageDeviceTaskHistoryService")
+public class EdgStorageDeviceTaskHistoryServiceImpl extends ServiceImpl<EdgStorageDeviceTaskHistoryMapper, EdgStorageDeviceTaskHistory> implements EdgStorageDeviceTaskHistoryService {
+
+}
+
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java
new file mode 100644
index 0000000..2dc0e39
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java
@@ -0,0 +1,32 @@
+package com.mes.opctask.service.impl;
+
+import com.mes.opctask.entity.EdgStorageDeviceTask;
+import com.mes.opctask.mapper.EdgStorageDeviceTaskMapper;
+import com.mes.opctask.service.EdgStorageDeviceTaskService;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author : zhoush
+ * @Date: 2024/10/24 15:36
+ * @Description:
+ */
+public class EdgStorageDeviceTaskServiceImpl implements EdgStorageDeviceTaskService {
+// @Override
+// public void updateTaskMessage(Integer slot, Integer taskRunning, String glassIdOut) {
+
+ // }
+ @Resource
+ EdgStorageDeviceTaskMapper edgStorageDeviceTaskMapper;
+
+ @Override
+ public EdgStorageDeviceTask queryTaskMessage(String tableName) {
+ edgStorageDeviceTaskMapper.queryTaskMessage(tableName);
+ return null;
+ }
+
+ @Override
+ public boolean updateTaskMessage(String tableName, EdgStorageDeviceTask edgStorageDeviceTask) {
+ return edgStorageDeviceTaskMapper.updateTaskMessage(tableName, edgStorageDeviceTask);
+ }
+}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
index 5259be3..386bbaf 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
@@ -28,6 +28,8 @@
two: #绗簩鏉＄（杈圭嚎鐨勬渶灏忓昂瀵镐俊鎭�
firstLength: 400
secondLength: 400
+ glassGap: 300
+ cellLength: 2700
sequence:
order: false
kangaroohy:
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageDetailsMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageDetailsMapper.xml
new file mode 100644
index 0000000..9755b8f
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageDetailsMapper.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper">
+
+ <resultMap id="baseMap" type="com.mes.edgstoragecage.entity.EdgStorageCageDetails">
+ <id column="id" property="id"/>
+ <result column="engineer_id" property="engineerId"/>
+ <result column="device_id" property="deviceId"/>
+ <result column="slot" property="slot"/>
+ <result column="glass_id" property="glassId"/>
+ <result column="sequence" property="sequence"/>
+ <result column="flow_card_id" property="flowCardId"/>
+ <result column="glass_type" property="glassType"/>
+ <result column="width" property="width"/>
+ <result column="height" property="height"/>
+ <result column="thickness" property="thickness"/>
+ <result column="edg_width" property="edgWidth"/>
+ <result column="edg_height" property="edgHeight"/>
+ <result column="tempering_layout_id" property="temperingLayoutId"/>
+ <result column="tempering_feed_sequence" property="temperingFeedSequence"/>
+ <result column="pattern_sequence" property="patternSequence"/>
+ <result column="state" property="state"/>
+ <result column="gap" property="gap"/>
+ <result column="glass_count" property="count"/>
+ </resultMap>
+
+ <select id="queryEdgStorageDetailsBySize" resultMap="baseMap">
+ with min_id_temp as (
+ select slot, min(id) as id, count(*) as glass_count
+ from edg_storage_cage_details
+ where state = 100
+ group by slot
+ ),
+ size_max_temp as (
+ select width, height, count(*) as total_count
+ from edg_storage_cage_details t
+ inner join min_id_temp t1 on t.id = t1.id
+ group by width, height
+ ),
+ slot_temp as (
+ select t.*, t1.glass_count
+ from edg_storage_cage_details t
+ inner join min_id_temp t1 on t.id = t1.id
+ inner join size_max_temp t2 on t.width = t2.width and t.height = t2.height
+ <where>
+ <if test="width != 0">
+ t.width = #{width}
+ </if>
+ <if test="height != 0">
+ t.height = #{height}
+ </if>
+ </where>
+ order by total_count desc, glass_count, abs(t.slot - 10)
+ )
+ select *
+ from slot_temp limit 1
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml
new file mode 100644
index 0000000..f2cbc0a
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mes.edgstoragecage.mapper.EdgStorageCageMapper">
+
+ <resultMap id="baseMap" type="com.mes.edgstoragecage.entity.EdgStorageCage">
+ <id column="id" property="id" jdbcType="INTEGER"/>
+ <result column="device_id" property="deviceId" jdbcType="INTEGER"/>
+ <result column="slot" property="slot" jdbcType="INTEGER"/>
+ <result column="enable_state" property="enableState" jdbcType="INTEGER"/>
+ <result column="remain_width" property="remainWidth" jdbcType="INTEGER"/>
+ </resultMap>
+
+ <select id="getEdgStorageCageBySize" resultMap="baseMap">
+ select t.*
+ from edg_storage_cage t
+ left join edg_storage_cage_details t1 on t.slot = t1.slot
+ where t.device_id = #{deviceId}
+ and t1.state = 100
+ and t.remain_width >= #{width}
+ and t1.width = #{width}
+ and t1.height = #{height}
+ and t.enable_state = 1
+ order by abs(t.slot - #{slot})
+ limit 1
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml
new file mode 100644
index 0000000..059ec28
--- /dev/null
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.mes.opctask.mapper.EdgStorageDeviceTaskMapper">
+
+ <resultMap id="baseMap" type="com.mes.opctask.entity.EdgStorageDeviceTask">
+ <id column="task_running" property="taskRunning"/>
+ <id column="glass_id_in" property="glassIdIn"/>
+ <id column="glass_id_out" property="glassIdOut"/>
+ <id column="current_cell" property="currentCell"/>
+ <id column="start_cell" property="startCell"/>
+ <id column="enc_cell" property="endCell"/>
+ <id column="task_state" property="taskState"/>
+ <id column="create_time" property="createTime"/>
+ <id column="update_time" property="updateTime"/>
+ </resultMap>
+
+ <select id="queryTaskMessage" resultMap="baseMap">
+ select *
+ from #{tableName}
+ limit 1
+ </select>
+
+ <update id="updateTaskMessage">
+ UPDATE #{tableName}
+ SET task_running = #{taskRunning},
+ glass_id_out = #{glassIdOut},
+ current_cell = #{currentCell},
+ start_cell = #{startCell},
+ enc_cell = #{endCell},
+ <if test="taskState == 0">
+ task_state = #{taskState},
+ </if>
+ </update>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0