From 3b0c30d5918f1b50b3eb1a92b17124d5087e4a75 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 10 五月 2024 16:29:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 258 +++++++++++++++++++++++----------------------------
1 files changed, 118 insertions(+), 140 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 cb8a805..19e77e5 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
@@ -1,13 +1,13 @@
package com.mes.job;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.json.JSONObject;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.mes.common.S7object;
-import com.mes.common.WebSocketServer;
+import com.mes.common.config.Const;
+import com.mes.device.PlcParameterObject;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
-import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.edgstoragecage.service.EdgStorageCageService;
import com.mes.glassinfo.entity.GlassInfo;
@@ -15,15 +15,14 @@
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.service.TaskCacheService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Date;
import java.util.List;
-import java.util.Map;
/**
* @Author : zhoush
@@ -42,161 +41,140 @@
EdgStorageCageService edgStorageCageService;
@Autowired
EdgStorageCageDetailsService edgStorageCageDetailsService;
- @Resource
- private EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
- private Map<String, String> mapParameter = new HashMap<>();
- private Map<String, String> mapValue = new HashMap<>();
- private Map<String, String> mapType = new HashMap<>();
- private Map<String, Object> mapSettings = new HashMap<>();
+ @Value("${mes.threshold}")
+ private int threshold;
@Scheduled(fixedDelay = 1000)
public void plcHomeEdgTask() {
- initialize();
- log.info("褰撳墠鍙傛暟鍊硷細{}", mapValue);
- JSONObject jsonObject = new JSONObject();
-// for (String key : mapParameter.keySet()) {
-// String value = "";
-// if ("String".equals(mapType.get(key))) {
-// value = S7object.getinstance().plccontrol.readString(mapParameter.get(key));
-// } else {
-// value = S7object.getinstance().plccontrol.readWord(mapParameter.get(key)) + "";
-// }
-// mapValue.put(key, value);
-// }
+ PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+ String taskRequestTypeValue = plcParameterObject.getPlcParameter("A06_request_word").getValue();
+ String glassIdeValue = plcParameterObject.getPlcParameter("A05_scanning_ID").getValue();
+ String confirmationWrodValue = plcParameterObject.getPlcParameter("MES_confirmation_word").getValue();
+// 1涓篈09绌洪棽锛�2涓篈10绌洪棽锛�3涓篈09A10閮界┖闂�,0涓篈09A10閮芥湁鐜荤拑
+ String outGlassstate = plcParameterObject.getPlcParameter("A09_glass_status").getValue();
+ String confirmationWrodAddress = plcParameterObject.getPlcParameter("MES_confirmation_word").getAddress();
+ String currentSlot = plcParameterObject.getPlcParameter("Current_slot").getValue();
+ log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{}锛岃幏鍙栧埌鐨勭‘璁ゅ瓧涓猴細{}锛岃幏鍙栧埌鐨勫嚭鐗囩姸鎬佷负锛歿},褰撳墠鏍煎瓙鍙蜂负锛歿}",
+ taskRequestTypeValue, glassIdeValue, confirmationWrodValue, outGlassstate, currentSlot);
- if ("0".equals(mapValue.get("A06_request_word"))) {
- log.info("鑾峰彇鍒扮殑璇锋眰瀛椾负0锛屽皢纭瀛楁敼涓�0");
- //娓呴櫎
- S7object.getinstance().plccontrol.WriteWord(mapParameter.get("MES_confirmation_word"), (short) 0);
- } else if ("1".equals(mapValue.get("A06_request_word")) &&
- "0".equals(mapValue.get("MES_confirmation_word"))) {
- log.info("杩涚墖璇锋眰锛屼笖纭瀛椾负0锛屾墽琛岃繘鐗囦换鍔�");
- inTo();
- } else if ("2".equals(mapValue.get("A06_request_word")) &&
- "0".equals(mapValue.get("MES_confirmation_word")) && !"0".equals(mapValue.get("A09_glass_status"))) {
- //09绌洪棽 锛�1 10绌洪棽 锛�2 閮界┖闂诧細3 鍏朵粬0
- log.info("鍑虹墖璇锋眰锛屼笖纭瀛椾负0锛屾墽琛岃繘鐗囦换鍔�");
- outTo(Integer.parseInt(mapValue.get("A09_glass_status")));
- } else if ("3".equals(mapValue.get("A06_request_word")) &&
- "0".equals(mapValue.get("MES_confirmation_word"))) {
-
- if ("0".equals(mapValue.get("A09_glass_status")) || "0".equals(mapValue.get("A10_glass_status"))) {
- outTo(Integer.parseInt(mapValue.get("A09_glass_status")));
- } else {
- inTo();
+ if ("0".equals(taskRequestTypeValue)) {
+ if ("0".equals(confirmationWrodValue)) {
+ log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓�0锛屼笖纭瀛椾负0锛屼笉鎵ц浠诲姟");
+ return;
}
+ log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓�0锛屽皢纭瀛楁敼涓�0");
+ S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 0);
+ return;
}
-// 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) {
+ if (!"0".equals(confirmationWrodValue)) {
+ log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓嶄负0锛屽皢纭瀛楁敼涓�0");
+ S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 0);
+ return;
+ }
- List<String> messages = webserver.getMessages();
-
- if (!messages.isEmpty()) {
- // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- webserver.clearMessages();
- }
- }
+ if ("1".equals(taskRequestTypeValue)) {
+ log.info("3銆佽繘鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�");
+ inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
+ } else if ("2".equals(taskRequestTypeValue)) {
+ //09绌洪棽 锛�1 10绌洪棽 锛�2 閮界┖闂诧細3 鍏朵粬0
+ log.info("3銆佸嚭鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�");
+ outTo(Integer.parseInt(outGlassstate), confirmationWrodAddress, currentSlot);
+ } else if ("3".equals(taskRequestTypeValue)) {
+ log.info("3銆佽繘鐗囧拰鍑虹墖閮界┖闂诧紝鎵ц鍑虹墖浠诲姟");
+ if ("0".equals(outGlassstate)) {
+ inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
+ } else {
+ outTo(Integer.parseInt(outGlassstate), confirmationWrodAddress, currentSlot);
}
}
}
/**
- * 鍒濆鍖杙lc鏁版嵁
+ * 杩涚墖浠诲姟
+ * @param glassId
+ * @param confirmationWrodAddress
+ * @param currentSlot
*/
- private void initialize() {
-// mapParameter.put("A06_request_word", "DB11.0"); //work
-// mapParameter.put("A05_scanning_ID", "DB11.2");
-// mapParameter.put("MES_confirmation_word", "DB11.40");
-// mapParameter.put("A09_glass_status", "DB11.70");
-// //mapParameter.put("A10_glass_status", "DB11.72");
-// mapParameter.put("A09_prohibit_film_production", "DB11.74");
-// mapParameter.put("A10_prohibit_film_production", "DB11.76");
-// mapSettings.put("territoryPoor", 3);
-// mapType.put("A06_request_word", "Word");
-// mapType.put("A05_scanning_ID", "String");
-// mapType.put("MES_confirmation_word", "Word");
-// mapType.put("A09_glass_status", "Word");
-// //mapType.put("A10_glass_status", "Word");
-// mapType.put("A09_prohibit_film_production", "Word");
-// mapType.put("A10_prohibit_film_production", "Word");
- mapValue.put("A06_request_word", "2");//璇锋眰瀛�
- mapValue.put("A05_scanning_ID", "11111111111");//璇锋眰ID
- mapValue.put("MES_confirmation_word", "0");//MES鍙戦�佸瓧
- mapValue.put("A09_glass_status", "1");//A09鐜荤拑鐘舵��
- mapValue.put("A10_glass_status", "0");//A09鐜荤拑鐘舵��
- mapValue.put("A09_prohibit_film_production", "0");//A9绂佹鍑虹墖
- mapValue.put("A10_prohibit_film_production", "0");//A10绂佹鍑虹墖
-
- }
-
- private void inTo() {
- List<GlassInfo> glassInfos = glassInfoService.selectId(mapValue.get("A05_scanning_ID"));
- if (glassInfos.size() < 1) {
- log.info("姝ょ幓鐠冪紪鍙蜂笉瀛樺湪");
- } else if (glassInfos.size() == 1) {
- //娣诲姞杩涚墖浠诲姟 鏌ユ壘绌烘牸
- log.info("姝ｅ父");
- List<EdgStorageCage> list = edgStorageCageService.selectCacheEmpty();
-
- if (list.size() > 1) {
- EdgStorageCageDetails edgStorageCageDetails = edgStorageCageDetailsMapper.selectOne(new MPJLambdaWrapper<EdgStorageCageDetails>()
- .eq(EdgStorageCageDetails::getGlassId, glassInfos.get(0).getGlassId()));
- edgStorageCageDetails.setState(200);
-
- TaskCache taskCache = new TaskCache();
- EdgStorageCage edgStorageCage = list.get(0);
- taskCache.setGlassId(glassInfos.get(0).getGlassId());
- taskCache.setTaskStatus(0);
- taskCache.setStartCell(0);
- taskCache.setEndCell(edgStorageCage.getSlot());
- taskCache.setTaskType(1);
- taskCache.setCreateTime(new DateTime());
- edgStorageCageDetailsMapper.updateById(edgStorageCageDetails);
- taskCacheService.insertTaskCache(taskCache);
-// S7object.getinstance().plccontrol.WriteWord("DB11.40", (short) 1);
- } else {
- log.info("涓嶅瓨鍦ㄧ┖鏍�");
- }
- } else {
- log.info("姝ょ幓鐠冪紪鍙峰瓨鍦ㄥ涓�");
+ private void inTo(String glassId, String confirmationWrodAddress, String currentSlot) {
+ log.info("1銆佹寜鐓х幓鐠僫d:{}鑾峰彇鐜荤拑灏忕墖淇℃伅,褰撳墠鏍煎瓙涓�:{}", glassId, currentSlot);
+ GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
+ if (glassInfo == null) {
+ log.info("2銆佹鐜荤拑缂栧彿涓嶅瓨鍦�");
+ return;
}
+ log.info("2銆佽幏鍙栧埌鐨勭幓鐠冧俊鎭负{}", glassInfo);
+ //娣诲姞杩涚墖浠诲姟 鏌ユ壘绌烘牸
+ EdgStorageCage nearestEmpty = edgStorageCageService.selectNearestEmpty(Integer.parseInt(currentSlot));
+ Assert.isTrue(nearestEmpty == null, "鏍煎瓙宸叉弧");
+ log.info("3銆佹煡璇㈠崸寮忕悊鐗囩閲岄潰鐨勭┖鏍�:{}", nearestEmpty);
+
+ log.info("4銆佸皢鐜荤拑淇℃伅鎻掑叆鍗у紡鐞嗙墖绗�,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
+ EdgStorageCageDetails details = new EdgStorageCageDetails();
+ BeanUtils.copyProperties(glassInfo, details);
+ details.setState(Const.GLASS_STATE_IN);
+ details.setSlot(nearestEmpty.getSlot());
+ details.setDeviceId(nearestEmpty.getDeviceId());
+ edgStorageCageDetailsService.save(details);
+ log.info("5銆佺幓鐠冧俊鎭凡瀛樺叆鐞嗙墖绗艰鎯呰〃锛岀幓鐠冧俊鎭负{}", details);
+
+ //娣诲姞杩涚墖浠诲姟
+ TaskCache taskCache = new TaskCache();
+ taskCache.setGlassId(glassId);
+ taskCache.setTaskStatus(0);
+ taskCache.setStartCell(0);
+ taskCache.setEndCell(nearestEmpty.getSlot());
+ taskCache.setTaskType(1);
+ taskCache.setCreateTime(new Date());
+ taskCacheService.insertTaskCache(taskCache);
+ log.info("6銆佺敓鎴愯繘鐗囦换鍔′俊鎭瓨鍏ヤ换鍔¤〃{}", taskCache);
+
+ S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 1);
+ log.info("7銆佸彂閫佺‘璁ゅ瓧瀹屾垚");
+
+
}
- private void outTo(int line) {
+ /**
+ * 鍑虹墖浠诲姟
+ * @param line
+ * @param confirmationWrodAddress
+ * @param currentSlot
+ */
+ private void outTo(int line, String confirmationWrodAddress, String currentSlot) {
+ Assert.isTrue(line != 0, "A09銆丄10閮芥湁鐜荤拑锛屾棤娉曞嚭鐗�");
+ log.info("1銆佸嚭鐗囦换鍔″嚭銆恵}銆戝彿绾�,澶囨敞(09绌洪棽锛�1;10绌洪棽锛�2;閮界┖闂诧細3)", line);
int endcell = 0;
- EdgStorageCageDetails outEdgStorageCageDetails = new EdgStorageCageDetails();
- TaskCache taskCacheA09 = taskCacheService.selectLastOutCacheInfo("");
- TaskCache taskCacheA10 = taskCacheService.selectLastOutCacheInfo("");
- //涓ょ嚎鍚勮嚜瑕佸嚭鐨勭幓鐠�
- EdgStorageCageDetails glassInfo09 = edgStorageCageDetailsService.selectConformGlass(taskCacheA09.getGlassId(), (int) mapSettings.get("territoryPoor"));
- EdgStorageCageDetails glassInfo10 = edgStorageCageDetailsService.selectConformGlass(taskCacheA10.getGlassId(), (int) mapSettings.get("territoryPoor"));
- //鍐冲畾绾胯矾
- if (line == 1) {
- endcell = 9000;
- outEdgStorageCageDetails = glassInfo09;
- } else if (line == 2) {
- endcell = 1000;
- outEdgStorageCageDetails = glassInfo10;
- } else if (line == 3) {
- endcell = 9000;//榛樿璧颁竴鍙风嚎 浼樺寲鏂瑰悜鍙牴鎹� 瀵规瘮涓ょ嚎閫熷害/涓ょ嚎褰撳墠浠诲姟鎯呭喌鍋�
- outEdgStorageCageDetails = glassInfo09;
+
+ List<TaskCache> oldTaskCacheList;
+ if (line == 2) {
+ endcell = Const.A10_OUT_TARGET_POSITION;
+ oldTaskCacheList = taskCacheService.selectLastOutCacheInfos(Const.A10_OUT_TARGET_POSITION);
+ } else {
+ endcell = Const.A09_OUT_TARGET_POSITION;
+ oldTaskCacheList = taskCacheService.selectLastOutCacheInfos(Const.A09_OUT_TARGET_POSITION);
}
- if (outEdgStorageCageDetails != null && endcell > 0) {
+ log.info("2銆佸垽鏂嚭鐗囩嚎璺瘂}锛岃幏鍙栨渶鍚庤鏉＄嚎宸插嚭鐗囩殑浠诲姟淇℃伅{}(澶囨敞锛�0寰呮墽琛岋紝1宸叉墽琛�).閮界┖闂蹭紭鍏堝嚭A09绾�", endcell, oldTaskCacheList);
+
+ String glassId = "";
+ if (CollectionUtil.isNotEmpty(oldTaskCacheList)) {
+ glassId = oldTaskCacheList.get(0).getGlassId();
+ }
+ EdgStorageCageDetails glassInfo = edgStorageCageDetailsService.selectOutGlass(glassId, threshold);
+ log.info("3銆佹寜鐓у巻鍙插凡鍑虹幓鐠僫d{}鍜岄槇鍊納}锛屾嬁鍑虹悊鐗囩鍐呯殑鍑虹墖淇℃伅{}", glassId, threshold, glassInfo);
+
+ if (glassInfo != null) {
+ log.info("4銆佹坊鍔犲嚭鐗囦换鍔★紝鐜荤拑id锛歿}锛屼换鍔＄被鍨嬶細{}锛岃捣濮嬩綅缃細{}锛岀粨鏉熶綅缃細{}", glassInfo.getGlassId(),
+ 2, glassInfo.getSlot(), endcell);
TaskCache taskCache = new TaskCache();
- taskCache.setGlassId(outEdgStorageCageDetails.getGlassId());
+ taskCache.setGlassId(glassInfo.getGlassId());
taskCache.setTaskStatus(0);
- taskCache.setStartCell(outEdgStorageCageDetails.getSlot());
+ taskCache.setStartCell(glassInfo.getSlot());
taskCache.setEndCell(endcell);
taskCache.setTaskType(2);
- taskCache.setCreateTime(new DateTime());
+ taskCache.setCreateTime(new Date());
taskCacheService.insertTaskCache(taskCache);
-// S7object.getinstance().plccontrol.WriteWord(mapParameter.get("MES_confirmation_word"), (short) 1);
+ S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 1);
}
--
Gitblit v1.8.0