From 47ab1c46b5141f572381a2a27613f728e3bf96c5 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 20 五月 2024 14:18:16 +0800
Subject: [PATCH] 1、卧式理片笼对接过程中bug修复 2、上片机协议修改 3、临时解决json文件打包后读取不到文件问题 4、上片新增接口修改上片机联动请求
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index e956d94..dc9db3c 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -7,6 +7,7 @@
import com.github.yulichang.query.MPJQueryWrapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.common.S7object;
+import com.mes.common.WebSocketServer;
import com.mes.common.config.Const;
import com.mes.device.PlcParameterObject;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
@@ -51,6 +52,9 @@
@Autowired
EdgGlassTaskInfoService edgGlassTaskInfoService;
+
+ @Autowired
+ WebSocketServer webServerService;
@Value("${mes.threshold}")
private int threshold;
@@ -111,6 +115,27 @@
inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
}
}
+ }
+
+ public void plcToHomeEdgTask() {
+ // log.info("鎺ㄦ暟鎹�");
+ // jsonObject.append("params", new short[] { 30, 40, });
+// ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
+// if (sendwServer != null) {
+// for (WebSocketServer webserver : sendwServer) {
+// webserver.sendMessage(jsonObject.toString());
+// if (webserver != null) {
+//
+// List<String> messages = webserver.getMessages();
+//
+// if (!messages.isEmpty()) {
+// // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+// webserver.clearMessages();
+// }
+// }
+//
+// }
+// }
}
/**
@@ -191,7 +216,7 @@
}
EdgStorageCageDetails a09EdgGlass = queryGlassByTaskCache(Const.A09_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT);
EdgStorageCageDetails a10EdgGlass = queryGlassByTaskCache(Const.A10_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT);
- endcell = queryLineByGlassInfo(a09EdgGlass, a10EdgGlass, glassInfo, out08Glassstate, out08Glassstate);
+ endcell = queryLineByGlassInfo(a09EdgGlass, a10EdgGlass, glassInfo, out08Glassstate, out10Glassstate);
} else {
//鍒ゆ柇涓ゆ潯绾挎槸鍚﹂兘绌洪棽
endcell = out08Glassstate == 1 ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
@@ -249,11 +274,13 @@
private List<EdgStorageCageDetails> queryEdgAllGlass(String glassId) {
List<EdgStorageCageDetails> glassList = new ArrayList<>();
//鑾峰彇寰呰繘鐗囩幓鐠�
- GlassInfo one = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
- .eq(GlassInfo::getGlassId, glassId));
- EdgStorageCageDetails resultDetails = new EdgStorageCageDetails();
- BeanUtils.copyProperties(one, resultDetails);
- glassList.add(resultDetails);
+ if(StringUtils.isNotBlank(glassId)){
+ GlassInfo one = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, glassId));
+ EdgStorageCageDetails resultDetails = new EdgStorageCageDetails();
+ BeanUtils.copyProperties(one, resultDetails);
+ glassList.add(resultDetails);
+ }
//鑾峰彇绗煎唴鐜荤拑
List<EdgStorageCageDetails> details = edgStorageCageDetailsService.list(new LambdaQueryWrapper<EdgStorageCageDetails>()
.eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));
@@ -399,9 +426,13 @@
MPJLambdaWrapper<EdgStorageCageDetails> wrapper = new MPJLambdaWrapper<>();
wrapper.select(EdgStorageCageDetails::getWidth, EdgStorageCageDetails::getHeight)
.selectCount(EdgStorageCageDetails::getGlassId, EdgStorageCageDetails::getCount)
+ .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
.groupBy(EdgStorageCageDetails::getWidth, EdgStorageCageDetails::getHeight)
.last("order by count(t.glass_id) desc limit 2");
List<EdgStorageCageDetails> list = edgStorageCageDetailsService.list(wrapper);
+ if (CollectionUtil.isEmpty(list)){
+ return null;
+ }
log.info("鑾峰彇绗煎瓙鍐呮暟閲忓墠浜岀殑鐜荤拑鏁伴噺锛歿}", list);
//鑾峰彇瀹介珮鎷嶇涓�鐨勭幓鐠冧俊鎭�
EdgStorageCageDetails firstSize = list.get(0);
@@ -526,7 +557,7 @@
private boolean saveGlassSize(EdgStorageCageDetails glassInfo) {
EdgGlassTaskInfo edgGlassTaskInfo = new EdgGlassTaskInfo();
BeanUtils.copyProperties(glassInfo, edgGlassTaskInfo);
- edgGlassTaskInfo.setHeight((int) (glassInfo.getEdgHeight() * ratio));
+ edgGlassTaskInfo.setHeight((int) (glassInfo.getHeight() * ratio));
edgGlassTaskInfo.setWidth((int) (glassInfo.getWidth() * ratio));
edgGlassTaskInfo.setThickness((int) (glassInfo.getThickness() * ratio));
edgGlassTaskInfo.setStatus(Const.EDG_GLASS_BEFORE);
--
Gitblit v1.8.0