From fc634e5b62b85396196e2dd8f51bfe5ba7337522 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 21 四月 2026 15:02:14 +0800
Subject: [PATCH] 站点优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 72 ++++++++++++++++-------------------
1 files changed, 33 insertions(+), 39 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
index 8765df6..69493ea 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
@@ -16,7 +16,6 @@
import org.apache.commons.lang3.StringUtils;
-import javax.swing.*;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -97,14 +96,12 @@
public static List<LocItem> getEfficiencyFirstItemList(String matnrCode, String splrBatch, Double anfme) {
LambdaQueryWrapper<LocItem> locItemQueryWrapper = new LambdaQueryWrapper<>();
locItemQueryWrapper.eq(LocItem::getMatnrCode, matnrCode);
- locItemQueryWrapper.eq(StringUtils.isNotBlank(splrBatch), LocItem::getBatch, splrBatch);
- String applySql = String.format(
- "EXISTS (SELECT 1 FROM man_loc ml " +
- "WHERE ml.use_status = '%s'" +
- "AND ml.id = man_loc_item.loc_id " +
- ")",
- LocStsType.LOC_STS_TYPE_F.type
- );
+ // 鏈夋壒娆℃椂锛氬尮閰嶅簱浣嶆壒娆�=璁㈠崟鎵规 鎴� 搴撲綅鎵规涓虹┖锛堟棤鎵规搴撳瓨鍙弬涓庡垎閰嶏紝閬垮厤璇垽搴撳瓨涓嶈冻锛�
+ if (StringUtils.isNotBlank(splrBatch)) {
+ locItemQueryWrapper.and(w -> w.eq(LocItem::getBatch, splrBatch).or().isNull(LocItem::getBatch));
+ }
+ // 鍚� F.鍦ㄥ簱 涓� R.鍑哄簱棰勭害锛堟嫞鏂欏嚭搴撴湭纭鍓嶅彲鍐嶄笅鍙戯紝浣跨敤鍓╀綑鍙敤锛� 鈥淟ocStsType.LOC_STS_TYPE_R.type鐢ㄤ簬鍑哄簱鎷ｆ枡杩囩▼涓拷鍔犵浉鍚岀墿鏂欏嚭搴撳崟鈥�
+ String applySql = "EXISTS (SELECT 1 FROM man_loc ml WHERE ml.use_status IN ('" + LocStsType.LOC_STS_TYPE_F.type + "','" + LocStsType.LOC_STS_TYPE_R.type + "') AND ml.id = man_loc_item.loc_id AND ml.deleted = 0)";
locItemQueryWrapper.apply(applySql);
LocItemService locItemService = SpringUtils.getBean(LocItemService.class);
List<LocItem> locItems = locItemService.list(locItemQueryWrapper);
@@ -128,16 +125,19 @@
public static List<LocItem> getFirstInFirstOutItemList(String matnrCode, String splrBatch, Double anfme) {
LambdaQueryWrapper<LocItem> locItemQueryWrapper = new LambdaQueryWrapper<>();
locItemQueryWrapper.eq(LocItem::getMatnrCode, matnrCode);
- locItemQueryWrapper.eq(StringUtils.isNotEmpty(splrBatch), LocItem::getBatch, splrBatch);
- locItemQueryWrapper.orderByAsc(LocItem::getCreateTime);
- String applySql = String.format(
- "EXISTS (SELECT 1 FROM man_loc ml " +
- "WHERE ml.use_status = '%s'" +
- "AND ml.id = man_loc_item.loc_id " +
- ")",
- LocStsType.LOC_STS_TYPE_F.type
- );
- locItemQueryWrapper.apply(applySql);
+ // 鏈夋壒娆℃椂锛氬尮閰嶅簱浣嶆壒娆�=璁㈠崟鎵规 鎴� 搴撲綅鎵规涓虹┖锛堟棤鎵规搴撳瓨鍙弬涓庡垎閰嶏紝閬垮厤璇垽搴撳瓨涓嶈冻锛�
+ if (StringUtils.isNotBlank(splrBatch)) {
+ locItemQueryWrapper.and(w -> w.eq(LocItem::getBatch, splrBatch).or().isNull(LocItem::getBatch));
+ }
+ //濡傛灉鎵规涓嶄负绌猴紝鎸夋壒娆″厛鍚庡嚭搴�
+ if (StringUtils.isNotBlank(splrBatch)) {
+ locItemQueryWrapper.orderByAsc(LocItem::getBatch);
+ } else {
+ locItemQueryWrapper.orderByAsc(LocItem::getCreateTime);
+ }
+ // 鍚� F.鍦ㄥ簱 涓� R.鍑哄簱棰勭害锛堟嫞鏂欏嚭搴撴湭纭鍓嶅彲鍐嶄笅鍙戯紝浣跨敤鍓╀綑鍙敤锛� 鈥淟ocStsType.LOC_STS_TYPE_R.type鐢ㄤ簬鍑哄簱鎷ｆ枡杩囩▼涓拷鍔犵浉鍚岀墿鏂欏嚭搴撳崟鈥�
+ String applySqlR = "EXISTS (SELECT 1 FROM man_loc ml WHERE ml.use_status IN ('" + LocStsType.LOC_STS_TYPE_F.type + "','" + LocStsType.LOC_STS_TYPE_R.type + "') AND ml.id = man_loc_item.loc_id AND ml.deleted = 0)";
+ locItemQueryWrapper.apply(applySqlR);
LocItemService locItemService = SpringUtils.getBean(LocItemService.class);
List<LocItem> locItems = locItemService.list(locItemQueryWrapper);
return locItems;
@@ -156,8 +156,6 @@
DeviceSiteService deviceSiteService = SpringUtils.getBean(DeviceSiteService.class);
List<OrderOutItemDto> list = new ArrayList<>();
- //涓嶈绔欑偣閲嶅浣跨敤闂
- List<BasStation> stations = new ArrayList<>();
List<ExistDto> existDtos = new ArrayList<>();
Set<Loc> locs = new HashSet<>();
for (WaveToLocParams item : params) {
@@ -207,31 +205,27 @@
maps.add(staListDto);
}
orderOutItemDto.setStaNos(maps);
- //鑾峰彇婊¤冻鏉′欢绔欑偣
+ // 鎸夊彲鍑鸿鍒欓�夋嫨绔欑偣
Set<String> stationSet = deviceSites.stream().map(DeviceSite::getSite).collect(Collectors.toSet());
- String sType = "H";
- //鑾峰彇楂樹綆绔欑偣绫诲瀷
- if (startsWithTwoChars(loc.getBarcode(), "31")) {
- sType = "L";
- }
- //宸蹭娇鐢ㄧ珯鐐�
- Set<String> stas = stations.stream().map(BasStation::getStationName).collect(Collectors.toSet());
BasStationService basStationService = SpringUtils.getBean(BasStationService.class);
- BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
- .eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+ List<BasStation> candidateStations = basStationService.list(new LambdaQueryWrapper<BasStation>()
.in(BasStation::getStationName, stationSet)
- .eq(BasStation::getSType, sType)
- .notIn(!stas.isEmpty(), BasStation::getStationName, stas)
- .last("LIMIT 1"));
- stations.add(basStation);
-
- if (Objects.isNull(basStation)) {
- throw new CoolException("绔欓粸涓嶅瓨鍦紒锛�");
+ .eq(BasStation::getStatus, 1)
+ .eq(BasStation::getOutAble, 1));
+ if (candidateStations.isEmpty()) {
+ throw new CoolException("鏃犲彲鍑虹珯鐐癸紝璇锋鏌ョ珯鐐圭姸鎬佹垨鑳藉嚭閰嶇疆锛侊紒");
}
+ candidateStations.sort((a, b) -> {
+ boolean a1001 = "1001".equals(a.getStationName());
+ boolean b1001 = "1001".equals(b.getStationName());
+ if (a1001 && !b1001) return -1;
+ if (!a1001 && b1001) return 1;
+ return 0;
+ });
+ BasStation basStation = candidateStations.get(0);
orderOutItemDto.setSitesNo(basStation.getStationName());
}
}
-
list.add(orderOutItemDto);
--
Gitblit v1.9.1