From 05ecec68b2214720730a4c5a7bdf5c9dd1b74313 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 十一月 2025 08:31:53 +0800
Subject: [PATCH] 出库站点区分高低库位优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java | 3 +++
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 21 +++++++++++++++++++++
2 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
index 6481ea9..93b52a2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
@@ -61,6 +61,9 @@
@ApiModelProperty(value= "鍙嚭")
private Integer outAble = 0;
+ @ApiModelProperty("绔欑偣绫诲瀷 H:楂橈紝 L锛氫綆")
+ private String sType = "H";
+
/**
* 鐘舵��
*/
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 f16250a..8765df6 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
@@ -209,12 +209,18 @@
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)
.in(BasStation::getStationName, stationSet)
+ .eq(BasStation::getSType, sType)
.notIn(!stas.isEmpty(), BasStation::getStationName, stas)
.last("LIMIT 1"));
stations.add(basStation);
@@ -252,4 +258,19 @@
return list;
}
+ /**
+ * 妫�鏌ュ瓧绗︿覆鍓嶄袱涓瓧绗︽槸鍚﹀寘鍚寚瀹氬唴瀹�
+ *
+ * @param str 瑕佹鏌ョ殑瀛楃涓�
+ * @param target 鐩爣瀛楃涓诧紙闀垮害搴斾负2锛�
+ * @return 鏄惁鍖呭惈
+ */
+ public static boolean startsWithTwoChars(String str, String target) {
+ if (str == null || target == null || target.length() != 2) {
+ return false;
+ }
+ return str.length() >= 2 && str.substring(0, 2).equals(target);
+ }
+
+
}
--
Gitblit v1.9.1