From 47c19d0819ed29c9e87f914ce8109128a15a70e8 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 09 一月 2025 16:13:08 +0800
Subject: [PATCH] 1、大理片笼详情表新增旋转角度字段 2、原片仓储+上片联调，解决调试过程中的异常情况 3、上片新增定时任务用于扫描正在执行中的工程是否全部上片完成，及完成后的处理
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 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..d4ba068 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;
@@ -122,7 +122,7 @@
@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 +142,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 +207,7 @@
}
List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("PLC.CC.confirmation", 1));
+ list.add(generateReadWriteEntity("CC.CC.confirmation", 1));
miloService.writeToOpcWord(list);
}
@@ -266,10 +266,10 @@
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);
//淇敼鍑虹墖浠诲姟鐘舵��
@@ -300,10 +300,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 +390,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 +408,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