From 09381335e11d32e01c8067b71d897c7064ec279d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 20 五月 2024 14:38:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 435 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 336 insertions(+), 99 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 fc0aa21..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,8 +7,11 @@
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;
+import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
@@ -18,6 +21,7 @@
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.service.TaskCacheService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -46,8 +50,20 @@
@Autowired
EdgStorageCageDetailsService edgStorageCageDetailsService;
+ @Autowired
+ EdgGlassTaskInfoService edgGlassTaskInfoService;
+
+ @Autowired
+ WebSocketServer webServerService;
+
@Value("${mes.threshold}")
private int threshold;
+
+ @Value("${mes.ratio}")
+ private int ratio;
+
+ @Value("${mes.sequence.order}")
+ private boolean sequenceOrder;
@Scheduled(fixedDelay = 1000)
public void plcHomeEdgTask() {
@@ -55,12 +71,13 @@
String taskRequestTypeValue = plcParameterObject.getPlcParameter("A06_request_word").getValue();
String glassIdeValue = plcParameterObject.getPlcParameter("A05_scanning_ID").getValue();
String confirmationWrodValue = plcParameterObject.getPlcParameter("MES_confirmation_word").getValue();
- //A08 A09琛ㄧず绾胯矾鐩稿悓 鍙仛绛変环
+ //A08 A09琛ㄧず绾胯矾鐩稿悓 鍙仛绛変环 鏃犳暟鎹浆int寮傚父
String out08Glassstate = plcParameterObject.getPlcParameter("A08_glass_status").getValue();
String out10Glassstate = plcParameterObject.getPlcParameter("A10_glass_status").getValue();
String confirmationWrodAddress = plcParameterObject.getPlcParameter("MES_confirmation_word").getAddress();
String currentSlot = plcParameterObject.getPlcParameter("Current_slot").getValue();
- log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{}锛岃幏鍙栧埌鐨勭‘璁ゅ瓧涓猴細{}锛岃幏鍙栧埌鐨勫嚭鐗囩姸鎬佸垎鍒负锛欰09{}銆丄10{},褰撳墠鏍煎瓙鍙蜂负锛歿}",
+
+ log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{}锛岃幏鍙栧埌鐨勭‘璁ゅ瓧涓猴細{}锛岃幏鍙栧埌鐨勫嚭鐗囩姸鎬佸垎鍒负锛欰09:{}銆丄10:{},褰撳墠鏍煎瓙鍙蜂负锛歿}",
taskRequestTypeValue, glassIdeValue, confirmationWrodValue, out08Glassstate, out10Glassstate, currentSlot);
if ("0".equals(taskRequestTypeValue)) {
@@ -73,28 +90,52 @@
return;
}
if (!"0".equals(confirmationWrodValue)) {
- log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓嶄负0锛屽皢纭瀛楁敼涓�0");
- S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 0);
+ log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓嶄负0锛屽皢纭瀛椾笉涓�0锛岀洿鎺ョ粨鏉�");
return;
}
-
if ("1".equals(taskRequestTypeValue)) {
- log.info("3銆佽繘鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�");
+ log.info("2銆佽繘鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�");
inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
} else if ("2".equals(taskRequestTypeValue)) {
//09绌洪棽 锛�1 10绌洪棽 锛�2 閮界┖闂诧細3 鍏朵粬0
- log.info("3銆佸嚭鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�");
- outTo(Integer.parseInt(out08Glassstate), confirmationWrodAddress);
+ log.info("2銆佸嚭鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�");
+ outTo(Integer.parseInt(out08Glassstate),
+ Integer.parseInt(out10Glassstate), confirmationWrodAddress, "", 0);
} else if ("3".equals(taskRequestTypeValue)) {
- log.info("3銆佽繘鐗囧拰鍑虹墖閮界┖闂诧紝鎵ц鍑虹墖浠诲姟");
+ log.info("2銆佽繘鐗囧拰鍑虹墖閮界┖闂诧紝鎵ц鍑虹墖浠诲姟");
//鍔犵瀛愰噷闈㈡槸鍚︽湁鐜荤拑锛屾湁鍏堝嚭锛屾棤鐜荤拑鍏堣繘
- int count = edgStorageCageDetailsService.count(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));
- if ("0".equals(out08Glassstate) || count > 0) {
- inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
+ if (("1".equals(out08Glassstate) || "1".equals(out10Glassstate))) {
+ boolean outFlase = outTo(Integer.parseInt(out08Glassstate),
+ Integer.parseInt(out10Glassstate), confirmationWrodAddress, glassIdeValue, Integer.parseInt(currentSlot));
+ log.info("鍑虹墖浠诲姟鏄惁瀹屾垚锛歿},澶辫触涓旂幓鐠僫d:{}涓嶄负绌哄垯鎵ц杩涚墖浠诲姟", outFlase, glassIdeValue);
+ if (!outFlase && StringUtils.isNotBlank(glassIdeValue)) {
+ inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
+ }
} else {
- outTo(Integer.parseInt(out08Glassstate), confirmationWrodAddress);
+ 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();
+// }
+// }
+//
+// }
+// }
}
/**
@@ -114,7 +155,7 @@
log.info("2銆佽幏鍙栧埌鐨勭幓鐠冧俊鎭负{}", glassInfo);
//娣诲姞杩涚墖浠诲姟 鏌ユ壘绌烘牸
EdgStorageCage nearestEmpty = edgStorageCageService.selectNearestEmpty(Integer.parseInt(currentSlot));
- Assert.isTrue(nearestEmpty == null, "鏍煎瓙宸叉弧");
+ Assert.isTrue(null != nearestEmpty, "鏍煎瓙宸叉弧");
log.info("3銆佹煡璇㈠崸寮忕悊鐗囩閲岄潰鐨勭┖鏍�:{}", nearestEmpty);
log.info("4銆佸皢鐜荤拑淇℃伅鎻掑叆鍗у紡鐞嗙墖绗�,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
@@ -125,17 +166,9 @@
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);
+ boolean taskCache = saveTaskCache(details.getGlassId(), 0, nearestEmpty.getSlot(), Const.GLASS_CACHE_TYPE_IN);
+ log.info("6銆佺敓鎴愯繘鐗囦换鍔′俊鎭瓨鍏ヤ换鍔¤〃鏄惁瀹屾垚锛歿}", taskCache);
S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 1);
log.info("7銆佸彂閫佺‘璁ゅ瓧瀹屾垚");
@@ -146,10 +179,13 @@
/**
* 鍑虹墖浠诲姟
*
- * @param line
+ * @param out08Glassstate
+ * @param out10Glassstate
* @param confirmationWrodAddress
+ * @param glassId
+ * @param currentSlot
*/
- private void outTo(int line, String confirmationWrodAddress) {
+ private boolean outTo(int out08Glassstate, int out10Glassstate, String confirmationWrodAddress, String glassId, int currentSlot) {
//閫昏緫姝ラ锛�
// 0銆丄09銆丄10鏄惁绌洪棽锛屾槸鍚﹀彲浠ユ墽琛屽嚭鐗囦换鍔�
// 1銆佽幏鍙栭挗鍖栫増鍥炬槸鍚﹁秴杩囬槇鍊�
@@ -163,54 +199,94 @@
// 1.2.3銆佹寜鐓у嚭鐗囦俊鎭幓璇︽儏琛ㄦ煡璇㈡牸瀛愬湪绗煎瓙閲岄潰鍓╀綑鐩稿悓灏哄鐨勭幓鐠冩暟鎹笖浠ョ増鍥緄d銆佺増搴忓崌搴忔帓搴� 鍙栫涓�鍧楃幓鐠冨嚭鐗�
// 2銆佸鏋滄病鏈夊巻鍙插嚭鐗囦换鍔�
// 2.1銆佸嚭褰撳墠鐗堝浘id鏈�灏忕増搴忔渶灏忕殑鐜荤拑锛堥棶棰橈細涓ゆ潯绾块兘娌℃湁鍘嗗彶浠诲姟锛屽嚭鐗囨椂涓ゆ潯绾跨殑鐜荤拑灏哄鐩稿悓锛屾槸鍚︽壘灏哄涓嶅悓鐨勶級
- Assert.isTrue(line != 0, "A09銆丄10閮芥湁鐜荤拑锛屾棤娉曞嚭鐗�");
- log.info("0銆佸嚭鐗囦换鍔″嚭銆恵}銆戝彿绾�,澶囨敞(09绌洪棽锛�1;10绌洪棽锛�2;閮界┖闂诧細3)", line);
+ Assert.isFalse(out08Glassstate == 0 && out10Glassstate == 0, "A09銆丄10閮芥湁鐜荤拑锛屾棤娉曞嚭鐗�");
+ log.info("0銆佸嚭鐗囦换鍔″嚭鐨勭姸鎬�:A09:銆恵}銆�;A10:銆恵}銆�)", out08Glassstate, out10Glassstate);
//瀹氫箟鍑虹墖鐜荤拑淇℃伅
- EdgStorageCageDetails glassInfo = null;
int endcell = 0;
+ EdgStorageCageDetails glassInfo = null;
boolean flag = queryMaxMinDiff(threshold);
log.info("1銆佽幏鍙栭挗鍖栫増鍥炬槸鍚﹁秴杩囬槇鍊�:{}", flag);
if (flag) {
- glassInfo = queryMinGlass(0.0, 0.0);
+ //鑾峰彇褰撳墠鏈�灏忕増鍥鹃渶瑕佸嚭鐗囩殑鐜荤拑淇℃伅
+ glassInfo = queryMinGlass(0.0, 0.0, glassId);
log.info("1.1銆佽秴杩囬槇鍊硷細鑾峰彇褰撳墠鏈�灏忕増鍥鹃渶瑕佸嚭鐗囩殑鐜荤拑淇℃伅:{}", glassInfo);
- Integer a09Count = queryCountByTaskLine(Const.A09_OUT_TARGET_POSITION).size();
- Integer a10Count = queryCountByTaskLine(Const.A10_OUT_TARGET_POSITION).size();
- log.info("1.2銆佽幏鍙栫瀛愬墿浣欐暟閲廇09涓簕},A10涓簕}", a09Count, a10Count);
- if (a10Count <= a09Count && line != 2) {
- log.info("1.2.1銆丄09绾垮嚭鐗�");
- endcell = Const.A09_OUT_TARGET_POSITION;
- } else {
- log.info("1.2.2銆丄10绾垮嚭鐗�");
- endcell = Const.A09_OUT_TARGET_POSITION;
+ if (glassInfo == null) {
+ 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);
+ endcell = queryLineByGlassInfo(a09EdgGlass, a10EdgGlass, glassInfo, out08Glassstate, out10Glassstate);
} else {
- //鑾峰彇鎸囧畾绾胯矾灏嗚鍑虹殑鐜荤拑淇℃伅
- endcell = line == 2 ? Const.A10_OUT_TARGET_POSITION : Const.A09_OUT_TARGET_POSITION;
- //褰撳墠浠诲姟鍑哄畬鏃犵幓鐠� 鏇存崲鐜荤拑
- int othercell = endcell == Const.A10_OUT_TARGET_POSITION ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
- List<EdgStorageCageDetails> details = queryCountByTaskLine(endcell);
- if (details.size() > 0) {
- glassInfo = details.get(0);
+ //鍒ゆ柇涓ゆ潯绾挎槸鍚﹂兘绌洪棽
+ endcell = out08Glassstate == 1 ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
+ if (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 (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");
+ 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;
+ } 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);
+ 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);
+ }
} else {
- //todo:鍘荤悊鐗囩閲岄潰鏌�
- glassInfo = queryChangeGlassInfo(othercell);
+ List<EdgStorageCageDetails> edgStorageCageDetails = queryGlassByTaskLine(endcell);
+ if (CollectionUtil.isNotEmpty(edgStorageCageDetails)) {
+ glassInfo = edgStorageCageDetails.get(0);
+ } else {
+ //鑾峰彇绗煎唴鎵�鏈夌幓鐠冧俊鎭紝鍖呮嫭寰呰繘鐗囩殑
+ List<EdgStorageCageDetails> glassList = queryEdgAllGlass(glassId);
+ Assert.isTrue(CollectionUtil.isNotEmpty(glassList), "绗煎唴鍜屽緟杩涚墖閮芥病鏈夌幓鐠�");
+ int othercell = endcell == Const.A10_OUT_TARGET_POSITION ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
+ glassInfo = queryChangeGlassInfo(othercell, glassId);
+ }
}
-
}
+ return saveOutGlassMessage(glassInfo, endcell, confirmationWrodAddress, glassId, currentSlot);
+ }
- if (glassInfo != null) {
- log.info("4銆佹坊鍔犲嚭鐗囦换鍔★紝鐜荤拑id锛歿}锛屼换鍔＄被鍨嬶細{}锛岃捣濮嬩綅缃細{}锛岀粨鏉熶綅缃細{}", glassInfo.getGlassId(),
- 2, glassInfo.getSlot(), endcell);
- TaskCache taskCache = new TaskCache();
- taskCache.setGlassId(glassInfo.getGlassId());
- taskCache.setTaskStatus(0);
- taskCache.setStartCell(glassInfo.getSlot());
- taskCache.setEndCell(endcell);
- taskCache.setTaskType(2);
- taskCache.setCreateTime(new Date());
- taskCacheService.insertTaskCache(taskCache);
- S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 1);
+ /**
+ * 鑾峰彇绗煎瓙鍐呮墍鏈夌幓鐠冧俊鎭紝鍖呮嫭寰呰繘鐗囩殑
+ *
+ * @param glassId
+ */
+ private List<EdgStorageCageDetails> queryEdgAllGlass(String glassId) {
+ List<EdgStorageCageDetails> glassList = new ArrayList<>();
+ //鑾峰彇寰呰繘鐗囩幓鐠�
+ 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));
+ glassList.addAll(details);
+ return glassList;
+
}
/**
@@ -219,12 +295,18 @@
* @return
*/
private boolean queryMaxMinDiff(int threshold) {
- //todo:鑾峰彇绗煎瓙鍐呮渶澶х増鍥緄d鍜屾渶灏忕増鍥緄d鎻掑�硷紝鍒ゆ柇鏄惁澶т簬闃堝�硷紝澶т簬闃堝�肩洿鎺ュ嚭鏈�灏忕増鍥剧幓鐠�
+ //鑾峰彇绗煎瓙鍐呮渶澶х増鍥緄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);
- Integer diff = (Integer) edgStorageCageDetailsService.listObjs(queryWrapper).get(0);
- return diff > threshold;
+ List<Object> list = edgStorageCageDetailsService.listObjs(queryWrapper);
+ if (CollectionUtil.isNotEmpty(list)) {
+ Long diff = (Long) list.get(0);
+ return diff > threshold;
+ } else {
+ return Boolean.FALSE;
+ }
+
}
/**
@@ -233,33 +315,50 @@
* @param width
* @param height
*/
- private EdgStorageCageDetails queryMinGlass(Double width, Double height) {
- return edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ 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)
- .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId, EdgStorageCageDetails::getTemperingFeedSequence)
+ .orderByAsc(EdgStorageCageDetails::getTemperingLayoutId)
+ .orderBy(Boolean.TRUE, sequenceOrder, EdgStorageCageDetails::getTemperingFeedSequence)
.last("limit 1"));
+ if (StringUtils.isBlank(glassId)) {
+ return glassDetails;
+ }
+ GlassInfo one = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, glassId));
+ EdgStorageCageDetails resultDetails = new EdgStorageCageDetails();
+ BeanUtils.copyProperties(one, resultDetails);
+ if (null == glassDetails) {
+ return resultDetails;
+ }
+ return resultDetails.getTemperingLayoutId() <= glassDetails.getTemperingLayoutId() && resultDetails.getTemperingFeedSequence() > glassDetails.getTemperingFeedSequence() ?
+ resultDetails : glassDetails;
}
/**
- * 鑾峰彇浠诲姟琛ㄤ腑鎸囧畾绾胯矾绗煎瓙鍐呰繕鍓╀綑鐨勭幓鐠冩暟閲�
+ * 鑾峰彇浠诲姟琛ㄤ腑鎸囧畾绾胯矾绗煎瓙鍐呰繕鍓╀綑鐨勭幓鐠冧俊鎭�
*/
- private List<EdgStorageCageDetails> queryCountByTaskLine(int line) {
+ 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)) {
+ log.info("娌℃湁鎵惧埌{}绾夸换鍔′俊鎭�", line);
return new ArrayList<>();
}
TaskCache taskCache = taskCacheList.get(0);
MPJQueryWrapper<EdgStorageCageDetails> mpjLambdaWrapper = new MPJQueryWrapper<>();
- mpjLambdaWrapper.select("a.*")
+ 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())
- .orderByAsc("t1.tempering_layout_id", "t1.tempering_feed_sequence");
+ .eq("t1.state", Const.GLASS_STATE_IN)
+ .orderByAsc("t1.tempering_layout_id")
+ .orderBy(Boolean.TRUE, sequenceOrder, "t1.tempering_feed_sequence");
List<EdgStorageCageDetails> details = edgStorageCageDetailsService.selectJoinList(EdgStorageCageDetails.class, mpjLambdaWrapper);
if (CollectionUtil.isEmpty(details)) {
return new ArrayList<>();
@@ -268,40 +367,83 @@
}
/**
- * 鏇存崲鍑虹墖鐜荤拑
+ * 鎸夌収浠诲姟绫诲瀷銆佺嚎鍙疯幏鍙栦换鍔′俊鎭�
*
- * @param othercell
+ * @param line
+ * @param taskType
* @return
*/
- private EdgStorageCageDetails queryChangeGlassInfo(int othercell) {
+ 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)) {
+ log.info("娌℃湁鎵惧埌{}绾夸换鍔′俊鎭�", line);
+ return null;
+ }
+ return edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getGlassId, list.get(0).getGlassId()));
+ }
+
+ /**
+ * 鎸夌収浠诲姟鐜荤拑淇℃伅鍜屽緟鍑虹墖鐜荤拑淇℃伅鑾峰彇鍑虹墖璺緞
+ *
+ * @param a08EdgStorageCageDetails 09鍙风嚎鍑虹墖鐜荤拑淇℃伅
+ * @param a10EdgStorageCageDetails 10鍙风嚎鍑虹墖鐜荤拑淇℃伅
+ * @param glassInfo 甯﹀嚭鐗囩幓鐠冧俊鎭�
+ * @param out08Glassstate 09鍙风嚎绌洪棽鐘舵��
+ * @param out10Glassstate 10鍙风嚎绌洪棽鐘舵��
+ * @return
+ */
+ private Integer queryLineByGlassInfo(EdgStorageCageDetails a08EdgStorageCageDetails, EdgStorageCageDetails a10EdgStorageCageDetails,
+ EdgStorageCageDetails glassInfo, int out08Glassstate, int out10Glassstate) {
+ if (a08EdgStorageCageDetails != null && a08EdgStorageCageDetails.getHeight().equals(glassInfo.getHeight())
+ && a08EdgStorageCageDetails.getWidth().equals(glassInfo.getWidth()) && out08Glassstate == 1) {
+ return Const.A09_OUT_TARGET_POSITION;
+ }
+ if (a10EdgStorageCageDetails != null && a10EdgStorageCageDetails.getHeight().equals(glassInfo.getHeight())
+ && a10EdgStorageCageDetails.getWidth().equals(glassInfo.getWidth()) && out10Glassstate == 1) {
+ return Const.A10_OUT_TARGET_POSITION;
+ }
+ if (out08Glassstate == 1) {
+ return Const.A09_OUT_TARGET_POSITION;
+ }
+ if (out10Glassstate == 1) {
+ return Const.A10_OUT_TARGET_POSITION;
+ }
+ Assert.isTrue(Boolean.FALSE, "娌℃湁鎵惧埌鍑虹墖璺緞");
+ return 0;
+ }
+
+ /**
+ * 鎸夌収灏哄鍑虹幓鐠�
+ *
+ * @param endcell endcell = out08Glassstate == 1 ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
+ * @param glassId
+ * @return
+ */
+ private EdgStorageCageDetails queryChangeGlassInfo(int endcell, String glassId) {
//鑾峰彇绗煎瓙鍐呮暟閲忓墠浜岀殑鐜荤拑鏁伴噺
MPJLambdaWrapper<EdgStorageCageDetails> wrapper = new MPJLambdaWrapper<>();
wrapper.select(EdgStorageCageDetails::getWidth, EdgStorageCageDetails::getHeight)
- .selectCount("*", EdgStorageCageDetails::getCount)
+ .selectCount(EdgStorageCageDetails::getGlassId, EdgStorageCageDetails::getCount)
+ .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
.groupBy(EdgStorageCageDetails::getWidth, EdgStorageCageDetails::getHeight)
- .last("order by count(*) desc limit 2");
+ .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);
- Assert.notEmpty(list, "绗煎瓙閲屾病鏈夌幓鐠�");
- //涓�鐗囩幓鐠冪洿鎺ュ嚭
- if (list.size() == 1) {
- return list.get(0);
- }
- //鍒嗗埆鑾峰彇瀹介珮鐨勭幓鐠冩暟閲�
+ //鑾峰彇瀹介珮鎷嶇涓�鐨勭幓鐠冧俊鎭�
EdgStorageCageDetails firstSize = list.get(0);
- EdgStorageCageDetails secondSize = list.get(1);
- //鑾峰彇浠诲姟琛ㄤ腑鏈�鍚庝竴娆″嚭鐗囩殑鐜荤拑id
- LambdaQueryWrapper<TaskCache> queryWrapper = new LambdaQueryWrapper<TaskCache>().eq(TaskCache::getTaskType, Const.GLASS_CACHE_TYPE_OUT)
- .eq(TaskCache::getEndCell, othercell).orderByDesc(TaskCache::getCreateTime);
- List<TaskCache> taskCacheList = taskCacheService.list(queryWrapper);
- log.info("鑾峰彇浠诲姟琛ㄤ腑{}绾挎渶鍚庝竴娆″嚭鐗囩殑鐜荤拑浠诲姟淇℃伅锛歿}", othercell, taskCacheList);
- if (CollectionUtil.isEmpty(taskCacheList)) {
- log.info("{}绾挎病鏈夊嚭鐗囦换鍔′俊鎭紝鐩存帴鍑虹墖", othercell);
- return queryMinGlass(firstSize.getWidth(), firstSize.getHeight());
- }
Integer firstCount = firstSize.getCount();
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();
@@ -311,21 +453,116 @@
if (mix >= 2) {
log.info("鑾峰彇鐜荤拑鏁伴噺鍓�2鐨勭幓鐠冨崰姣斾负{}锛屽ぇ浜�2锛岀洿鎺ュ嚭鐜荤拑鏁版嵁鐨勬渶澶氱殑锛屽锛歿}锛岄珮锛歿}", mix, firstWidth, firstHeight);
- return queryMinGlass(firstWidth, firstHeight);
+ return queryMinGlass(firstWidth, firstHeight, glassId);
} 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)) {
+ 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()));
- log.info("{}绾挎湁鍑虹墖浠诲姟淇℃伅,浠诲姟淇℃伅涓簕}锛岀幓鐠冧俊鎭负{}", othercell, taskCache, outGlassInfo);
+ EdgStorageCageDetails outGlassInfo = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getGlassId, taskCache.getGlassId()));
+ log.info("{}绾挎湁鍑虹墖浠诲姟淇℃伅,浠诲姟淇℃伅涓簕}锛岀幓鐠冧俊鎭负{}", endcell, taskCache, outGlassInfo);
if (outGlassInfo.getWidth().equals(firstWidth) && outGlassInfo.getHeight().equals(firstHeight)) {
log.info("鏁伴噺鏈�澶氱殑瀹絳}楂榹}鍜寋}绾夸换鍔＄殑瀹絳}楂榹}鐩稿悓锛屽嚭鏁伴噺鎺掔浜岀殑鐜荤拑锛屽{}楂榹}",
- firstWidth, firstHeight, othercell, outGlassInfo.getWidth(), outGlassInfo.getHeight(), secondWidth, secondHeight);
- return queryMinGlass(secondWidth, secondHeight);
+ firstWidth, firstHeight, endcell, outGlassInfo.getWidth(), outGlassInfo.getHeight(), secondWidth, secondHeight);
+ return queryMinGlass(secondWidth, secondHeight, glassId);
} else {
log.info("鏁伴噺绗簩澶氱殑瀹絳}楂榹}鍜寋}绾夸换鍔＄殑瀹絳}楂榹}鐩稿悓锛屽嚭鏁伴噺鎺掔浜岀殑鐜荤拑锛屽{}楂榹}",
- secondWidth, secondHeight, othercell, outGlassInfo.getWidth(), outGlassInfo.getHeight(), firstWidth, firstHeight);
- return queryMinGlass(firstWidth, firstHeight);
+ secondWidth, secondHeight, endcell, outGlassInfo.getWidth(), outGlassInfo.getHeight(), firstWidth, firstHeight);
+ return queryMinGlass(firstWidth, firstHeight, glassId);
}
}
}
+
+ /**
+ * 淇濆瓨鍑虹墖浠诲姟鐩稿叧淇℃伅
+ *
+ * @param glassInfo
+ * @param endcell
+ * @param confirmationWrodAddress
+ * @param glassId
+ * @return
+ */
+ private boolean saveOutGlassMessage(EdgStorageCageDetails glassInfo, int endcell, String confirmationWrodAddress, String glassId, Integer currentSlot) {
+ if (glassInfo != null) {
+ log.info("4銆佹坊鍔犲嚭鐗囦换鍔★紝鐜荤拑id锛歿}锛屼换鍔＄被鍨嬶細{}锛岃捣濮嬩綅缃細{}锛岀粨鏉熶綅缃細{}", glassInfo.getGlassId(),
+ 2, glassInfo.getSlot(), endcell);
+ if (glassInfo.getGlassId().equals(glassId)) {
+ log.info("5銆佺洿閫氫换鍔�,灏嗙幓鐠冧俊鎭彃鍏ュ崸寮忕悊鐗囩,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
+ EdgStorageCageDetails details = new EdgStorageCageDetails();
+ BeanUtils.copyProperties(glassInfo, details);
+ EdgStorageCage nearestEmpty = edgStorageCageService.selectNearestEmpty(currentSlot);
+ Assert.isTrue(null != nearestEmpty, "鏍煎瓙宸叉弧,鏃犳硶鎵ц鐩撮�氫换鍔�");
+ log.info("3銆佹煡璇㈠崸寮忕悊鐗囩閲岄潰鐨勭┖鏍�:{}", nearestEmpty);
+ details.setSlot(nearestEmpty.getSlot());
+ details.setState(Const.GLASS_STATE_OUT);
+ edgStorageCageDetailsService.save(details);
+
+ boolean taskCacheStatus = saveTaskCache(glassInfo.getGlassId(), nearestEmpty.getSlot(), endcell, Const.GLASS_CACHE_TYPE_THROUGH);
+ 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);
+ 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);
+ log.info("7銆佹坊鍔犲嚭鐗囩幓鐠冨昂瀵镐俊鎭埌纾ㄨ竟鍓嶇幓鐠冭〃鏄惁瀹屾垚锛歿}", glassSizeStatus);
+ S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 1);
+ log.info("8銆佸彂閫佺‘璁ゅ瓧宸插畬鎴�");
+ return Boolean.TRUE;
+ }
+ return Boolean.FALSE;
+ }
+
+ /**
+ * 娣诲姞鐞嗙墖绗间换鍔�
+ *
+ * @param glassId
+ * @param startcell
+ * @param endcell
+ * @param taskType
+ * @return
+ */
+ private boolean saveTaskCache(String glassId, int startcell, int endcell, int taskType) {
+ TaskCache taskCache = new TaskCache();
+ taskCache.setGlassId(glassId);
+ taskCache.setTaskStatus(0);
+ taskCache.setStartCell(startcell);
+ taskCache.setEndCell(endcell);
+ taskCache.setTaskType(taskType);
+ taskCache.setCreateTime(new Date());
+ return taskCacheService.save(taskCache);
+ }
+
+ /**
+ * 娣诲姞鐞嗙墖绗间换鍔�
+ *
+ * @param glassInfo
+ * @return
+ */
+ private boolean saveGlassSize(EdgStorageCageDetails glassInfo) {
+ 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);
+ return edgGlassTaskInfoService.save(edgGlassTaskInfo);
+ }
+
+
}
--
Gitblit v1.8.0