From 12ee7baa78483a3077ac55cc6d11a0ebc543daf4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 12 十一月 2025 11:14:06 +0800
Subject: [PATCH] 1、中空避免不出片调度修改 2、钢化指定的工程，自动取消指定规则变更 3、中空打印标签修改为只打印配对玻璃的标签
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcHollowRemoveTask.java | 55 ++++++++++++++++++++++++-------------------------------
1 files changed, 24 insertions(+), 31 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 9149b28..c79c486 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
@@ -1,7 +1,6 @@
package com.mes.job;
import com.github.xingshuangs.iot.protocol.modbus.service.ModbusTcp;
-import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import com.mes.hollow.entity.vo.HollowGlassFormulaVO;
import com.mes.hollow.service.HollowFormulaDetailsService;
@@ -13,8 +12,6 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
/**
* @author SNG-015
@@ -82,6 +79,26 @@
hollowRemoveChildTask("CMJ2.CMJ2.");
}
+ public String readString(ModbusTcp modbusTcp, int address) {
+ //
+ byte[] bytes = new byte[20];
+ for (int i = 0; i < 10; i++) {
+ int res = modbusTcp.readUInt16(address + i);
+
+ bytes[i * 2 + 1] = (byte) ((res >> 8) & 0xFF);
+ bytes[i * 2] = (byte) (res & 0xFF);
+ }
+ int endIndex = 0;
+ while (endIndex < bytes.length) {
+ if (bytes[endIndex] == 0) {
+ break;
+ }
+ endIndex++;
+ }
+ // 鎴彇鏈夋晥閮ㄥ垎
+ return new String(bytes, 0, endIndex);
+ }
+
private void hollowRemoveChildTask(String cell) throws Exception {
ModbusTcp modbusTcp = null;
if ("CMJ1.CMJ1.".equals(cell)) {
@@ -93,34 +110,26 @@
log.info("闄よ啘鏈簕}鏈繛鎺�", cell);
return;
}
+ String glassIdEntitys = readString(modbusTcp, 42003 - offset);
+ log.info("闄よ啘{}鑾峰彇褰撳墠鐨勭幓鐠僫d锛歿}", cell, glassIdEntitys);
Integer requestEntity = modbusTcp.readUInt16(42001 - offset);
-// ReadWriteEntity requestEntity = miloService.readFromOpcUa(cell + "mesControl");
-// if ("0".equals(requestEntity.getValue() + "")) {
if (0 == requestEntity) {
log.info("褰撳墠闄よ啘鏈轰负鍗曟満鐘舵��");
return;
}
-// int request = Integer.parseInt(requestEntity.getValue() + "");
int request = requestEntity;
int flagRequest = request & 3;
if (flagRequest != 3) {
log.info("褰撳墠鏈敹鍒拌姹傜幓鐠僫d鏁版嵁锛岀粨鏉熶换鍔�");
return;
}
- String glassIdEntity = modbusTcp.readString(42003 - offset, 20);
+
+ String glassIdEntity = readString(modbusTcp, 42003 - offset);
log.info("闄よ啘{}鑾峰彇褰撳墠鐨勪俊鍙蜂负锛歿},鐜荤拑id:{}", cell, flagRequest, glassIdEntity);
if (null == glassIdEntity || StringUtils.isBlank(glassIdEntity)) {
-// ReadWriteEntity glassIdEntity = miloService.readFromOpcUa(cell + "glassId");
-// if (null == glassIdEntity.getValue() || StringUtils.isBlank(glassIdEntity.getValue() + "")) {
log.info("褰撳墠鏈敹鍒扮幓鐠僫d鏁版嵁锛岀粨鏉熶换鍔�");
return;
}
-
-// log.info("闄よ啘{}鑾峰彇褰撳墠鐨勭幓鐠僫d锛歿}", cell, glassIdEntity);
-// if (null == glassIdEntity.getValue() || StringUtils.isBlank(glassIdEntity.getValue() + "")) {
-// log.info("褰撳墠鏈敹鍒扮幓鐠僫d鏁版嵁锛岀粨鏉熶换鍔�");
-// return;
-// }
log.info("褰撳墠闇�瑕侀櫎鑶滅殑鐜荤拑id涓猴細{}", glassIdEntity);
//鎸夌収鐜荤拑id鑾峰彇瀵瑰簲鐨勪换鍔d
HollowGlassFormulaVO detailsVO = hollowFormulaDetailsService.queryFormulaDetailsByGlassId(glassIdEntity, null, null);
@@ -130,14 +139,11 @@
}
//鎸夌収浠诲姟id鑾峰彇瀵瑰簲鐨勯厤鏂逛俊鎭�
int Id = 0;
- List<ReadWriteEntity> ualist = new ArrayList<>();
- List<ReadWriteEntity> wordlist = new ArrayList<>();
log.info("闄よ啘{}鑾峰彇鐜荤拑{},鏄惁闄よ啘锛歿}", cell, requestEntity, detailsVO.getFilmRemove());
if (detailsVO.getFilmRemove() == 0) {
// 10111011
int sendId = request & 63;
Id = sendId + 4;
-// wordlist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
modbusTcp.writeUInt16(42001 - offset, sendId);
} else {
// 鍏堝皢瀵瑰簲鐨勪綅缃负0锛岃幏寰楄姹傜殑鐜荤拑鏁版嵁锛� 鐒跺悗灏嗗搴斾綅鍊� 110111011
@@ -148,21 +154,11 @@
modbusTcp.writeUInt32(42021 - offset, detailsVO.getTopRemove());
modbusTcp.writeUInt32(42023 - offset, detailsVO.getTopRemove());
modbusTcp.writeUInt32(42025 - offset, detailsVO.getTopRemove());
-// wordlist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "mesControl", sendId));
-// ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassTop", detailsVO.getTopRemove()));
-// ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassBottom", detailsVO.getBottomRemove()));
-// ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassLeft", detailsVO.getLeftRemove()));
-// ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "glassRight", detailsVO.getRightRemove()));
}
modbusTcp.writeUInt32(42013 - offset, (int) (detailsVO.getThickness() * 10));
modbusTcp.writeUInt32(42015 - offset, (int) (Math.max(detailsVO.getWidth(), detailsVO.getHeight())) * 10);
modbusTcp.writeUInt32(42017 - offset, (int) (Math.min(detailsVO.getWidth(), detailsVO.getHeight())) * 10);
modbusTcp.writeUInt16(42001 - offset, Id);
-// ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "thickness", (int) (detailsVO.getThickness() * 10)));
-// ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "firstLength", (int) (Math.max(detailsVO.getWidth(), detailsVO.getHeight())) * 10));
-// ualist.add(opcPlcStorageCageHollowTask.generateReadWriteEntity(cell + "secondLength", (int) (Math.min(detailsVO.getWidth(), detailsVO.getHeight())) * 10));
-// miloService.writeToOpcWord(wordlist);
-// miloService.writeToOpcUa(ualist);
return;
}
@@ -203,9 +199,6 @@
//鍚戠數姘斿彂閫佹竻妤氫俊鍙�
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);
modbusTcp.writeUInt16(42001 - offset, sendId);
}
--
Gitblit v1.8.0