From 3ede88f6615a02e8f4ca2c41701ae60a302ca667 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 16 十月 2025 00:57:51 +0800
Subject: [PATCH] 1、新笼子逻辑测试修改
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 25 ++++++++++++++++---------
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 10 +++++-----
2 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
index 6c5695a..222b4aa 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
@@ -511,14 +511,14 @@
.eq(HollowGlassQueueInfo::getState, Const.TEMPERING_NEW)
.orderByAsc(HollowGlassQueueInfo::getHollowSequence));
if (CollectionUtil.isNotEmpty(unFinishHollowQueueList)) {
- HollowGlassQueueInfo queueInfo = unFinishHollowQueueList.get(0);
//鐩撮�氬彴鏈夌幓鐠冩椂灏嗕腑绌哄嚭鐗囬槦鍒椾腑瀵瑰簲鐜荤拑id鐨勬牸瀛愬彿鏇挎崲鏈洿閫氬彴
HollowBigStorageCageDetails details = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
.eq(HollowBigStorageCageDetails::getSlot, THROUGH_SLOT)
.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL).last("limit 1"));
- if (details != null && details.getGlassId().equals(queueInfo.getGlassId())) {
- queueInfo.setCell(THROUGH_SLOT);
- unFinishHollowQueueList.get(0).setCell(THROUGH_SLOT);
+ log.info("涓┖澶х悊鐗囩洿閫氬彴鐜荤拑淇℃伅{}", details);
+ if (details != null && details.getGlassId().equals(unFinishHollowQueueList.get(0).getGlassId())) {
+ unFinishHollowQueueList.get(0).setSlot(THROUGH_SLOT);
+ log.info("灏嗕腑绌洪槦鍒椾腑鐨勬牸瀛愬彿鏇挎崲涓虹洿閫氬彴{}", unFinishHollowQueueList);
}
log.info("鏈夋鍦ㄥ嚭鐗囩殑涓┖浠诲姟");
Integer isPair = unFinishHollowQueueList.get(0).getIsPair();
@@ -882,19 +882,22 @@
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
return;
}
- if (StringUtils.isNotBlank(s7DataZKDLPOne.getId7())) {
+ Integer requestEntity = s7DataZKDLPOne.getRequestMes();
+ if (StringUtils.isNotBlank(s7DataZKDLPOne.getId7()) && requestEntity == 0) {
//姹囨姤瀛椾负1 鍚姩瀛椾负1鏄� 娓呴櫎鎵�鏈変换鍔′俊鎭�
if (s7DataZKDLPOne.getId7().equals(s7DataZKDLPOne.getId1())) {
//todo:娓呯┖浠诲姟
S7DataZKDLPOne sendTask = new S7DataZKDLPOne();
sendTask.setFrom7(0);
- sendTask.setId1("");
+ sendTask.setId7("");
s7SerializerZKDLPOne.write(sendTask);
+ log.info("娓呴櫎鎵�鏈変换鍔′俊鎭瘂}", sendTask);
+ s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
+ log.info("娓呯┖浠诲姟鍚庡啀璇诲彇{}", s7DataZKDLPOne);
}
log.info("瀛樺湪浠诲姟锛岀粨鏉�");
return;
}
- Integer requestEntity = s7DataZKDLPOne.getRequestMes();
if (1 != requestEntity) {
log.info("褰撳墠鏈敹鍒拌繘鐗囪姹傦紝缁撴潫杩涚墖浠诲姟");
return;
@@ -923,9 +926,11 @@
.set(HollowBigStorageCageDetails::getState, Const.RAW_GLASS_STATE_OUT)
.eq(HollowBigStorageCageDetails::getGlassId, details.getGlassId()));
S7DataZKDLPOne sendTask = new S7DataZKDLPOne();
- sendTask.setFrom7(THROUGH_SLOT);
+ sendTask.setFrom7(details.getSlot());
sendTask.setId7(details.getGlassId());
s7SerializerZKDLPOne.write(sendTask);
+ log.info("鏂扮瀛愬啓鍏d涓巉rom{}", sendTask);
+ updateSlotRemainBySlots(Arrays.asList(details.getSlot()));
}
@@ -1099,13 +1104,15 @@
Integer outCarMaxSize = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_OUT_CAR_SIZE);
// Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);
Integer glassGap = hollowGlassRelationInfoService.getGlassGapByThickness(list.get(0).getThickness());
+ log.info("涓┖鐢熸垚涓�杞︿换鍔★細{}", list);
for (T e : list) {
//鏍煎瓙涓虹浜斾釜绗煎瓙鏃朵笉娣诲姞鍑虹墖浠诲姟
HollowBigStorageCage hollowBigStorageCage = hollowBigStorageCageService.getOne(
new LambdaQueryWrapper<HollowBigStorageCage>()
.eq(HollowBigStorageCage::getSlot, e.getSlot())
);
- if (hollowBigStorageCage.getDeviceId() == 6) {
+
+ if (hollowBigStorageCage != null && hollowBigStorageCage.getDeviceId() == 6) {
break;
}
if (templist.size() >= outCarMaxSize || Math.max((int) e.getWidth(), (int) e.getHeight()) > remainWidth) {
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index 87bb726..513676b 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -230,17 +230,17 @@
Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
jsonObject.append("inkageEntity", inkageEntity);
//杩涚墖璇锋眰
- String requestEntity = s7DataZKDLPOne.getRequestMes().toString();
+ Integer requestEntity = s7DataZKDLPOne.getRequestMes();
jsonObject.append("requestEntity", requestEntity);
//鍚姩鍛戒护
- String mesReplyEntity = s7DataZKDLPOne.getMesReply().toString();
+ Integer mesReplyEntity = s7DataZKDLPOne.getMesReply();
jsonObject.append("mesReplyEntity", mesReplyEntity);
//鍑虹墖鑱旀満
- String outInkageEntity = s7DataZKDLPTwo.getMesControl().toString();
+ Boolean outInkageEntity = s7DataZKDLPTwo.getMesControl();
jsonObject.append("outInkageEntity", outInkageEntity);
//鍑虹墖璇锋眰
- String outRequestEntity = s7DataZKDLPTwo.getRequestMes().toString();
- jsonObject.append("outInkageEntity", outInkageEntity);
+ Integer outRequestEntity = s7DataZKDLPTwo.getRequestMes();
+ jsonObject.append("outRequestEntity", outRequestEntity);
//930绌洪棽淇″彿
jsonObject.append("freeOneRequestEntity", CMJ1ModbusTcp.readUInt16(42027 - offset));
//931绌洪棽淇″彿
--
Gitblit v1.8.0