From 09a010c5dc11c68a866a6075a74bd1bbefb4a9a8 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 24 六月 2024 16:38:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java | 63 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
index 11c224b..d6db167 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
@@ -129,12 +129,12 @@
}
}
- if (("1".equals(G11RobotTaskRequestWord) || "1".equals(G06RobotTaskRequestWord)) || "1".equals(G13RobotTaskRequestWord)) {
- log.info("4銆佹湁鏈哄櫒浜轰笅鐗囪姹傦紝鎵ц涓嬬墖浠诲姟");
+ if (("0".equals(G11RobotTaskRequestWord) || "0".equals(G06RobotTaskRequestWord)) || "0".equals(G13RobotTaskRequestWord)) {
+ log.info("4銆佹湁涓嬬墖瀹屾垚淇″彿鏇存柊钀芥灦鏁伴噺");
insertdownglassinfo();
}
- //鑷姩缁戝畾鏋跺瓙锛屽鏋滃伐浣嶈〃娌℃湁缁戝畾鏋跺瓙锛岄粯璁ゅ皢绗煎瓙涓暟閲忔渶澶氱殑娴佺▼鍗″彿缁戝畾鏈哄櫒鎵�2鐨勭┖鏋跺瓙
+
}
@@ -155,9 +155,10 @@
}
log.info("2銆佽幏鍙栧埌鐨勭幓鐠冧俊鎭负{}", glassInfo);
- if (glassInfo.getGlassId().equals(downStorageCageDetailsService.DirectConnection())) {
+ if (downStorageCageDetailsService.DirectConnection(glassInfo)) {
//鐩撮��
- log.info("3銆佸鏋滃綋鍓嶇幓鐠冨睘浜庣増鍥緄d鍜岀墖搴忕殑椤哄簭鍒欑洿閫氾紝鎵ц涓嬬墖浠诲姟");
+ //log.info("3銆佸鏋滃綋鍓嶇幓鐠冨睘浜庣増鍥緄d鍜岀墖搴忕殑椤哄簭鍒欑洿閫氾紝鎵ц涓嬬墖浠诲姟");
+ log.info("3銆佸鏋滃綋鍓嶇幓鐠冨睘浜庢祦绋嬪崱涓殑鐗囧簭鐨勯『搴忓垯鐩撮�氾紝鎵ц涓嬬墖浠诲姟");
DownWorkstation downWorkstation = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>().eq(DownWorkstation::getFlowCardId, glassInfo.getFlowCardId()));
int WorkstationId = downWorkstation.getWorkstationId();
DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(glassInfo, "0", String.valueOf(WorkstationId), "3");
@@ -165,7 +166,9 @@
} else {
- log.info("4銆佸鏋滀笉灞炰簬鐗堝浘id鍜岀墖搴忕殑椤哄簭鎵ц杩涚墖浠诲姟");
+ // log.info("4銆佸鏋滀笉灞炰簬鐗堝浘id鍜岀墖搴忕殑椤哄簭鎵ц杩涚墖浠诲姟");
+ log.info("4銆佸鏋滀笉灞炰簬娴佺▼鍗′腑鐨勭墖搴忕殑椤哄簭鎵ц杩涚墖浠诲姟");
+
//娣诲姞杩涚墖浠诲姟 鏌ユ壘绌烘牸
List<DownStorageCageDetails> list = downStorageCageService.selectCacheEmpty();
if (list.size() > 0) {
@@ -201,11 +204,12 @@
* @param MESSendingWord
*/
private Boolean outTo(String MESSendingWord) {
- log.info("鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勬枡鏋跺彿 鏌ヨ绗﹀悎鎸夌収鐗堝浘id鍜岀墖搴忓嚭鐗�,骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖");
+ // log.info("鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勬枡鏋跺彿 鏌ヨ绗﹀悎鎸夌収鐗堝浘id鍜岀墖搴忓嚭鐗�,骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖");
+ log.info("鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勬枡鏋跺彿 鏌ヨ绗﹀悎鎸夌収娴佺▼鍗′腑椤哄簭鍑虹墖,骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖");
- List<DownStorageCageDetails> list1to3 = downStorageCageDetailsService.CacheOut1(1, 3);
- List<DownStorageCageDetails> list4to6 = downStorageCageDetailsService.CacheOut1(4, 6);
- List<DownStorageCageDetails> list1to6 = downStorageCageDetailsService.CacheOut1(1, 6);
+// List<DownStorageCageDetails> list1to3 = downStorageCageDetailsService.CacheOut1(1, 3);
+// List<DownStorageCageDetails> list4to6 = downStorageCageDetailsService.CacheOut1(4, 6);
+ List<DownStorageCageDetails> list1to6 = downStorageCageDetailsService.CacheOut2(1, 6);
DownStorageCageDetails selectedItem = null;
@@ -214,27 +218,28 @@
// 浼樺厛 瓒呭嚭灏哄浼樺厛浜哄伐鍑虹墖 浜哄伐澶勭悊
if (!list1to6.isEmpty()) {
DownStorageCageDetails item3 = list1to6.get(0);
+ //鍚庢湡鏈夌敓浜ц鍒�
if (item3.getHeight() >= 2500 && item3.getWidth() >= 2660) {
log.info("浜哄伐澶勭悊");
selectedItem = item3;
- endCell = "7";
- } else if (!list4to6.isEmpty() && !list1to6.isEmpty()) {
- log.info("鍓嶅悗绔兘绌洪棽 浼樺厛鍚庣鍑虹墖骞朵笖浼樺厛婊℃灦");
- selectedItem = list4to6.get(0);
+
+ } else if (!!list1to6.isEmpty()) {
+ log.info("鍓嶅悗绔兘绌洪棽浼樺厛婊℃灦");
+ selectedItem = list1to6.get(0);
}
}
// 鎸夌収鐗堝浘id鍜岀墖搴忕鍚堝墠绔嚭鐗�
- if (selectedItem == null && !list1to3.isEmpty()) {
- log.info("鍓嶇鍑虹墖");
- selectedItem = list1to3.get(0);
- }
-
- // 鎸夌収鐗堝浘id鍜岀墖搴忕鍚堝悗绔嚭鐗�
- if (selectedItem == null && !list4to6.isEmpty()) {
- log.info("鍚庣鍑虹墖");
- selectedItem = list4to6.get(0);
- }
+// if (selectedItem == null && !list1to3.isEmpty()) {
+// log.info("鍓嶇鍑虹墖");
+// selectedItem = list1to3.get(0);
+// }
+//
+// // 鎸夌収鐗堝浘id鍜岀墖搴忕鍚堝悗绔嚭鐗�
+// if (selectedItem == null && !list4to6.isEmpty()) {
+// log.info("鍚庣鍑虹墖");
+// selectedItem = list4to6.get(0);
+// }
if (selectedItem != null) {
DownWorkstation downWorkstation = downWorkstationService.getOne(
@@ -286,11 +291,11 @@
DownWorkstation downWorkstation1 = downWorkstationService.selectByFlowCardId(downGlassInfo.getFlowCardId());
downWorkstationService.updateracksnumber(downGlassInfo.getFlowCardId(), downWorkstation1.getRacksnumber() + 1);
log.info("鏇存柊钀芥灦鏁伴噺");
- LambdaQueryWrapper<DownGlassTask> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(DownGlassTask::getGlassId, newdownGlassInfo.getGlassId());
- DownGlassTask updateDetail = new DownGlassTask();
- updateDetail.setTaskStauts(2);
- downGlassTaskService.update(updateDetail, wrapper);
+// LambdaQueryWrapper<DownGlassTask> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(DownGlassTask::getGlassId, newdownGlassInfo.getGlassId());
+// DownGlassTask updateDetail = new DownGlassTask();
+// updateDetail.setTaskStauts(2);
+// downGlassTaskService.update(updateDetail, wrapper);
sequence++; // 閫掑椤哄簭瀛楁鍊�
--
Gitblit v1.8.0