From 75b98831417be414bc43e1832479d05d20cf6ac3 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 13 三月 2025 16:44:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 58 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
index d4ba068..33c73b3 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
@@ -117,6 +117,11 @@
log.info("鎵ц鍏ュ簱浠诲姟");
return;
}
+ flag = shelfResetTask();
+ if (flag) {
+ log.info("鎵ц澶嶄綅浠诲姟");
+ return;
+ }
log.info("鏃犱换鍔℃墽琛岋紝缁撴潫");
}
@@ -137,7 +142,6 @@
}
rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getId, one.getId())
.set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
-
}
@Scheduled(fixedDelay = 1000)
@@ -156,7 +160,7 @@
}
RawGlassStorageTask task = rawGlassStorageTaskService.getOne(new LambdaQueryWrapper<RawGlassStorageTask>()
.in(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_NEW));
- RawGlassStorageDetails targetDetails = generateDetails(details, task.getEndSlot());
+ RawGlassStorageDetails targetDetails = rawGlassStorageDetailsService.generateDetails(details, task.getEndSlot());
int deviceId = details.getDeviceId();
Integer taskType = task.getTaskType();
if ("1".equals(value)) {
@@ -280,6 +284,37 @@
return Boolean.TRUE;
}
+
+ /**
+ * 澶嶄綅浠诲姟锛�1銆佺偣澶嶄綅锛岀珛椹敓鎴愬浣嶄换鍔� 2銆佺偣鍑哄簱淇敼宸ヤ綅璇︽儏鍐呯殑鐘舵�佷负鏋跺瓙澶嶄綅锛屽畾鏃朵换鍔℃壂鎻忕敓鎴愬浣嶄换鍔�
+ */
+ public boolean shelfResetTask() throws Exception {
+ List<RawGlassStorageDetails> rawGlassList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RESET)
+ .inSql(RawGlassStorageDetails::getSlot, "select slot from raw_glass_storage_station where enable_state = 1"));
+ if (CollectionUtil.isEmpty(rawGlassList)) {
+ log.info("绯荤粺娌℃湁闇�瑕佸浣嶇殑鍘熺墖淇℃伅");
+ return Boolean.FALSE;
+ }
+ //鐢熸垚澶嶄綅浠诲姟
+
+// rawGlassStorageDetailsService.generatask(rawGlassList.get(0).getSlot(), rawGlassList.get(0).getShelf(), rawGlassList.get(0).getShelf(), rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
+
+// List<ReadWriteEntity> list = new ArrayList<>();
+// list.add(generateReadWriteEntity("CC.CC.taskWord", 1));
+// list.add(generateReadWriteEntity("CC.CC.taskSending", 1));
+// list.add(generateReadWriteEntity("CC.CC.startSlot", startSlot));
+// list.add(generateReadWriteEntity("CC.CC.endSlot", lefting));
+// miloService.writeToOpcWord(list);
+
+ //淇敼澶嶄綅浠诲姟鐘舵��
+ rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
+ .eq(RawGlassStorageDetails::getSlot, rawGlassList.get(0).getSlot())
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RESET)
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
+ return Boolean.TRUE;
+ }
+
/**
* 鍏ュ簱浠诲姟锛氬悐瑁呬綅鏈夌幓鐠冿紝鍏堝幓宸ヤ綅琛ㄦ煡璇㈢┖鏍煎瓙锛岀敓鎴愬叆搴撲换鍔′粠鍚婅浣嶅埌鐩爣鏍煎瓙
*
@@ -341,7 +376,6 @@
log.info("娌℃湁鍙敤鐨勪笂鐗囦綅");
return Boolean.FALSE;
}
-
List<RawGlassStorageDetails> loadStationList = rawGlassStorageDetailsService.list(new LambdaQueryWrapper<RawGlassStorageDetails>()
.inSql(RawGlassStorageDetails::getSlot, "select slot from raw_glass_storage_station where enable_state = 1")
@@ -498,24 +532,6 @@
}
}
}
-
- private RawGlassStorageDetails generateDetails(RawGlassStorageDetails details, Integer targetSlot) {
- RawGlassStorageDetails targetDetails = new RawGlassStorageDetails();
- RawGlassStorageStation station = rawGlassStorageStationService.getOne(new LambdaQueryWrapper<RawGlassStorageStation>()
- .eq(RawGlassStorageStation::getSlot, targetSlot));
- targetDetails.setDeviceId(station.getDeviceId());
- targetDetails.setSlot(targetSlot);
- targetDetails.setShelf(details.getShelf());
- targetDetails.setPatternWidth(details.getPatternWidth());
- targetDetails.setPatternHeight(details.getPatternHeight());
- targetDetails.setPatternThickness(details.getPatternThickness());
- targetDetails.setFilmsId(details.getFilmsId());
- targetDetails.setRemainQuantity(details.getRemainQuantity());
- targetDetails.setCreateTime(new Date());
- targetDetails.setState(Const.RAW_GLASS_STATE_IN);
- return targetDetails;
- }
-
private ReadWriteEntity generateReadWriteEntity(String identifier, int value) {
ReadWriteEntity readWriteEntity = new ReadWriteEntity();
--
Gitblit v1.8.0