From 0b28598dabd95862411a75a3cd2152f896671261 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 23 五月 2025 16:12:39 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java
index f684f6c..3002c7e 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java
@@ -51,11 +51,14 @@
}
int request = Integer.parseInt(requestEntity.getValue() + "");
int flagRequest = request & 3;
+ ReadWriteEntity glassIdEntity = miloService.readFromOpcUa(cell + "glassId");
+ log.info("闄よ啘{}鑾峰彇褰撳墠鐨勪俊鍙蜂负锛歿},鐜荤拑id:{}", cell, flagRequest, glassIdEntity);
if (flagRequest != 3) {
log.info("褰撳墠鏈敹鍒拌姹傜幓鐠僫d鏁版嵁锛岀粨鏉熶换鍔�");
return;
}
- ReadWriteEntity glassIdEntity = miloService.readFromOpcUa(cell + "glassId");
+
+ log.info("闄よ啘{}鑾峰彇褰撳墠鐨勭幓鐠僫d锛歿}", cell, glassIdEntity);
if (null == glassIdEntity.getValue() || StringUtils.isBlank(glassIdEntity.getValue() + "")) {
log.info("褰撳墠鏈敹鍒扮幓鐠僫d鏁版嵁锛岀粨鏉熶换鍔�");
return;
@@ -71,7 +74,7 @@
List<ReadWriteEntity> ualist = new ArrayList<>();
List<ReadWriteEntity> wordlist = new ArrayList<>();
-
+ log.info("闄よ啘{}鑾峰彇鐜荤拑{},鏄惁闄よ啘锛歿}", cell, glassIdEntity.getValue(), detailsVO.getFilmRemove());
if (detailsVO.getFilmRemove() == 0) {
// 10111011
int sendId = request & 63;
@@ -120,6 +123,7 @@
}
//鍚戠數姘斿彂閫佹竻妤氫俊鍙�
int sendId = request & 251;
+ log.info("{}鏀跺埌闄よ啘鏈篒D鎺ユ敹瀹屾垚淇″彿锛屽皢鍐欏叆鏁版嵁瀹屾垚缃�0,鍙戦�佹暟鎹负锛歿}", cell, sendId);
List<ReadWriteEntity> list = new ArrayList<>();
list.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
miloService.writeToOpcWord(list);
--
Gitblit v1.8.0