From b6fa74e9efd2d109ad8891337e7c59c9b6c62cc6 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 17 十一月 2025 08:53:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/OpcLoadGlassTask.java | 28 ++++------------------------
1 files changed, 4 insertions(+), 24 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 1569990..c68e99c 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
@@ -111,7 +111,10 @@
for (Engineering engineering : engineerings) {
Integer count = upPattenUsageMapper.selectCount(new LambdaQueryWrapper<UpPattenUsage>()
.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId()).ne(UpPattenUsage::getState, Const.LOAD_RAW_GLASS_SUCCESS));
- if (count == 0) {
+ OptimizeProject project = optimizeProjectService.getOne(new LambdaUpdateWrapper<OptimizeProject>()
+ .eq(OptimizeProject::getProjectNo, 200)
+ .eq(OptimizeProject::getState, engineering.getEngineerId()));
+ if (count == 0 && project != null) {
engineeringMapper.update(null, new LambdaUpdateWrapper<Engineering>().set(Engineering::getState, Const.ENGINEERING_SUCCESS)
.eq(Engineering::getEngineerId, engineering.getEngineerId()));
optimizeProjectService.update(null, new LambdaUpdateWrapper<OptimizeProject>().set(OptimizeProject::getState, 300)
@@ -136,21 +139,11 @@
}
//浠诲姟鏆傚仠
S7DataSP task = new S7DataSP();
-// if (LOAD_GLASS_ONE_DEVICE.equals(deviceId)) {
-// s7SerializerSPOne.read(S7DataSP.class);
-// } else {
-// s7SerializerSPTwo.read(S7DataSP.class);
-// }
-// LoadGlassDeviceTask task = loadGlassDeviceTaskService.queryTaskMessage(tableName);
- ;
if ("0".equals(s7DataSP.getInkageState().toString())) {
log.info("{}涓婄墖绾匡紝澶勪簬绂荤嚎鐘舵�侊細{}锛岀粨鏉熸湰鍦颁笂鐗囪姹�", deviceId, s7DataSP.getInkageState().toString());
-// if (0 == task.getInkageState()) {
-// log.info("{}涓婄墖绾匡紝澶勪簬绂荤嚎鐘舵�侊細{}锛岀粨鏉熸湰鍦颁笂鐗囪姹�", deviceId, task.getInkageState());
return;
}
if (s7DataSP.getTaskRunning()) {
-// if (task.getTaskRunning().equals(Const.ENGINEERING_RUNNING)) {
log.info("{}涓婄墖绾匡紝鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岀粨鏉熸湰鍦颁笂鐗囪姹�", deviceId);
return;
}
@@ -189,7 +182,6 @@
task.setRawGlassWidth((int) usageVOS.get(0).getWidth());
task.setRawGlassHeight((int) usageVOS.get(0).getHeight());
task.setSlot(loadStation.get(1));
-// loadGlassDeviceTaskService.updateTaskMessage(tableName, task);
S7DataSP s7DataSPWrite = new S7DataSP();
s7DataSPWrite.setTotalCount(number);
s7DataSPWrite.setTaskRunning(Boolean.TRUE);
@@ -216,7 +208,6 @@
task.setRawGlassWidth((int) usageVOS.get(0).getWidth());
task.setRawGlassHeight((int) usageVOS.get(0).getHeight());
task.setSlot(loadStation.get(0));
-// loadGlassDeviceTaskService.updateTaskMessage(tableName, task);
S7DataSP s7DataSPWrite = new S7DataSP();
s7DataSPWrite.setTotalCount(number);
s7DataSPWrite.setTaskRunning(Boolean.TRUE);
@@ -239,14 +230,11 @@
s7DataSP = s7SerializerSPTwo.read(S7DataSP.class);
}
log.info("{}涓婄墖绾匡紝褰撳墠涓婄墖浣嶄俊鎭細{}", deviceId, s7DataSP);
-// LoadGlassDeviceTask task = loadGlassDeviceTaskService.queryTaskMessage(tableName);
if (s7DataSP.getTaskRunning().toString().equals(Const.ENGINEERING_NEW)) {
-// if (task.getTaskRunning().equals(Const.ENGINEERING_NEW)) {
log.info("鏃犱换鍔�,缁撴潫");
return;
}
if (Integer.parseInt(s7DataSP.getTaskState().toString()) <= 1) {
-// if (task.getTaskState() <= 1) {
log.info("浠诲姟姝ｅ湪鎵ц,缁撴潫");
return;
}
@@ -255,8 +243,6 @@
Integer finishCount = Integer.parseInt(s7DataSP.getFinishCount().toString());
Integer damageCount = Integer.parseInt(s7DataSP.getDamageCount().toString());
Integer slot = Integer.parseInt(s7DataSP.getSlot().toString());
-// Integer finishCount = task.getFinishCount();
-// Integer damageCount = task.getDamageCount();
//鏇存柊褰撳墠鏋跺瓙涓婄殑鍘熺墖鍓╀綑鎯呭喌
rawGlassStorageDetailsService.update(new UpdateWrapper<RawGlassStorageDetails>()
@@ -274,12 +260,6 @@
.set(UpPattenUsage::getState, Const.LOAD_RAW_GLASS_SUCCESS));
}
//浠诲姟琛ㄦ暟鎹儏鍐�
-// task.setTaskRunning(0);
-// task.setTotalCount(0);
-// task.setRawGlassWidth(0);
-// task.setRawGlassHeight(0);
-// task.setSlot(0);
-// loadGlassDeviceTaskService.updateTaskMessage(tableName, task);
S7DataSP s7DataSPWrite = new S7DataSP();
s7DataSPWrite.setTaskRunning(Boolean.FALSE);
s7DataSPWrite.setTotalCount(0);
--
Gitblit v1.8.0