From cd1c1a4aa2c570cc168769b13da0adf9655101a5 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 18 六月 2024 17:04:39 +0800
Subject: [PATCH] 更新出片查询方法
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 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..0e10fb2 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
@@ -203,8 +203,8 @@
private Boolean outTo(String MESSendingWord) {
log.info("鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勬枡鏋跺彿 鏌ヨ绗﹀悎鎸夌収鐗堝浘id鍜岀墖搴忓嚭鐗�,骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖");
- List<DownStorageCageDetails> list1to3 = downStorageCageDetailsService.CacheOut1(1, 3);
- List<DownStorageCageDetails> list4to6 = 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);
DownStorageCageDetails selectedItem = null;
@@ -217,24 +217,24 @@
if (item3.getHeight() >= 2500 && item3.getWidth() >= 2660) {
log.info("浜哄伐澶勭悊");
selectedItem = item3;
- endCell = "7";
- } else if (!list4to6.isEmpty() && !list1to6.isEmpty()) {
+
+ } else if (!!list1to6.isEmpty()) {
log.info("鍓嶅悗绔兘绌洪棽 浼樺厛鍚庣鍑虹墖骞朵笖浼樺厛婊℃灦");
- selectedItem = list4to6.get(0);
+ 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 +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);
+// 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