From 3eaf0f2f1b909ac429cac9fc26af767ddecda065 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 22 十月 2025 18:54:17 +0800
Subject: [PATCH] 上片接口返回信息国际化，添加定时任务线程池配置类
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java
index 395506a..096f86d 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java
@@ -159,11 +159,23 @@
}
List<UpPattenUsageVO> pattenUsageList = upPattenUsageMapper.queryRawGlassByEngineeringId(engineering.getEngineerId());
- log.info("鎸夌収褰撳墠鑾峰彇鍒版鍦ㄩ渶瑕佷笂鐗囩殑鍘熺墖淇℃伅鏈夛細{}", pattenUsageList);
+ log.info("鑾峰彇姝ｅ湪闇�瑕佷笂鐗囩殑鍘熺墖淇℃伅鏈夛細{}", pattenUsageList);
if (CollectionUtils.isEmpty(pattenUsageList)) {
log.info("褰撳墠宸ョ▼闇�瑕佷笂鐗囩殑鍘熺墖淇℃伅涓虹┖锛屼换鍔″凡缁撴潫");
return;
}
+ // 鏈夋棤姝ｅ湪鎵ц鐨勪换鍔�
+ UpPattenUsage runningTask = upPattenUsageMapper.selectOne(
+ new LambdaQueryWrapper<UpPattenUsage>()
+ .eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId())
+ .eq(UpPattenUsage::getState, 101)
+ .last("limit 1") // 鍙彇涓�鏉�
+ );
+ if (runningTask != null) {
+ log.info("褰撳墠宸ョ▼瀛樺湪姝ｅ湪鎵ц鐨勪笂鐗囦换鍔★紝璺宠繃鏈澶勭悊");
+ return;
+ }
+
Map<String, List<UpPattenUsageVO>> upListMap = pattenUsageList.stream()
.collect(Collectors.groupingBy(UpPattenUsageVO::getGroupNumber));
log.info("鑾峰彇褰撳墠闇�瑕佷笂鐗囩殑鍘熺墖鏁版嵁");
@@ -192,7 +204,7 @@
task.setTaskRunning(1);
task.setRawGlassWidth((int) usageVOS.get(0).getWidth());
task.setRawGlassHeight((int) usageVOS.get(0).getHeight());
- task.setSlot(loadStation.get(0));
+ task.setSlot(1);
task.setRawGlassFilmsId(usageVOS.get(0).getFilmsId());
task.setEngineeringId(usageVOS.get(0).getEngineeringId());
saveHistoryTask(task, deviceId);
@@ -201,7 +213,7 @@
s7DataSPWrite.setMesSend(1);
s7DataSPWrite.setRawGlassWidth((int) usageVOS.get(0).getWidth());
s7DataSPWrite.setRawGlassHeight((int) usageVOS.get(0).getHeight());
- s7DataSPWrite.setSlot(loadStation.get(1));
+ s7DataSPWrite.setSlot(1);
if (LOAD_GLASS_ONE_DEVICE.equals(deviceId)) {
s7SerializerSPOne.write(s7DataSPWrite);
} else {
@@ -222,7 +234,7 @@
task.setRawGlassWidth((int) usageVOS.get(0).getWidth());
task.setRawGlassHeight((int) usageVOS.get(0).getHeight());
task.setRawGlassThickness((int) usageVOS.get(0).getThickness());
- task.setSlot(loadStation.get(0));
+ task.setSlot(1);
task.setRawGlassFilmsId(usageVOS.get(0).getFilmsId());
task.setEngineeringId(usageVOS.get(0).getEngineeringId());
saveHistoryTask(task, deviceId);
@@ -235,7 +247,7 @@
s7DataSPWrite.setMesSend(1);
s7DataSPWrite.setRawGlassWidth((int) usageVOS.get(0).getWidth());
s7DataSPWrite.setRawGlassHeight((int) usageVOS.get(0).getHeight());
- s7DataSPWrite.setSlot(loadStation.get(0));
+ s7DataSPWrite.setSlot(1);
if (LOAD_GLASS_ONE_DEVICE.equals(deviceId)) {
s7SerializerSPOne.write(s7DataSPWrite);
} else {
@@ -285,11 +297,28 @@
unconfirmedTask.setTaskState(Const.RAW_GLASS_TASK_SUCCESS);
unconfirmedTask.setFinishCount(unconfirmedTask.getFinishCount() + 1);
log.info("{}涓婄墖绾匡紝浠诲姟姹囨姤鎴愬姛锛屾洿鏂颁笂鐗囪褰昜{}]涓烘垚鍔�", deviceId, upUsageId);
+
+ // PLC纭瀛�1
+ s7DataSP.setMesConfirm(1);
+ s7SerializerSPOne.write(s7DataSP);
} else if (s7DataSP.getPlcReport() == 2) {
+ // 姹囨姤澶辫触
+ unconfirmedTask.setTaskState(2);
+// unconfirmedTask.setDamageCount(unconfirmedTask.getDamageCount() + 1);
+ log.warn("{}涓婄墖绾匡紝浠诲姟姹囨姤澶辫触锛屼笂鐗囪褰昜{}]鏍囪涓哄け璐�", deviceId, upUsageId);
+
+ // PLC纭瀛�2
+ s7DataSP.setMesConfirm(2);
+ s7SerializerSPOne.write(s7DataSP);
+ }else if (s7DataSP.getPlcReport() == 3) {
// 姹囨姤鐮存崯
- unconfirmedTask.setTaskState(200);
+ unconfirmedTask.setTaskState(3);
unconfirmedTask.setDamageCount(unconfirmedTask.getDamageCount() + 1);
log.warn("{}涓婄墖绾匡紝浠诲姟姹囨姤鐮存崯锛屼笂鐗囪褰昜{}]鏍囪涓虹牬鎹�", deviceId, upUsageId);
+
+ // PLC纭瀛�3
+ s7DataSP.setMesConfirm(3);
+ s7SerializerSPOne.write(s7DataSP);
}
unconfirmedTask.setUpdateTime(new Date());
loadGlassDeviceTaskHistoryService.updateById(unconfirmedTask);
@@ -298,13 +327,9 @@
rawGlassStorageDetailsService.update(new UpdateWrapper<RawGlassStorageDetails>()
.inSql("slot", "select slot from raw_glass_storage_station where enable_state = 1")
// .eq("slot", task.getSlot())
- .eq("slot", unconfirmedTask.getSlot())
+ .eq("slot", 101)
.eq("state", Const.RAW_GLASS_STATE_IN)
.setSql("remain_quantity = GREATEST(remain_quantity - 1, 0)"));
- //姹囨姤瀛楃粰1
- S7DataSP s7DataSPWrite = new S7DataSP();
- s7DataSPWrite.setMesConfirm(1);
- s7SerializerSPOne.write(s7DataSPWrite);
}
private boolean saveHistoryTask(LoadGlassDeviceTaskHistory task, Integer deviceId) {
--
Gitblit v1.8.0