From 4644a64be87033d1569e43cc672ed9c777eae43b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 18 二月 2025 14:49:17 +0800
Subject: [PATCH] 添加架子复位接口与定时任务
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 82 ++++++++++++++++++++++++++++++----------
1 files changed, 61 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 f2d1129..c6dfac3 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
@@ -71,22 +71,22 @@
@Scheduled(fixedDelay = 1000)
public void rawStorageTask() throws Exception {
- ReadWriteEntity requestWord = miloService.readFromOpcUa("PLC.CC.request");
- ReadWriteEntity confireWord = miloService.readFromOpcUa("PLC.CC.confirmation");
- ReadWriteEntity reportWord = miloService.readFromOpcUa("PLC.CC.reportWord");
- ReadWriteEntity taskWord = miloService.readFromOpcUa("PLC.CC.taskWord");
+ ReadWriteEntity requestWord = miloService.readFromOpcUa("CC.CC.request");
+ ReadWriteEntity confireWord = miloService.readFromOpcUa("CC.CC.confirmation");
+ ReadWriteEntity reportWord = miloService.readFromOpcUa("CC.CC.reportWord");
+ ReadWriteEntity taskWord = miloService.readFromOpcUa("CC.CC.taskWord");
String requestValue = requestWord.getValue() + "";
if ("0".equals(requestValue)) {
if ("1".equals(confireWord.getValue() + "") && "0".equals(reportWord.getValue() + "")) {
List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("PLC.CC.confirmation", 0));
+ list.add(generateReadWriteEntity("CC.CC.confirmation", 0));
miloService.writeToOpcWord(list);
}
if ("1".equals(taskWord.getValue() + "")) {
List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("PLC.CC.taskWord", 0));
- list.add(generateReadWriteEntity("PLC.CC.startSlot", 0));
- list.add(generateReadWriteEntity("PLC.CC.endSlot", 0));
+ list.add(generateReadWriteEntity("CC.CC.taskWord", 0));
+ list.add(generateReadWriteEntity("CC.CC.startSlot", 0));
+ list.add(generateReadWriteEntity("CC.CC.endSlot", 0));
miloService.writeToOpcWord(list);
}
return;
@@ -117,12 +117,17 @@
log.info("鎵ц鍏ュ簱浠诲姟");
return;
}
+ flag = shelfResetTask();
+ if (flag) {
+ log.info("鎵ц澶嶄綅浠诲姟");
+ return;
+ }
log.info("鏃犱换鍔℃墽琛岋紝缁撴潫");
}
@Scheduled(fixedDelay = 1000)
public void rawStorageInCar() throws Exception {
- ReadWriteEntity entity = miloService.readFromOpcUa("PLC.CC.inCar");
+ ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.inCar");
String value = entity.getValue() + "";
if (!"1".equals(value)) {
log.info("澶ц溅涓婃病鏈夋灦瀛�");
@@ -142,7 +147,7 @@
@Scheduled(fixedDelay = 1000)
public void rawStorageFinish() throws Exception {
- ReadWriteEntity entity = miloService.readFromOpcUa("PLC.CC.reportWord");
+ ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.reportWord");
String value = entity.getValue() + "";
if ("0".equals(value)) {
log.info("褰撳墠浠诲姟鏈眹鎶ワ紝缁撴潫鏈浠诲姟");
@@ -207,7 +212,7 @@
}
List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("PLC.CC.confirmation", 1));
+ list.add(generateReadWriteEntity("CC.CC.confirmation", 1));
miloService.writeToOpcWord(list);
}
@@ -266,16 +271,47 @@
rawGlassStorageDetailsService.generateTask(startSlot, lefting, startSlot, rawGlassList.get(0).getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_OUT);
// List<ReadWriteEntity> list = new ArrayList<>();
-// list.add(generateReadWriteEntity("PLC.CC.taskWord", 1));
-// list.add(generateReadWriteEntity("PLC.CC.taskSending", 1));
-// list.add(generateReadWriteEntity("PLC.CC.startSlot", startSlot));
-// list.add(generateReadWriteEntity("PLC.CC.endSlot", lefting));
+// 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_WAIT_OUT)
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
+ 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.generateTask(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;
}
@@ -300,10 +336,10 @@
rawGlassStorageDetailsService.generateTask(details.getSlot(), details.getShelf(), details.getShelf(),
details.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_IN);
// List<ReadWriteEntity> list = new ArrayList<>();
-// list.add(generateReadWriteEntity("PLC.CC.taskWord", 1));
-// list.add(generateReadWriteEntity("PLC.CC.taskSending", 1));
-// list.add(generateReadWriteEntity("PLC.CC.startSlot", details.getSlot()));
-// list.add(generateReadWriteEntity("PLC.CC.endSlot", details.getShelf()));
+// list.add(generateReadWriteEntity("CC.CC.taskWord", 1));
+// list.add(generateReadWriteEntity("CC.CC.taskSending", 1));
+// list.add(generateReadWriteEntity("CC.CC.startSlot", details.getSlot()));
+// list.add(generateReadWriteEntity("CC.CC.endSlot", details.getShelf()));
// miloService.writeToOpcWord(list);
//鐢熸垚宸ヤ綅浠诲姟锛屽皢鍚婅浣嶇殑鐜荤拑鐘舵�佹敼浣嶈繘绗间腑
//淇敼鍚婅浣嶇殑鍘熺墖鐘舵�佷负103 鍑虹墖涓�
@@ -390,11 +426,15 @@
log.info("2鍙蜂笂鐗囦綅鐜荤拑灏哄涓嶄竴鑷达紝1鍙蜂笂鐗囦綅鐢熸垚璋冨害浠诲姟");
//鎸夌収灏哄鍙婃暟閲忚幏鍙栨暟閲忔渶鎺ヨ繎鐨勬牸瀛愪俊鎭�
RawGlassStorageDetails rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());
+ if(null == rawDetails){
+ log.info("浠撳簱鍐呮棤闇�瑕佷笂鏋剁殑鐜荤拑");
+ return Boolean.FALSE;
+ }
rawGlassStorageDetailsService.generateTask(rawDetails.getSlot(), loadStation.get(0), rawDetails.getShelf(), rawDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
//缁撴潫璋冨害浠诲姟 淇敼宸ヤ綅鐘舵��(璧峰浣嶏級鐘舵�佷负103 RAW_GLASS_STATE_RUNNING 浠诲姟瀹屾垚鍚庡皢鐘舵�佹敼涓�101 鐩爣浣嶆柊澧炰竴鏉℃暟鎹紝鏋跺瓙鍙蜂负锛堣捣濮嬩綅锛�
rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
.eq(RawGlassStorageDetails::getSlot, rawDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
return Boolean.TRUE;
}
} else {
@@ -404,7 +444,7 @@
rawGlassStorageDetailsService.generateTask(rawDetails.getSlot(), loadStation.get(0), rawDetails.getShelf(), rawDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
.eq(RawGlassStorageDetails::getSlot, rawDetails.getSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getDeviceId, Const.RAW_GLASS_STATE_RUNNING));
+ .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
return Boolean.TRUE;
}
} else {
--
Gitblit v1.8.0