From b6f1e646ac5005b4f4bad7c1eec706c96f2eaca7 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 05 八月 2025 14:39:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/GhjtHandler.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java b/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
index 68735f9..102a14e 100644
--- a/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
@@ -24,6 +24,7 @@
import javax.annotation.Resource;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -101,6 +102,7 @@
.setPath(MesConstant.GWCS_DCKK_URL)
.setHeaders(headers)
.setJson(body)
+ .setTimeout(30, TimeUnit.SECONDS) // 璁剧疆杩炴帴 + 璇诲彇瓒呮椂涓�30绉�
.build()
.doPost();
if (!Cools.isEmpty(response)) {
@@ -212,7 +214,7 @@
String staLocNo = null;
Integer wrkCount = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", i));
if(wrkCount > 0) {
- log.warn("{}鍙峰爢鍨涙満宸插瓨鍦ㄤ换鍔�",i);
+// log.warn("{}鍙峰爢鍨涙満宸插瓨鍦ㄤ换鍔�",i);
continue;
}
// 鏍规嵁鍫嗗灈鏈哄彿鏌ヨ鍒板搴旂殑娣卞簱浣嶅拰娴呭簱浣� 娣卞簱浣�4*n-3鍜�4*n 娴呭簱浣�4*n-2鍜�4*n-1
@@ -241,16 +243,16 @@
}
// 娌℃湁鎵惧埌婧愬簱浣�
if (sourceLocNo == null) {
- log.warn("娌℃湁鎵惧埌婧愬簱浣�,鍫嗗灈鏈猴細{}",i);
+// log.warn("娌℃湁鎵惧埌婧愬簱浣�,鍫嗗灈鏈猴細{}",i);
continue;
}
// 瀵绘壘涓�涓璐х殑鐩爣搴撲綅锛屽厛娣卞悗娴�
List<LocMast> locMasts1 = locMastMapper.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", i).in("row1", s1, s2)
- .le("bay1", columnNum));
+ .le("bay1", columnNum).orderBy("lev1,bay1,row1"));
if (locMasts1.isEmpty()) {
// 娣卞簱浣嶄负绌轰簡锛屽彇娴呭簱浣�
List<LocMast> locMasts2 = locMastMapper.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", i).in("row1", q1, q2)
- .le("bay1", columnNum));
+ .le("bay1", columnNum).orderBy("lev1,bay1,row1"));
if (!locMasts2.isEmpty()) {
staLocNo = locMasts2.get(0).getLocNo();
}
@@ -396,6 +398,16 @@
// 瀵绘壘涓�绠变竴鍗风殑锛屾病鏈夌悊璐х殑锛屼笉鍦ㄥ璐у尯鐨勭墿鏂欐槑缁�
List<LocDetl> tallyGoosList = locDetlMapper.selectTallyGoosList(columnNum);
+ // 杩囨护鎺夋湪绠辫鏍煎搴﹀ぇ浜�600鐨�(澶т簬600涓�涓墭鐩樺彧鑳芥斁涓�绠�)
+ tallyGoosList = tallyGoosList.stream().filter(locDetl -> {
+ String[] split = locDetl.getColor().split("\\*");
+ if (split.length == 3) { // 楂樺害涔熻浣庝簬614鎵嶈兘鐞嗚揣
+ return Integer.parseInt(split[1]) <= 600 && Integer.parseInt(split[2]) <= 614;
+ } else {
+ return false;
+ }
+ }).collect(Collectors.toList());
+
// 瀵绘壘婊¤冻鐞嗚揣鏉′欢鐨勪袱涓湪绠�
LocDetl leftLocDetl = null;
LocDetl rightLocDetl = null;
--
Gitblit v1.9.1