From 41173fc2dfd848b08a217ab725033a412868a31c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 06 八月 2024 10:59:01 +0800
Subject: [PATCH] 修改磨边界面显示数据为磨边队列表的数据
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 434 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 299 insertions(+), 135 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 a3615de..48df75a 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
@@ -2,12 +2,13 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Assert;
+import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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;
@@ -20,6 +21,7 @@
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.service.TaskCacheService;
+import com.mes.tools.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -31,6 +33,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @Author : zhoush
@@ -65,8 +68,30 @@
@Value("${mes.sequence.order}")
private boolean sequenceOrder;
+ @Value("${mes.max.firstLength}")
+ private String firstLength;
+
+ @Value("${mes.max.secondLength}")
+ private String secondLength;
+
+ @Value("${mes.min.one.firstLength}")
+ private String minOneFirstLength;
+
+ @Value("${mes.min.one.secondLength}")
+ private String minOneSecondLength;
+
+ @Value("${mes.min.two.firstLength}")
+ private String minTwoFirstLength;
+
+ @Value("${mes.min.two.secondLength}")
+ private String minTwoSecondLength;
+
+ public static String engineerId = "";
+
@Scheduled(fixedDelay = 1000)
public void plcHomeEdgTask() {
+ Date startDate = new Date();
+ log.info("鏈浠诲姟寮�濮嬫墽琛屾椂闂达細{}", startDate);
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
String taskRequestTypeValue = plcParameterObject.getPlcParameter("A06_request_word").getValue();
String glassIdeValue = plcParameterObject.getPlcParameter("A05_scanning_ID").getValue();
@@ -86,7 +111,7 @@
return;
}
log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓�0锛屽皢纭瀛楁敼涓�0");
- S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, (short) 0);
+ S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, 0);
return;
}
if (!"0".equals(confirmationWrodValue)) {
@@ -98,7 +123,7 @@
inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
} else if ("2".equals(taskRequestTypeValue)) {
//09绌洪棽 锛�1 10绌洪棽 锛�2 閮界┖闂诧細3 鍏朵粬0
- log.info("2銆佸嚭鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�");
+ log.info("2銆佸嚭鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛屽嚭鐗囦换鍔�");
outTo(Integer.parseInt(out08Glassstate),
Integer.parseInt(out10Glassstate), confirmationWrodAddress, "", 0);
} else if ("3".equals(taskRequestTypeValue)) {
@@ -111,27 +136,26 @@
inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
}
}
+ Date endDate = new Date();
+ log.info("鏈浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms", endDate, endDate.getTime() - startDate.getTime());
}
- 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();
-// }
-// }
-//
-// }
-// }
+ @Scheduled(fixedDelay = 1000)
+ public void temperingIsRun() {
+ JSONObject jsonObject = new JSONObject();
+ //姝ｅ湪杩涜鐨勪换鍔�
+ List<TaskCache> taskCaches = taskCacheService.selectTaskCacheIsRun();
+ jsonObject.append("taskCaches", taskCaches);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("isRun");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+ } else {
+ log.info("Home is closed");
+ }
+ }
+ }
}
/**
@@ -141,20 +165,18 @@
* @param confirmationWrodAddress
* @param currentSlot
*/
- private void inTo(String glassId, String confirmationWrodAddress, String currentSlot) {
+ public 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));
- //TODO: 鏌ヨ鐜荤拑
- if (glassInfo == null) {
- log.info("2銆佹鐜荤拑缂栧彿涓嶅瓨鍦�");
- return;
- }
- log.info("2銆佽幏鍙栧埌鐨勭幓鐠冧俊鎭负{}", glassInfo);
//娣诲姞杩涚墖浠诲姟 鏌ユ壘绌烘牸
EdgStorageCage nearestEmpty = edgStorageCageService.selectNearestEmpty(Integer.parseInt(currentSlot), Boolean.FALSE);
Assert.isTrue(null != nearestEmpty, "鏍煎瓙宸叉弧");
- log.info("3銆佹煡璇㈠崸寮忕悊鐗囩閲岄潰鐨勭┖鏍�:{}", nearestEmpty);
+ log.info("2銆佹煡璇㈠崸寮忕悊鐗囩閲岄潰鐨勭┖鏍�:{}", nearestEmpty);
+ //鏌ヨ鐜荤拑骞惰繘琛屼氦鎹�
+ GlassInfo glassInfo = queryAndChangeGlass(glassId);
+ if (glassInfo == null) {
+ return;
+ }
log.info("4銆佸皢鐜荤拑淇℃伅鎻掑叆鍗у紡鐞嗙墖绗�,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
EdgStorageCageDetails details = new EdgStorageCageDetails();
BeanUtils.copyProperties(glassInfo, details);
@@ -167,10 +189,51 @@
boolean taskCache = saveTaskCache(details.getGlassId(), 0, nearestEmpty.getSlot(), Const.GLASS_CACHE_TYPE_IN);
log.info("6銆佺敓鎴愯繘鐗囦换鍔′俊鎭瓨鍏ヤ换鍔¤〃鏄惁瀹屾垚锛歿}", taskCache);
- S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, (short) 1);
+ S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, 1);
log.info("7銆佸彂閫佺‘璁ゅ瓧瀹屾垚");
+ }
+
+ /**
+ * 鏌ヨ鐜荤拑骞惰繘琛屼氦鎹�
+ *
+ * @param glassId
+ * @return
+ */
+ public GlassInfo queryAndChangeGlass(String glassId) {
+ GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
+// .inSql(GlassInfo::getEngineerId, "select engineer_id from engineering where state = 1"));
+ Assert.isFalse(null == glassInfo, "鐜荤拑淇℃伅涓嶅瓨鍦�");
+ if ((glassInfo.getWidth() < Double.parseDouble(minTwoFirstLength) && glassInfo.getHeight() < Double.parseDouble(minTwoSecondLength)) || (glassInfo.getWidth() < Double.parseDouble(minTwoSecondLength) && glassInfo.getHeight() < Double.parseDouble(minTwoFirstLength))) {
+ log.info("3銆佺幓鐠冧俊鎭笉绗﹀悎杩涘叆鐞嗙墖绗兼渶灏忓昂瀵革紝鐜荤拑淇℃伅涓簕}", glassInfo);
+ return null;
+ }
+ //鎸夌収鐜荤拑灏哄
+ LambdaQueryWrapper<GlassInfo> queryWrapper = new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getWidth, glassInfo.getWidth())
+ .eq(GlassInfo::getHeight, glassInfo.getHeight())
+ .eq(GlassInfo::getThickness, glassInfo.getThickness())
+ .eq(GlassInfo::getFilmsid, glassInfo.getFilmsid())
+ .eq(GlassInfo::getTotalLayer, glassInfo.getTotalLayer())
+ .eq(GlassInfo::getLayer, glassInfo.getLayer())
+ .eq(GlassInfo::getEngineerId, glassInfo.getEngineerId())
+ .notInSql(GlassInfo::getGlassId, "select distinct glass_id from edg_storage_cage_details " +
+ "where engineer_id = '" + glassInfo.getEngineerId() + "' and width = " + glassInfo.getWidth() + " and height = " + glassInfo.getHeight())
+ .orderByAsc(GlassInfo::getTemperingLayoutId)
+ .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence)
+ .last("Limit 1");
+ GlassInfo swapGlassInfo = glassInfoService.getOne(queryWrapper);
+ if (swapGlassInfo != null && !glassInfo.getGlassId().equals(swapGlassInfo.getGlassId())) {
+ String swapGlassId = swapGlassInfo.getGlassId();
+ log.info("灏嗙幓鐠儃}鍜岀幓鐠儃}锛屼俊鎭簰鎹�,杩涚幓鐠� {}", glassInfo, swapGlassInfo, swapGlassInfo);
+ swapGlassInfo.setGlassId(glassId);
+ glassInfo.setGlassId(swapGlassId);
+ glassInfoService.updateById(swapGlassInfo);
+ glassInfoService.updateById(glassInfo);
+ return swapGlassInfo;
+ }
+ return glassInfo;
}
/**
@@ -182,7 +245,7 @@
* @param glassId
* @param currentSlot
*/
- private boolean outTo(int out08Glassstate, int out10Glassstate, String confirmationWrodAddress, String glassId, int currentSlot) {
+ public boolean outTo(int out08Glassstate, int out10Glassstate, String confirmationWrodAddress, String glassId, int currentSlot) {
//閫昏緫姝ラ锛�
// 0銆丄09銆丄10鏄惁绌洪棽锛屾槸鍚﹀彲浠ユ墽琛屽嚭鐗囦换鍔�
// 1銆佽幏鍙栭挗鍖栫増鍥炬槸鍚﹁秴杩囬槇鍊�
@@ -196,8 +259,8 @@
// 1.2.3銆佹寜鐓у嚭鐗囦俊鎭幓璇︽儏琛ㄦ煡璇㈡牸瀛愬湪绗煎瓙閲岄潰鍓╀綑鐩稿悓灏哄鐨勭幓鐠冩暟鎹笖浠ョ増鍥緄d銆佺増搴忓崌搴忔帓搴� 鍙栫涓�鍧楃幓鐠冨嚭鐗�
// 2銆佸鏋滄病鏈夊巻鍙插嚭鐗囦换鍔�
// 2.1銆佸嚭褰撳墠鐗堝浘id鏈�灏忕増搴忔渶灏忕殑鐜荤拑锛堥棶棰橈細涓ゆ潯绾块兘娌℃湁鍘嗗彶浠诲姟锛屽嚭鐗囨椂涓ゆ潯绾跨殑鐜荤拑灏哄鐩稿悓锛屾槸鍚︽壘灏哄涓嶅悓鐨勶級
- if (out08Glassstate == 2 && out10Glassstate == 2) {
- log.info("A09銆丄10涓簕},{}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖");
+ if ((out08Glassstate == 2 && out10Glassstate == 2) || (out08Glassstate == 0 && out10Glassstate == 0)) {
+ log.info("A09銆丄10涓簕},{}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖", out08Glassstate, out10Glassstate);
return Boolean.FALSE;
}
log.info("0銆佸嚭鐗囦换鍔″嚭鐨勭姸鎬�:A09:銆恵}銆�;A10:銆恵}銆�)", out08Glassstate, out10Glassstate);
@@ -214,42 +277,75 @@
log.info("绗煎瓙鍐呭拰寰呰繘鐗囨病鏈夌幓鐠�");
return Boolean.FALSE;
}
- 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);
+ EdgStorageCageDetails a09EdgGlass = queryGlassByTaskCache(Const.A09_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT_ALL);
+ EdgStorageCageDetails a10EdgGlass = queryGlassByTaskCache(Const.A10_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT_ALL);
endcell = queryLineByGlassInfo(a09EdgGlass, a10EdgGlass, glassInfo, out08Glassstate, out10Glassstate);
} else {
- //鍒ゆ柇涓ゆ潯绾挎槸鍚﹂兘绌洪棽
- endcell = out08Glassstate == 1 || out10Glassstate == 2 ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
+ //鎸夌収鐘舵�佸垽鏂袱鏉＄嚎璧伴偅鏉＄嚎
+ endcell = computerLineByState(out08Glassstate, out10Glassstate);
- if ((out08Glassstate == 0 && out10Glassstate == 0) || (out08Glassstate == 1 && out10Glassstate == 1)) {
- 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);
+ if (out08Glassstate == 1 && out10Glassstate == 1) {
+ EdgStorageCageDetails a09EdgGlass = queryGlassByTaskCache(Const.A09_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT_ALL);
+ EdgStorageCageDetails a10EdgGlass = queryGlassByTaskCache(Const.A10_OUT_TARGET_POSITION, Const.GLASS_CACHE_TYPE_OUT_ALL);
if (a09EdgGlass == null && a10EdgGlass == null) {
- MPJLambdaWrapper<EdgStorageCageDetails> wrapper = new MPJLambdaWrapper<>();
- wrapper.select(EdgStorageCageDetails::getWidth, EdgStorageCageDetails::getHeight)
- .selectCount(EdgStorageCageDetails::getGlassId, EdgStorageCageDetails::getCount)
- .groupBy(EdgStorageCageDetails::getWidth, EdgStorageCageDetails::getHeight)
- .last("order by count(t.glass_id) desc limit 2");
+ MPJQueryWrapper<EdgStorageCageDetails> wrapper = new MPJQueryWrapper<>();
+ wrapper.select("count(t.glass_id), t.width, t.height")
+ .eq("t.state", Const.GLASS_STATE_IN)
+ .inSql("t.slot", "select slot from edg_storage_cage where enable_state = " + Const.SLOT_ON)
+ .groupBy("t.width, t.height");
+ if (endcell == Const.A10_OUT_TARGET_POSITION) {
+ wrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
+ "case when width < height then width else height end as second_length from edg_storage_cage_details) t1 " +
+ "on t.glass_id = t1.glass_id and (t1.first_length between " + minTwoFirstLength + " and " + firstLength
+ + " and t1.second_length between " + minTwoSecondLength + " and " + secondLength + ") ");
+ } else {
+ wrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
+ "case when width < height then width else height end as second_length from edg_storage_cage_details) t1 " +
+ "on t.glass_id = t1.glass_id and (t1.first_length >=" + minOneFirstLength + " and t1.second_length>=" + minOneSecondLength + ") ");
+ }
+ wrapper.last("order by count(t.glass_id) desc limit 2");
List<EdgStorageCageDetails> list = edgStorageCageDetailsService.list(wrapper);
if (CollectionUtil.isEmpty(list)) {
- GlassInfo one = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
- .eq(GlassInfo::getGlassId, glassId));
- EdgStorageCageDetails resultDetails = new EdgStorageCageDetails();
- BeanUtils.copyProperties(one, resultDetails);
- glassInfo = resultDetails;
+ MPJQueryWrapper<GlassInfo> queryWrapper = new MPJQueryWrapper<GlassInfo>()
+ .selectAll(GlassInfo.class).eq("t.glass_id", glassId);
+ if (endcell == Const.A10_OUT_TARGET_POSITION) {
+ queryWrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
+ "case when width < height then width else height end as second_length from edg_storage_cage_details) t1 " +
+ "on t.glass_id = t1.glass_id and (t1.first_length between " + minTwoFirstLength + " and " + firstLength
+ + " and t1.second_length between " + minTwoSecondLength + " and " + secondLength + ") ");
+ } else {
+ queryWrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
+ "case when width < height then width else height end as second_length from edg_storage_cage_details) t1 " +
+ "on t.glass_id = t1.glass_id and (t1.first_length >=" + minOneFirstLength + " and t1.second_length>=" + minOneSecondLength + ") ");
+ }
+ GlassInfo one = glassInfoService.getOne(queryWrapper);
+ if (one != null) {
+ EdgStorageCageDetails resultDetails = new EdgStorageCageDetails();
+ BeanUtils.copyProperties(one, resultDetails);
+ glassInfo = resultDetails;
+ } else {
+ log.info("鑾峰彇绗煎唴鐜荤拑鍜屽緟杩涚墖鐜荤拑涓虹┖鎴栬�呬笉绗﹀悎纾ㄨ竟灏哄");
+ }
} else {
glassInfo = queryMinGlass(list.get(0).getWidth(), list.get(0).getHeight(), glassId);
}
} else if (a09EdgGlass != null && a10EdgGlass != null) {
List<EdgStorageCageDetails> a09Count = queryGlassByTaskLine(Const.A09_OUT_TARGET_POSITION);
- List<EdgStorageCageDetails> a10Count = queryGlassByTaskLine(Const.A09_OUT_TARGET_POSITION);
+ List<EdgStorageCageDetails> a10Count = queryGlassByTaskLine(Const.A10_OUT_TARGET_POSITION);
endcell = a09Count.size() > a10Count.size() ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
glassInfo = a09Count.size() > a10Count.size() ? queryMinGlass(a09EdgGlass.getWidth(), a09EdgGlass.getHeight(), glassId)
: queryMinGlass(a10EdgGlass.getWidth(), a10EdgGlass.getHeight(), glassId);
} else {
- endcell = a09EdgGlass != null ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
- glassInfo = a09EdgGlass != null ? queryMinGlass(a09EdgGlass.getWidth(), a09EdgGlass.getHeight(), glassId)
- : queryMinGlass(a10EdgGlass.getWidth(), a10EdgGlass.getHeight(), glassId);
+ //鎸夌収鍘嗗彶浠诲姟鑾峰彇闇�瑕佹墽琛岀殑璺嚎锛屽鏋滆鏉＄嚎绗煎唴鏃犵幓鐠� 璧板叾浠栭�昏緫
+ endcell = a09EdgGlass == null ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
+ List<EdgStorageCageDetails> details = queryGlassByTaskLine(endcell);
+ if (CollectionUtil.isEmpty(details)) {
+ int othercell = endcell == Const.A10_OUT_TARGET_POSITION ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
+ glassInfo = queryChangeGlassInfo(othercell, glassId);
+ } else {
+ glassInfo = a09EdgGlass != null ? queryMinGlass(a09EdgGlass.getWidth(), a09EdgGlass.getHeight(), glassId)
+ : queryMinGlass(a10EdgGlass.getWidth(), a10EdgGlass.getHeight(), glassId);
+ }
}
} else {
List<EdgStorageCageDetails> edgStorageCageDetails = queryGlassByTaskLine(endcell);
@@ -286,13 +382,15 @@
if (StringUtils.isNotBlank(glassId)) {
GlassInfo one = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
.eq(GlassInfo::getGlassId, glassId));
+// .inSql(GlassInfo::getEngineerId, "select engineer_id from engineering where state = 1"));
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));
+ List<EdgStorageCageDetails> details = edgStorageCageDetailsService.selectJoinList(EdgStorageCageDetails.class, new MPJLambdaWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
+ .leftJoin(EdgStorageCage.class, on -> on.eq(EdgStorageCage::getSlot, EdgStorageCageDetails::getSlot).eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN))
+ .eq(EdgStorageCage::getEnableState, Const.SLOT_ON));
glassList.addAll(details);
return glassList;
@@ -303,19 +401,20 @@
*
* @return
*/
- private boolean queryMaxMinDiff(int threshold) {
+ public boolean queryMaxMinDiff(int threshold) {
//鑾峰彇绗煎瓙鍐呮渶澶х増鍥緄d鍜屾渶灏忕増鍥緄d鎻掑�硷紝鍒ゆ柇鏄惁澶т簬闃堝�硷紝澶т簬闃堝�肩洿鎺ュ嚭鏈�灏忕増鍥剧幓鐠�
QueryWrapper<EdgStorageCageDetails> queryWrapper = new QueryWrapper<>();
queryWrapper.select("max(tempering_layout_id)-min(tempering_layout_id) as diff")
- .eq("state", Const.GLASS_STATE_IN);
+ .eq("state", Const.GLASS_STATE_IN)
+ .inSql("slot", "select slot from edg_storage_cage where enable_state = " + Const.SLOT_ON);
List<Object> list = edgStorageCageDetailsService.listObjs(queryWrapper);
+ //鑾峰彇绗煎唴鐜荤拑鐗堝浘宸�兼槸鍚﹀ぇ浜庨槇鍊�
if (CollectionUtil.isNotEmpty(list)) {
Long diff = (Long) list.get(0);
return diff > threshold;
} else {
return Boolean.FALSE;
}
-
}
/**
@@ -324,12 +423,13 @@
* @param width
* @param height
*/
- private EdgStorageCageDetails queryMinGlass(Double width, Double height, String glassId) {
+ private EdgStorageCageDetails queryMinGlass(double width, double height, String glassId) {
//鑾峰彇琛ㄥ唴鐗堝浘id鏈�灏忕殑鐜荤拑淇℃伅
EdgStorageCageDetails glassDetails = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
.eq(EdgStorageCageDetails::getState, 100)
.eq(width != 0, EdgStorageCageDetails::getWidth, width)
.eq(height != 0, EdgStorageCageDetails::getHeight, height)
+ .inSql(EdgStorageCageDetails::getSlot, "select slot from edg_storage_cage where enable_state = " + Const.SLOT_ON)
.orderByAsc(EdgStorageCageDetails::getTemperingLayoutId)
.orderBy(Boolean.TRUE, sequenceOrder, EdgStorageCageDetails::getTemperingFeedSequence)
.last("limit 1"));
@@ -337,7 +437,9 @@
return glassDetails;
}
GlassInfo one = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
- .eq(GlassInfo::getGlassId, glassId));
+ .eq(GlassInfo::getGlassId, glassId)
+// .inSql(GlassInfo::getEngineerId, "select engineer_id from engineering where state = 1")
+ );
EdgStorageCageDetails resultDetails = new EdgStorageCageDetails();
BeanUtils.copyProperties(one, resultDetails);
if (null == glassDetails) {
@@ -352,20 +454,18 @@
*/
private List<EdgStorageCageDetails> queryGlassByTaskLine(int line) {
//鑾峰彇浠诲姟琛ㄤ腑鏈�鍚庝竴娆″嚭鐗囩殑鐜荤拑id
- LambdaQueryWrapper<TaskCache> queryWrapper = new LambdaQueryWrapper<TaskCache>().eq(TaskCache::getTaskType, Const.GLASS_CACHE_TYPE_OUT)
- .eq(TaskCache::getEndCell, line).orderByDesc(TaskCache::getCreateTime);
- List<TaskCache> taskCacheList = taskCacheService.list(queryWrapper);
- if (CollectionUtil.isEmpty(taskCacheList)) {
+ TaskCache taskCache = taskCacheService.queryGlassByTaskCache(line, Const.GLASS_CACHE_TYPE_OUT_ALL);
+ if (null == taskCache) {
log.info("娌℃湁鎵惧埌{}绾夸换鍔′俊鎭�", line);
return new ArrayList<>();
}
- TaskCache taskCache = taskCacheList.get(0);
MPJQueryWrapper<EdgStorageCageDetails> mpjLambdaWrapper = new MPJQueryWrapper<>();
mpjLambdaWrapper.select("t1.*")
.innerJoin("edg_storage_cage_details t1 on t.width = t1.width and t.height = t1.height")
.eq("t.glass_id", taskCache.getGlassId())
.ne("t1.glass_id", taskCache.getGlassId())
.eq("t1.state", Const.GLASS_STATE_IN)
+ .inSql("t1.slot", "select slot from edg_storage_cage where enable_state = " + Const.SLOT_ON)
.orderByAsc("t1.tempering_layout_id")
.orderBy(Boolean.TRUE, sequenceOrder, "t1.tempering_feed_sequence");
List<EdgStorageCageDetails> details = edgStorageCageDetailsService.selectJoinList(EdgStorageCageDetails.class, mpjLambdaWrapper);
@@ -379,18 +479,18 @@
* 鎸夌収浠诲姟绫诲瀷銆佺嚎鍙疯幏鍙栦换鍔′俊鎭�
*
* @param line
- * @param taskType
+ * @param taskTypes
* @return
*/
- private EdgStorageCageDetails queryGlassByTaskCache(int line, int taskType) {
- LambdaQueryWrapper<TaskCache> queryWrapper = new LambdaQueryWrapper<TaskCache>().eq(TaskCache::getTaskType, taskType)
- .eq(TaskCache::getEndCell, line).orderByDesc(TaskCache::getCreateTime);
- List<TaskCache> list = taskCacheService.list(queryWrapper);
- if (CollectionUtil.isEmpty(list)) {
+ private EdgStorageCageDetails queryGlassByTaskCache(int line, List<Integer> taskTypes) {
+ TaskCache taskCache = taskCacheService.queryGlassByTaskCache(line, taskTypes);
+ if (null == taskCache) {
log.info("娌℃湁鎵惧埌{}绾夸换鍔′俊鎭�", line);
return null;
}
- return edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getGlassId, list.get(0).getGlassId()));
+ return edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getGlassId, taskCache.getGlassId())
+ .inSql(EdgStorageCageDetails::getSlot, "select slot from edg_storage_cage where enable_state = " + Const.SLOT_ON)
+ .last(" limit 1 "));
}
/**
@@ -405,46 +505,21 @@
*/
private Integer queryLineByGlassInfo(EdgStorageCageDetails a08EdgStorageCageDetails, EdgStorageCageDetails a10EdgStorageCageDetails,
EdgStorageCageDetails glassInfo, int out08Glassstate, int out10Glassstate) {
- boolean b08 = a08EdgStorageCageDetails != null && a08EdgStorageCageDetails.getHeight().equals(glassInfo.getHeight())
- && a08EdgStorageCageDetails.getWidth().equals(glassInfo.getWidth());
- boolean b10 = a10EdgStorageCageDetails != null && a10EdgStorageCageDetails.getHeight().equals(glassInfo.getHeight())
- && a10EdgStorageCageDetails.getWidth().equals(glassInfo.getWidth());
//瀛樺湪鍑虹墖浠诲姟 07涓虹┖
- if (a08EdgStorageCageDetails == null && a10EdgStorageCageDetails == null) {
- return queryLineNoTask(out08Glassstate, out10Glassstate);
- } else {
+ if (out08Glassstate == 1 && out10Glassstate == 1) {
+ boolean b08 = a08EdgStorageCageDetails != null && a08EdgStorageCageDetails.getHeight() == glassInfo.getHeight()
+ && a08EdgStorageCageDetails.getWidth() == glassInfo.getWidth();
+ boolean b10 = a10EdgStorageCageDetails != null && a10EdgStorageCageDetails.getHeight() == glassInfo.getHeight()
+ && a10EdgStorageCageDetails.getWidth() == glassInfo.getWidth();
if (b08) {
- return queryLineHasTask(out08Glassstate);
+ return Const.A09_OUT_TARGET_POSITION;
}
if (b10) {
- return queryLineHasTask(out10Glassstate);
+ return Const.A10_OUT_TARGET_POSITION;
}
- return queryLineNoTask(out08Glassstate, out10Glassstate);
}
+ return computerLineByState(out08Glassstate, out10Glassstate);
}
-
- /**
- * 鑾峰彇鏈変换鍔″悗鐨勫嚭鐗囬�昏緫
- */
- private Integer queryLineHasTask(int outGlassstate) {
- return outGlassstate == 2 ? Const.A10_OUT_TARGET_POSITION : Const.A09_OUT_TARGET_POSITION;
- }
-
- /**
- * 鑾峰彇鏃犱换鍔″悗鐨勫嚭鐗囬�昏緫
- *
- * @return
- */
- private Integer queryLineNoTask(int out08Glassstate, int out10Glassstate) {
- if (out08Glassstate == 2) {
- return Const.A10_OUT_TARGET_POSITION;
- }
- if (out10Glassstate == 2 || out08Glassstate == 1) {
- return Const.A09_OUT_TARGET_POSITION;
- }
- return Const.A10_OUT_TARGET_POSITION;
- }
-
/**
* 鎸夌収灏哄鍑虹幓鐠�
@@ -453,14 +528,24 @@
* @param glassId
* @return
*/
- private EdgStorageCageDetails queryChangeGlassInfo(int endcell, String glassId) {
+ public EdgStorageCageDetails queryChangeGlassInfo(int endcell, String glassId) {
//鑾峰彇绗煎瓙鍐呮暟閲忓墠浜岀殑鐜荤拑鏁伴噺
- 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");
+ MPJQueryWrapper<EdgStorageCageDetails> wrapper = new MPJQueryWrapper<>();
+ wrapper.select("count(t.glass_id) as count, t.width, t.height")
+ .eq("t.state", Const.GLASS_STATE_IN)
+ .inSql("t.slot", "select slot from edg_storage_cage where enable_state = " + Const.SLOT_ON)
+ .groupBy("t.width, t.height");
+ if (endcell == Const.A10_OUT_TARGET_POSITION) {
+ wrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
+ "case when width < height then width else height end as second_length from edg_storage_cage_details) t1 " +
+ "on t.glass_id = t1.glass_id and (t1.first_length >= " + minOneFirstLength + " and t1.second_length >= " + minOneSecondLength);
+ } else {
+ wrapper.innerJoin("(select glass_id, case when height <= width then width else height end as first_length, " +
+ "case when width < height then width else height end as second_length from edg_storage_cage_details) t1 " +
+ "on t.glass_id = t1.glass_id and (t1.first_length between " + minTwoFirstLength + " and " + firstLength
+ + " and t1.second_length between " + minTwoSecondLength + " and " + secondLength + ") ");
+ }
+ wrapper.last("order by count(t.glass_id) desc limit 2");
List<EdgStorageCageDetails> list = edgStorageCageDetailsService.list(wrapper);
if (CollectionUtil.isEmpty(list)) {
return null;
@@ -469,16 +554,16 @@
//鑾峰彇瀹介珮鎷嶇涓�鐨勭幓鐠冧俊鎭�
EdgStorageCageDetails firstSize = list.get(0);
Integer firstCount = firstSize.getCount();
- Double firstWidth = firstSize.getWidth();
- Double firstHeight = firstSize.getHeight();
+ double firstWidth = firstSize.getWidth();
+ double firstHeight = firstSize.getHeight();
if (list.size() == 1) {
return queryMinGlass(firstWidth, firstHeight, glassId);
}
//鑾峰彇瀹介珮鎷嶇浜岀殑鐜荤拑淇℃伅
EdgStorageCageDetails secondSize = list.get(1);
Integer secondCount = secondSize.getCount();
- Double secondWidth = secondSize.getWidth();
- Double secondHeight = secondSize.getHeight();
+ double secondWidth = secondSize.getWidth();
+ double secondHeight = secondSize.getHeight();
//鑾峰彇鏁伴噺鍓�2鐨勭幓鐠冩暟閲忔瘮渚�
Integer mix = firstCount / secondCount;
log.info("鑾峰彇鐜荤拑鏁伴噺鍓�2鐨勭幓鐠冨崰姣斾负锛歿}", mix);
@@ -489,19 +574,16 @@
} else {
log.info("鑾峰彇鐜荤拑鏁伴噺鍓�2鐨勭幓鐠冨崰姣斾负{}锛屽皬浜�2", mix);
//鑾峰彇浠诲姟琛ㄤ腑鏈�鍚庝竴娆″嚭鐗囩殑鐜荤拑id
- LambdaQueryWrapper<TaskCache> queryWrapper = new LambdaQueryWrapper<TaskCache>().eq(TaskCache::getTaskType, Const.GLASS_CACHE_TYPE_OUT)
- .eq(TaskCache::getEndCell, endcell).orderByDesc(TaskCache::getCreateTime);
- List<TaskCache> taskCacheList = taskCacheService.list(queryWrapper);
- log.info("鑾峰彇浠诲姟琛ㄤ腑{}绾挎渶鍚庝竴娆″嚭鐗囩殑鐜荤拑浠诲姟淇℃伅锛歿}", endcell, taskCacheList);
- if (CollectionUtil.isEmpty(taskCacheList)) {
+ TaskCache taskCache = taskCacheService.queryGlassByTaskCache(endcell, Const.GLASS_CACHE_TYPE_OUT_ALL);
+ log.info("鑾峰彇浠诲姟琛ㄤ腑{}绾挎渶鍚庝竴娆″嚭鐗囩殑鐜荤拑浠诲姟淇℃伅锛歿}", endcell, taskCache);
+ if (null == taskCache) {
log.info("{}绾挎病鏈夊嚭鐗囦换鍔′俊鎭紝鐩存帴鍑虹墖", endcell);
return queryMinGlass(firstSize.getWidth(), firstSize.getHeight(), glassId);
}
- TaskCache taskCache = taskCacheList.get(0);
EdgStorageCageDetails outGlassInfo = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
- .eq(EdgStorageCageDetails::getGlassId, taskCache.getGlassId()));
+ .eq(EdgStorageCageDetails::getGlassId, taskCache.getGlassId()).last("limit 1"));
log.info("{}绾挎湁鍑虹墖浠诲姟淇℃伅,浠诲姟淇℃伅涓簕}锛岀幓鐠冧俊鎭负{}", endcell, taskCache, outGlassInfo);
- if (outGlassInfo.getWidth().equals(firstWidth) && outGlassInfo.getHeight().equals(firstHeight)) {
+ if (outGlassInfo.getWidth() == firstWidth && outGlassInfo.getHeight() == firstHeight) {
log.info("鏁伴噺鏈�澶氱殑瀹絳}楂榹}鍜寋}绾夸换鍔＄殑瀹絳}楂榹}鐩稿悓锛屽嚭鏁伴噺鎺掔浜岀殑鐜荤拑锛屽{}楂榹}",
firstWidth, firstHeight, endcell, outGlassInfo.getWidth(), outGlassInfo.getHeight(), secondWidth, secondHeight);
return queryMinGlass(secondWidth, secondHeight, glassId);
@@ -541,19 +623,17 @@
log.info("6銆佹坊鍔犲嚭鐗囦换鍔℃槸鍚﹀畬鎴愶細{}", taskCacheStatus);
} else {
log.info("5銆侀潪鐩撮�氫换鍔�,灏嗙幓鐠冧俊鎭彃鍏ュ崸寮忕悊鐗囩,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
- LambdaQueryWrapper<EdgStorageCageDetails> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(EdgStorageCageDetails::getGlassId, glassInfo.getGlassId());
- EdgStorageCageDetails updateDetail = new EdgStorageCageDetails();
- updateDetail.setState(Const.GLASS_STATE_OUT);
- edgStorageCageDetailsService.update(updateDetail, wrapper);
+ LambdaUpdateWrapper<EdgStorageCageDetails> wrapper = new LambdaUpdateWrapper<>();
+ wrapper.eq(EdgStorageCageDetails::getGlassId, glassInfo.getGlassId()).set(EdgStorageCageDetails::getState, Const.GLASS_STATE_OUT);
+ edgStorageCageDetailsService.update(wrapper);
log.info("5銆佹洿鏂板嚭鐗囩幓鐠冪殑鐘舵�佷负{}", Const.GLASS_STATE_OUT);
boolean taskCacheStatus = saveTaskCache(glassInfo.getGlassId(), glassInfo.getSlot(), endcell, Const.GLASS_CACHE_TYPE_OUT);
log.info("6銆佹坊鍔犲嚭鐗囦换鍔℃槸鍚﹀畬鎴愶細{}", taskCacheStatus);
}
- boolean glassSizeStatus = saveGlassSize(glassInfo);
+ boolean glassSizeStatus = saveGlassSize(glassInfo, endcell);
log.info("7銆佹坊鍔犲嚭鐗囩幓鐠冨昂瀵镐俊鎭埌纾ㄨ竟鍓嶇幓鐠冭〃鏄惁瀹屾垚锛歿}", glassSizeStatus);
- S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, (short) 1);
+ S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, 1);
log.info("8銆佸彂閫佺‘璁ゅ瓧宸插畬鎴�");
return Boolean.TRUE;
}
@@ -584,17 +664,101 @@
* 娣诲姞鐞嗙墖绗间换鍔�
*
* @param glassInfo
+ * @param endcell
* @return
*/
- private boolean saveGlassSize(EdgStorageCageDetails glassInfo) {
+ private boolean saveGlassSize(EdgStorageCageDetails glassInfo, int endcell) {
EdgGlassTaskInfo edgGlassTaskInfo = new EdgGlassTaskInfo();
BeanUtils.copyProperties(glassInfo, edgGlassTaskInfo);
edgGlassTaskInfo.setHeight((int) (glassInfo.getHeight() * ratio));
edgGlassTaskInfo.setWidth((int) (glassInfo.getWidth() * ratio));
edgGlassTaskInfo.setThickness((int) (glassInfo.getThickness() * ratio));
edgGlassTaskInfo.setStatus(Const.EDG_GLASS_BEFORE);
+ edgGlassTaskInfo.setLine(endcell);
+ edgGlassTaskInfo.setTime(new Date());
+ //鍏堝皢鍘嗗彶瀵瑰垪琛ㄤ腑鏈幓鐠冪殑鏁版嵁鍒犻櫎锛岄噸鏂版柊澧炰竴浠芥渶鏂扮殑鏁版嵁
+ edgGlassTaskInfoService.remove(new LambdaQueryWrapper<EdgGlassTaskInfo>().eq(EdgGlassTaskInfo::getGlassId, glassInfo.getGlassId()));
return edgGlassTaskInfoService.save(edgGlassTaskInfo);
}
+ /**
+ * 璁＄畻鍑虹墖绾胯矾
+ * 宸叉帓闄ら兘涓�2 閮戒负0 鐨勬儏鍐�
+ *
+ * @param out08Glassstate
+ * @param out10Glassstate
+ * @return
+ */
+ private int computerLineByState(int out08Glassstate, int out10Glassstate) {
+ if (out08Glassstate == 0) {
+ if (out10Glassstate == 2) {
+ return Const.A09_OUT_TARGET_POSITION;
+ } else {
+ return Const.A10_OUT_TARGET_POSITION;
+ }
+ } else if (out08Glassstate == 1) {
+ return Const.A09_OUT_TARGET_POSITION;
+ } else {
+ return Const.A10_OUT_TARGET_POSITION;
+ }
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void CacheGlassTasks() {
+ JSONObject jsonObject = new JSONObject();
+ List<Map<String, Object>> currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
+// List<Map<String, Object>> currentCutTerritorys=new ArrayList<>();
+// if(engineerId==null||engineerId.isEmpty()){
+// //璇嗗埆鎽嗙墖 褰撳墠鐗堝浘鏁版嵁
+// currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
+// }else{
+// //璇嗗埆鎽嗙墖 姝ngineerId 宸ョ▼鐗堝浘鏁版嵁
+// currentCutTerritorys = edgStorageCageDetailsService.selectCurrentCutTerritory(engineerId);
+// }
+ jsonObject.append("currentCutTerritory", currentCutTerritorys);
+ //log.info("鏈璇嗗埆鐗堝浘{},++++{}",engineerId,currentCutTerritorys);
+ //纾ㄨ竟淇℃伅
+ List<Map<String, Object>> EdgTasks1 = edgGlassTaskInfoService.selectEdgInfo("2001");
+ List<Map<String, Object>> EdgTasks2 = edgGlassTaskInfoService.selectEdgInfo("2002");
+ jsonObject.append("EdgTasks1", EdgTasks1);
+ jsonObject.append("EdgTasks2", EdgTasks2);
+
+ //鍗у缂撳瓨绗煎唴淇℃伅
+ List<Map<String, Object>> EdgStorageCageinfos = edgStorageCageService.selectEdgStorageCages();
+ jsonObject.append("EdgStorageCageinfos", EdgStorageCageinfos);
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlass");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+ List<String> messages = webserver.getMessages();
+ if (!messages.isEmpty()) {
+ // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ webserver.clearMessages();
+ }
+ } else {
+ log.info("Home is closed");
+ }
+ }
+ }
+ }
+ @Scheduled(fixedDelay = 1000)
+ public void cacheGlassIsRun(){
+ JSONObject jsonObject = new JSONObject();
+ //姝ｅ湪杩涜鐨勪换鍔�
+ List<TaskCache>taskCaches=taskCacheService.selectTaskCacheIsRun();
+ jsonObject.append("taskCaches", taskCaches);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlassIsRun");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+ } else {
+ log.info("Home is closed");
+ }
+ }
+ }
+ }
}
--
Gitblit v1.8.0