From f68d3c71819feb59e7a227a5d992b059b900916c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 28 三月 2025 08:28:26 +0800
Subject: [PATCH] 修改报表，界面添加查询流程卡个数，调整推送数据到前端的间隔
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
index 4c922ad..c6288dd 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
@@ -94,6 +94,15 @@
String confirmationWrodAddress = plcParameterObject.getPlcParameter("confirmationWord").getAddress();
String currentSlot = plcParameterObject.getPlcParameter("currentCell").getValue();
+// requestWord="3";
+// glassIdeValue="P25031802|4|1";
+// out06Glassstate="1";
+// out08Glassstate="1";
+// out11Glassstate ="1";
+// out13Glassstate="1";
+// currentSlot="1";
+// confirmationWrodValue="0";
+
log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{}锛岃幏鍙栧埌鐨勭‘璁ゅ瓧涓猴細{}锛岃幏鍙栧埌鐨勫嚭鐗囩姸鎬佸垎鍒负锛歡06:{}銆乬08:{}銆乬11:{}銆乬13:{},褰撳墠鏍煎瓙鍙蜂负锛歿}",
requestWord, glassIdeValue, confirmationWrodValue, out06Glassstate, out08Glassstate, out11Glassstate, out13Glassstate, currentSlot);
@@ -227,6 +236,7 @@
//鐜荤拑灏哄鏄惁璧颁汉宸ヤ笅鐗�
if (glassWidth > maxWidth || glassHeight > maxHeight || glassWidth < minWidth || glassHeight < minHeight) {
log.info("璇ョ幓鐠冨昂瀵镐笉绗﹀悎瑕佹眰锛岄渶瑕佽蛋浜哄伐涓嬬墖鐩存帴杩涚墖");
+ return;
} else {
log.info("璇ョ幓鐠冨昂瀵搁潪浜哄伐涓嬬墖");
//鑾峰彇璇ョ幓鐠冪殑娴佺▼鍗℃槸鍚﹀凡缁戝畾鏋跺瓙
@@ -677,21 +687,28 @@
wrapper.eq(DownGlassInfo::getLayer, downGlassInfo.getLayer());
}
// downGlassInfo.setSequence(downGlassInfoService.queryMaxSequence(downGlassInfo.getFlowCardId(), downGlassInfo.getLayer()));
- int k = 0;
- DownGlassInfo downGlassInfo1 = downGlassInfoService.getOne(wrapper);
- if (downGlassInfo1 != null) {
- k = 1;
- } else {
- k = 1;
- }
+ int k = 1;
+// DownGlassInfo downGlassInfo1 = downGlassInfoService.getOne(wrapper);
+// if (downGlassInfo1 != null) {
+// k = 1;
+// } else {
+// k = 1;
+// }
+ GlassInfo glassInfo = new GlassInfo();
+ BeanUtils.copyProperties(downStorageCageDetails, glassInfo);
+ GlassInfo glassInfo1 = glassInfoService.getOne(
+ new LambdaUpdateWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassInfo.getGlassId())
+ );
downGlassInfo.setSequence(k);
downGlassInfo.setWorkStationId(endCell);
downGlassInfo.setGmtCreate(new Date());
+ downGlassInfo.setLayer(glassInfo1.getLayer());
downGlassInfoService.save(downGlassInfo);
//鐢熸垚浠诲姟淇℃伅
- GlassInfo glassInfo = new GlassInfo();
- BeanUtils.copyProperties(downStorageCageDetails, glassInfo);
+
+
//鍒犻櫎鐞嗙墖绗艰〃鎷胯蛋/鐮存崯鏁版嵁鏁版嵁
+ glassInfo.setLayer(glassInfo1.getLayer());
damageService.deleteByGlassId(glassInfo.getGlassId());
return initDownGlassTask(glassInfo, downStorageCageDetails.getSlot(), endCell, taskType);
}
--
Gitblit v1.8.0