From b646e9087e2e4dd701731cf8b6d3aa12ce64da28 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 10 二月 2026 15:02:12 +0800
Subject: [PATCH] 空库位校验null防错
---
rsf-admin/src/i18n/core/chineseMessages.js | 4 ++--
rsf-admin/src/i18n/zh.js | 4 ++--
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/i18n/core/chineseMessages.js b/rsf-admin/src/i18n/core/chineseMessages.js
index d49627d..46592b2 100644
--- a/rsf-admin/src/i18n/core/chineseMessages.js
+++ b/rsf-admin/src/i18n/core/chineseMessages.js
@@ -117,9 +117,9 @@
page_out_of_boundaries: "椤电爜 %{page} 瓒呭嚭鑼冨洿",
page_out_from_end: "鏃犳硶璺宠浆鍒版渶鍚庝竴椤典箣鍚�",
page_out_from_begin: "鏃犳硶璺宠浆鍒扮1椤典箣鍓�",
- page_range_info: "绗� %{from}-%{to} 鏉★紝鍏� %{count} 鏉�",
+ page_range_info: "绗� %{offsetBegin}-%{offsetEnd} 鏉★紝鍏� %{total} 鏉�",
partial_page_range_info:
- "绗� %{from}-%{to} 鏉★紝瓒呰繃 %{to} 鏉�",
+ "绗� %{offsetBegin}-%{offsetEnd} 鏉★紝瓒呰繃 %{offsetEnd} 鏉�",
current_page: "绗� %{page} 椤�",
page: "璺宠浆鍒扮 %{page} 椤�",
first: "璺宠浆鍒扮涓�椤�",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 3cc1bb0..9631af5 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -1423,8 +1423,8 @@
page_out_of_boundaries: '椤电爜 %{page} 瓒呭嚭鑼冨洿',
page_out_from_end: '鏃犳硶璺宠浆鍒版渶鍚庝竴椤典箣鍚�',
page_out_from_begin: '鏃犳硶璺宠浆鍒扮1椤典箣鍓�',
- page_range_info: '绗� %{from}-%{to} 鏉★紝鍏� %{count} 鏉�',
- partial_page_range_info: '绗� %{from}-%{to} 鏉★紝瓒呰繃 %{to} 鏉�',
+ page_range_info: '绗� %{offsetBegin}-%{offsetEnd} 鏉★紝鍏� %{total} 鏉�',
+ partial_page_range_info: '绗� %{offsetBegin}-%{offsetEnd} 鏉★紝瓒呰繃 %{offsetEnd} 鏉�',
current_page: '绗� %{page} 椤�',
page: '璺宠浆鍒扮 %{page} 椤�',
first: '璺宠浆鍒扮涓�椤�',
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index 937a3bb..4379309 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -1057,7 +1057,7 @@
String shallowLocNo = LocUtils.getShallowLoc(loc1.getCode());
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
Loc shallowLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLocNo));
- if (shallowLoc != null && shallowLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ if (shallowLoc != null && Objects.equals(shallowLoc.getUseStatus(), LocStsType.LOC_STS_TYPE_O.type)) {
if (LocUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
loc = shallowLoc;
channel = shallowLoc.getChannel();
@@ -1240,7 +1240,7 @@
loc = null;
}
// 閫掑綊鏌ヨ
- if (Cools.isEmpty(loc) || !loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ if (Cools.isEmpty(loc) || !Objects.equals(loc.getUseStatus(), LocStsType.LOC_STS_TYPE_O.type)) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
if (times < rowCount * 2) {
times = times + 1;
@@ -1306,7 +1306,7 @@
inTaskMsgDto.setStaNo(deviceSite.getDeviceSite());
}
// 閫掑綊鏌ヨ
- if (Cools.isEmpty(loc) || !loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ if (Cools.isEmpty(loc) || !Objects.equals(loc.getUseStatus(), LocStsType.LOC_STS_TYPE_O.type)) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
if (times < 5) {
times = times + 1;
--
Gitblit v1.9.1