Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
smf-core
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit c09349eb
由
zshaohui
编写于
2025-05-08 09:38:51 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
1.没有可用库位提示语进行修改
1 个父辈
9d8a8a35
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
13 行增加
和
9 行删除
src/main/java/com/neotel/smfcore/core/system/util/TaskService.java
src/main/resources/messages.properties
src/main/resources/messages_de_DE.properties
src/main/resources/messages_en_US.properties
src/main/resources/messages_fr_FR.properties
src/main/resources/messages_ja_JP.properties
src/main/resources/messages_zh_CN.properties
src/main/resources/messages_zh_TW.properties
src/main/java/com/neotel/smfcore/core/system/util/TaskService.java
查看文件 @
c09349e
...
...
@@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Service
;
import
java.util.*
;
import
java.util.stream.Collectors
;
/**
* Created by sunke on 2021/7/13.
...
...
@@ -786,7 +787,8 @@ public class TaskService {
}
if
(
availbleStorageList
.
isEmpty
())
{
throw
new
ValidateException
(
"smfcore.noValidStorage"
,
"料仓列表中未找到可用的料仓"
);
String
storageNames
=
storageList
.
stream
().
map
(
Storage:
:
getName
).
collect
(
Collectors
.
joining
(
","
));
throw
new
ValidateException
(
"smfcore.noValidStorage"
,
"料仓{0}中未找到可用的[{1}x{2}]库位"
,
new
String
[]{
storageNames
,
barcode
.
getPlateSize
()+
""
,
barcode
.
getHeight
()+
""
});
}
availbleStorageList
.
sort
(
new
Comparator
<
Storage
>()
{
...
...
@@ -903,7 +905,9 @@ public class TaskService {
}
if
(
availbleStorageList
.
isEmpty
())
{
throw
new
ValidateException
(
"smfcore.noValidStorage"
,
"料仓列表中未找到可用的料仓"
);
String
storageNames
=
storageList
.
stream
().
map
(
Storage:
:
getName
).
collect
(
Collectors
.
joining
(
","
));
throw
new
ValidateException
(
"smfcore.noValidStorage"
,
"料仓{0}中未找到可用的[{1}x{2}]库位"
,
new
String
[]{
storageNames
,
barcode
.
getPlateSize
()+
""
,
barcode
.
getHeight
()+
""
});
}
availbleStorageList
.
sort
(
new
Comparator
<
Storage
>()
{
...
...
src/main/resources/messages.properties
查看文件 @
c09349e
...
...
@@ -79,7 +79,7 @@ smfcore.user=\u7528\u6237\u7BA1\u7406
smfcore.peoples
=
\u
8D26
\u
53F7
\u
7BA1
\u7406
smfcore.role
=
\u
89D2
\u8272\u
7BA1
\u7406
smfcore.menuNotExist
=
\u
83DC
\u5355
{0}
\u
4E0D
\u
5B58
\u5728
smfcore.noValidStorage
=
\u6599\u
4ED3
\u5217\u8868\u
4E2D
\u
672A
\u
627E
\u5230\u
53EF
\u7528\u7684\u6599\u
4ED3
smfcore.noValidStorage
=
\u6599\u
4ED3
{0}
\u
4E2D
\u
672A
\u
627E
\u5230\u
53EF
\u7528\u7684
[{1}x{2}]
\u
5E93
\u
4F4D
smfcore.error.barcode.exist
=
[{0}}]
\u
5DF2
\u5728
{1}}[{2}}]
\u
4E2D
smfcore.barcodeSetting
=
\u6761\u7801\u
8BBE
\u
7F6E
smfcore.posNotExist
=
\u
4ED3
\u
4F4D
\u
4E0D
\u
5B58
\u5728
...
...
src/main/resources/messages_de_DE.properties
查看文件 @
c09349e
...
...
@@ -79,7 +79,7 @@ smfcore.user=Benutzerverwaltung
smfcore.peoples
=
Kontoverwaltung
smfcore.role
=
Rollenverwaltung
smfcore.menuNotExist
=
Men
\u
00FC{0} existiert nicht
smfcore.noValidStorage
=
Kein verf
\u
00FCgbare
s Lagerhaus in der Lagerhausliste
gefunden
smfcore.noValidStorage
=
Kein verf
\u
00FCgbare
r [{1}x{2}] Lagerplatz im Silo {0}
gefunden
smfcore.error.barcode.exist
=
[{0}}] ist bereits in {1}}[{2}}] vorhanden
smfcore.barcodeSetting
=
Barcodeeinstellungen
smfcore.posNotExist
=
Lagerplatz existiert nicht
...
...
src/main/resources/messages_en_US.properties
查看文件 @
c09349e
...
...
@@ -80,7 +80,7 @@ smfcore.user=Users
smfcore.peoples
=
Account Management
smfcore.role
=
Authority
smfcore.menuNotExist
=
Menu{0} does not exist
smfcore.noValidStorage
=
No available
bin found in bin list
smfcore.noValidStorage
=
No available
[{1}x{2}] storage location found in silo {0}
smfcore.error.barcode.exist
=
[{0}}] is already in {1}}[{2}}]
smfcore.barcodeSetting
=
MA.ID Setting
smfcore.posNotExist
=
Positions do not exist
...
...
src/main/resources/messages_fr_FR.properties
查看文件 @
c09349e
...
...
@@ -79,7 +79,7 @@ smfcore.user=Gestion des utilisateurs
smfcore.peoples
=
Gestion de compte
smfcore.role
=
Gestion des r
\u
00F4les
smfcore.menuNotExist
=
Le menu {0} n'existe pas
smfcore.noValidStorage
=
Aucun
silo disponible trouv
\u
00E9 dans la liste des silos
smfcore.noValidStorage
=
Aucun
emplacement de stockage [{1}x{2}] disponible trouv
\u
00E9 dans le silo {0}
smfcore.error.barcode.exist
=
[{0}}] est d
\u
00E9j
\u
00E0 dans {1}}[{2}}]
smfcore.barcodeSetting
=
Param
\u
00E8tres des codes-barres
smfcore.posNotExist
=
L'emplacement n'existe pas
...
...
src/main/resources/messages_ja_JP.properties
查看文件 @
c09349e
...
...
@@ -77,7 +77,7 @@ smfcore.user=\u30E6\u30FC\u30B6\u30FC\u7BA1\u7406
smfcore.peoples
=
\u
30A2
\u
30AB
\u
30A6
\u
30F3
\u
30C8
\u
7BA1
\u7406
smfcore.role
=
\u
5F79
\u5272\u
7BA1
\u7406
smfcore.menuNotExist
=
\u
30E1
\u
30CB
\u
30E5
\u
30FC{0}
\u
304C
\u
5B58
\u5728\u3057\u
306A
\u3044
smfcore.noValidStorage
=
\u
30
D3
\u
30F3
\u
30EA
\u
30B9
\u
30C8
\u
306B
\u5229\u7528\u
53EF
\u
80FD
\u
306A
\u
30D3
\u
30F3
\u
304C
\u
898B
\u3064\u
304B
\u3089\u
306A
\u3044
smfcore.noValidStorage
=
\u
30
B5
\u
30A4
\u
30ED{0}
\u5185\u
306B
\u6709\u
52B9
\u
306A[{1}x{2}]
\u
30B9
\u
30C8
\u
30EC
\u
30FC
\u
30B8
\u
30ED
\u
30B1
\u
30FC
\u
30B7
\u
30E7
\u
30F3
\u
304C
\u
898B
\u3064\u
304B
\u
308A
\u
307E
\u
305B
\u3093
smfcore.error.barcode.exist
=
[0}}]
\u
306F
\u3059\u3067\u
306B{1}[{2}}
\u
306B
\u5165\u3063\u3066\u3044\u
307E
\u3059\u3002
smfcore.barcodeSetting
=
\u
30D0
\u
30FC
\u
30B3
\u
30FC
\u
30C9
\u
8A2D
\u
5B9A
smfcore.posNotExist
=
\u
30E9
\u
30A4
\u
30D6
\u
30E9
\u
30EA
\u
30FC
\u
30B9
\u
30DA
\u
30FC
\u
30B9
\u
304C
\u
5B58
\u5728\u3057\u
306A
\u3044
...
...
src/main/resources/messages_zh_CN.properties
查看文件 @
c09349e
...
...
@@ -79,7 +79,7 @@ smfcore.user=\u7528\u6237\u7BA1\u7406
smfcore.peoples
=
\u
8D26
\u
53F7
\u
7BA1
\u7406
smfcore.role
=
\u
89D2
\u8272\u
7BA1
\u7406
smfcore.menuNotExist
=
\u
83DC
\u5355
{0}
\u
4E0D
\u
5B58
\u5728
smfcore.noValidStorage
=
\u6599\u
4ED3
\u5217\u8868\u
4E2D
\u
672A
\u
627E
\u5230\u
53EF
\u7528\u7684\u6599\u
4ED3
smfcore.noValidStorage
=
\u6599\u
4ED3
{0}
\u
4E2D
\u
672A
\u
627E
\u5230\u
53EF
\u7528\u7684
[{1}x{2}]
\u
5E93
\u
4F4D
smfcore.error.barcode.exist
=
[{0}}]
\u
5DF2
\u5728
{1}}[{2}}]
\u
4E2D
smfcore.barcodeSetting
=
\u6761\u7801\u
8BBE
\u
7F6E
smfcore.posNotExist
=
\u
4ED3
\u
4F4D
\u
4E0D
\u
5B58
\u5728
...
...
src/main/resources/messages_zh_TW.properties
查看文件 @
c09349e
...
...
@@ -78,7 +78,7 @@ smfcore.user=\u7528\u6236\u7BA1\u7406
smfcore.peoples
=
\u
8CEC
\u
865F
\u
7BA1
\u7406
smfcore.role
=
\u
89D2
\u8272\u
7BA1
\u7406
smfcore.menuNotExist
=
\u
83DC
\u
55AE{0}
\u
4E0D
\u
5B58
\u5728
smfcore.noValidStorage
=
\u6599\u5009
\u5217\u8868\u
4E2D
\u
672A
\u
627E
\u5230\u
53EF
\u7528\u7684\u6599\u5009
smfcore.noValidStorage
=
\u6599\u5009
{0}
\u
4E2D
\u
672A
\u
627E
\u5230\u
53EF
\u7528\u7684
[{1}x{2}]
\u5132\u
4F4D
smfcore.error.barcode.exist
=
[{0}}]
\u
5DF2
\u5728
{1}}[{2}}]
\u
4E2D
smfcore.barcodeSetting
=
\u
689D
\u
78BC
\u
8A2D
\u
7F6E
smfcore.posNotExist
=
\u
5EAB
\u
4F4D
\u
4E0D
\u
5B58
\u5728
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论