From ef2f5051979a188b0922e3c30908bedca1cc7c74 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 18 六月 2024 13:59:58 +0800
Subject: [PATCH] 绑定架子流程卡号选择显示，和出片优化
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java | 134 ++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 67 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 96d5887..11c224b 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
@@ -1,6 +1,7 @@
package com.mes.job;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.mes.common.config.Const;
import com.mes.downglassinfo.entity.DownGlassInfo;
import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downglassinfo.service.DownGlassInfoService;
@@ -80,7 +81,7 @@
// String glassIdeValue = plcParameterObject.getPlcParameter("A05_scanning_ID").getValue();
// String confirmationWrodValue = plcParameterObject.getPlcParameter("MES_confirmation_word").getValue();
// String outGlassstate = plcParameterObject.getPlcParameter("A09_glass_status").getValue();
-// String confirmationWrodAddress = plcParameterObject.getPlcParameter("MES_confirmation_word").getAddress();
+// String MESSendingWord = plcParameterObject.getPlcParameter("MES_confirmation_word").getAddress();
// String G06RobotTaskRequestWord = plcParameterObject.getPlcParameter("G06RobotTaskRequestWord").getAddress();
@@ -88,7 +89,7 @@
String glassIdeValue = "NG24041101C002-2-6-1-6";
String confirmationWrodValue = "1";
String outGlassstate = "1";
- String confirmationWrodAddress = "1";
+ String MESSendingWord = "1";
String G11RobotTaskRequestWord = "0";
String G06RobotTaskRequestWord = "0";
String G13RobotTaskRequestWord = "0";
@@ -102,27 +103,27 @@
// return;
// }
// log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓�0锛屽皢纭瀛楁敼涓�0");
-// S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 0);
+// S7object.getinstance().plccontrol.WriteWord(MESSendingWord, (short) 0);
// return;
// }
// if (!"0".equals(confirmationWrodValue)) {
// log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓嶄负0锛屽皢纭瀛楁敼涓�0");
-// S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 0);
+// S7object.getinstance().plccontrol.WriteWord(MESSendingWord, (short) 0);
// return;
// }
if ("1".equals(taskRequestTypeValue)) {
log.info("3銆佽繘鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�");
- inTo(glassIdeValue, confirmationWrodAddress);
+ inTo(glassIdeValue, MESSendingWord);
} else if ("2".equals(taskRequestTypeValue)) {
log.info("3銆佸嚭鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�");
- outTo(confirmationWrodAddress);
+ outTo(MESSendingWord);
} else if ("3".equals(taskRequestTypeValue)) {
log.info("3銆佽繘鐗囧拰鍑虹墖閮界┖闂诧紝鎵ц鍑虹墖浠诲姟");
- if (outTo(confirmationWrodAddress)) {
- inTo(glassIdeValue, confirmationWrodAddress);
+ if (outTo(MESSendingWord)) {
+ inTo(glassIdeValue, MESSendingWord);
}
@@ -142,10 +143,10 @@
* 杩涚墖浠诲姟
*
* @param glassId
- * @param confirmationWrodAddress
+ * @param MESSendingWord
* @param
*/
- private void inTo(String glassId, String confirmationWrodAddress) {
+ private void inTo(String glassId, String MESSendingWord) {
log.info("1銆佹寜鐓х幓鐠僫d:{}鑾峰彇鐜荤拑灏忕墖淇℃伅", glassId);
GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
if (glassInfo == null) {
@@ -175,7 +176,7 @@
log.info("6銆佸皢鐜荤拑淇℃伅鎻掑叆鍗у紡鐞嗙墖绗�,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
DownStorageCageDetails details = new DownStorageCageDetails();
BeanUtils.copyProperties(glassInfo, details);
- details.setState(1);
+ details.setState(Const.GLASS_STATE_IN);
details.setGlassId(glassInfo.getGlassId());
details.setSlot(item.getSlot());
details.setDeviceId(item.getDeviceId());
@@ -191,77 +192,71 @@
}
log.info("9銆佸彂閫佺‘璁ゅ瓧瀹屾垚");
- //S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 1);
+ //S7object.getinstance().plccontrol.WriteWord(MESSendingWord, (short) 1);
}
/**
* 鍑虹墖浠诲姟
*
- * @param confirmationWrodAddress
+ * @param MESSendingWord
*/
- private Boolean outTo(String confirmationWrodAddress) {
+ private Boolean outTo(String MESSendingWord) {
log.info("鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勬枡鏋跺彿 鏌ヨ绗﹀悎鎸夌収鐗堝浘id鍜岀墖搴忓嚭鐗�,骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖");
- List<DownStorageCageDetails> list = downStorageCageDetailsService.CacheOut1(1, 3);
- List<DownStorageCageDetails> list2 = downStorageCageDetailsService.CacheOut1(4, 6);
+ List<DownStorageCageDetails> list1to3 = downStorageCageDetailsService.CacheOut1(1, 3);
+ List<DownStorageCageDetails> list4to6 = downStorageCageDetailsService.CacheOut1(4, 6);
+ List<DownStorageCageDetails> list1to6 = downStorageCageDetailsService.CacheOut1(1, 6);
- List<DownStorageCageDetails> list3 = downStorageCageDetailsService.CacheOut1(1, 6);
+ DownStorageCageDetails selectedItem = null;
+
+ String endCell = "";
+
// 浼樺厛 瓒呭嚭灏哄浼樺厛浜哄伐鍑虹墖 浜哄伐澶勭悊
- if (!list3.isEmpty()) {
-
- DownStorageCageDetails item3 = list3.get(0);
+ if (!list1to6.isEmpty()) {
+ DownStorageCageDetails item3 = list1to6.get(0);
if (item3.getHeight() >= 2500 && item3.getWidth() >= 2660) {
log.info("浜哄伐澶勭悊");
- String endcell = "7";
-
-
- DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(item3, "9", endcell, "2");
- downGlassTaskService.insertCacheTask(downGlassTask);
- // S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 2);
-
- return true;
- } else if (!list2.isEmpty() && !list3.isEmpty()) {
+ selectedItem = item3;
+ endCell = "7";
+ } else if (!list4to6.isEmpty() && !list1to6.isEmpty()) {
log.info("鍓嶅悗绔兘绌洪棽 浼樺厛鍚庣鍑虹墖骞朵笖浼樺厛婊℃灦");
- DownStorageCageDetails item4 = list2.get(0);
-
- DownWorkstation downWorkstation = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>().eq(DownWorkstation::getFlowCardId, item4.getFlowCardId()));
- String endcell = String.valueOf(downWorkstation.getWorkstationId());
-
- DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(item4, "9", endcell, "2");
- downGlassTaskService.insertCacheTask(downGlassTask);
-
- //S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 2);
-
- return true;
-
- }
- // 鎸夌収鐗堝浘id鍜岀墖搴忕鍚堝墠绔嚭鐗�
- else if (!list.isEmpty()) {
- log.info("鍓嶇鍑虹墖");
- DownStorageCageDetails item = list.get(0);
- DownWorkstation downWorkstation = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>().eq(DownWorkstation::getFlowCardId, item.getFlowCardId()));
- String endcell = String.valueOf(downWorkstation.getWorkstationId());
- // 鍑哄埌 G06
- DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(item, "9", endcell, "2");
- downGlassTaskService.insertCacheTask(downGlassTask);
- // S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 2);
-
-
- return true;
- // 鎸夌収鐗堝浘id鍜岀墖搴忕鍚堝悗绔嚭鐗�
- } else if (!list2.isEmpty()) {
- log.info("鍚庣鍑虹墖");
- DownStorageCageDetails item2 = list2.get(0);
- DownWorkstation downWorkstation = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>().eq(DownWorkstation::getFlowCardId, item2.getFlowCardId()));
- String endcell = String.valueOf(downWorkstation.getWorkstationId());
- // 鍑哄埌 G11
- DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(item2, "9", endcell, "2");
- downGlassTaskService.insertCacheTask(downGlassTask);
- // S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 2);
- return true;
+ selectedItem = list4to6.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) {
+ DownWorkstation downWorkstation = downWorkstationService.getOne(
+ new LambdaQueryWrapper<DownWorkstation>()
+ .eq(DownWorkstation::getFlowCardId, selectedItem.getFlowCardId())
+ );
+ endCell = String.valueOf(downWorkstation.getWorkstationId());
+ if (endCell.isEmpty()) {
+ endCell = "7";
+ }
+ DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(selectedItem, "9", endCell, "2");
+ downGlassTaskService.insertCacheTask(downGlassTask);
+ LambdaQueryWrapper<DownStorageCageDetails> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(DownStorageCageDetails::getGlassId, selectedItem.getGlassId());
+ DownStorageCageDetails updateDetail = new DownStorageCageDetails();
+ updateDetail.setState(Const.GLASS_STATE_OUT);
+ downStorageCageDetailsService.update(updateDetail, wrapper);
+ log.info("鏇存柊鍑虹墖鐜荤拑鐨勭姸鎬佷负{}", Const.GLASS_STATE_OUT);
+ // S7object.getinstance().plccontrol.WriteWord(MESSendingWord, (short) 2);
+
+ return true;
+ }
// 杩斿洖缁撴灉
return false;
@@ -291,6 +286,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);
sequence++; // 閫掑椤哄簭瀛楁鍊�
--
Gitblit v1.8.0