Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
smf-core
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 1ea87e8f
由
LN
编写于
2023-05-17 15:30:23 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
上传库位时若库位号已在其他料仓存在,不新增库位。
1 个父辈
e18aad70
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
36 行增加
和
4 行删除
src/main/java/com/neotel/smfcore/core/storage/rest/StorageController.java
src/main/java/com/neotel/smfcore/core/storage/service/manager/IStoragePosManager.java
src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StoragePosManagerImpl.java
src/main/resources/messages.properties
src/main/resources/messages_en_US.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/storage/rest/StorageController.java
查看文件 @
1ea87e8
...
...
@@ -548,6 +548,21 @@ public class StorageController {
}
}
if
(
newList
.
size
()>
0
){
//判断库位号是否在其他料仓存在
List
<
String
>
list
=
new
ArrayList
<>();
newList
.
forEach
(
pos
->
list
.
add
(
pos
.
getPosName
()));
List
<
StoragePos
>
existPoss
=
storagePosManager
.
findExistPosList
(
storage
.
getId
(),
list
);
if
(
existPoss
.
size
()
>
0
)
{
String
msg
=
"读取到["
+
row
+
"]行数据:新增【"
+
newRowCount
+
"】失败,已存在【"
+
existRowCount
+
"】,更新【"
+
updateRowCount
+
"】"
;
log
.
info
(
msg
);
List
<
String
>
existPosName
=
new
ArrayList
<>();
existPoss
.
forEach
(
pos
->
existPosName
.
add
(
pos
.
getPosName
()));
log
.
error
(
"为["
+
storage
.
getName
()+
"]导入库位时,库位号【"
+
String
.
join
(
","
,
existPosName
)+
"】已在其他料仓存在,不新增库位"
);
throw
new
ValidateException
(
"smfcore.storage.error.posNameExist"
,
"库位号已存在{0}"
,
new
String
[]{
String
.
join
(
","
,
existPosName
)});
}
storagePosManager
.
insertAll
(
newList
);
}
dataCache
.
reloadStorage
(
storage
,
""
);
...
...
src/main/java/com/neotel/smfcore/core/storage/service/manager/IStoragePosManager.java
查看文件 @
1ea87e8
...
...
@@ -85,4 +85,6 @@ public interface IStoragePosManager extends IBaseManager<StoragePos> {
StoragePos
findMpnInStorages
(
List
<
String
>
availableStorageIds
,
String
mpn
,
Collection
<
String
>
excludePosIds
,
CHECKOUT_TYPE
checkoutType
,
Map
<
String
,
String
>
appendData
);
List
<
StoragePos
>
findExpiredOrSluggishBarcode
(
Date
date
,
int
type
);
List
<
StoragePos
>
findExistPosList
(
String
id
,
List
<
String
>
list
);
}
src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StoragePosManagerImpl.java
查看文件 @
1ea87e8
...
...
@@ -803,4 +803,14 @@ public class StoragePosManagerImpl implements IStoragePosManager {
}
return
storagePosDao
.
findByQuery
(
q
.
addCriteria
(
c
));
}
@Override
public
List
<
StoragePos
>
findExistPosList
(
String
storageId
,
List
<
String
>
posNames
)
{
if
(
posNames
==
null
||
posNames
.
isEmpty
()){
return
Lists
.
newArrayList
();
}
Criteria
c
=
Criteria
.
where
(
"storageId"
).
ne
(
storageId
)
.
and
(
"posName"
).
in
(
posNames
);
Query
q
=
new
Query
(
c
);
return
storagePosDao
.
findByQuery
(
q
);
}
}
src/main/resources/messages.properties
查看文件 @
1ea87e8
...
...
@@ -351,6 +351,7 @@ smfcore.mesApi.inCheck.error=MES\u9A8C\u8BC1\u51FA\u9519\uFF1A{0}
smfcore.mesApi.loginCheck.fail
=
MES
\u
767B
\u9646\u
9A8C
\u
8BC1
\u5931\u
8D25
smfcore.mesApi.loginCheck.error
=
MES
\u
767B
\u9646\u
9A8C
\u
8BC1
\u9519\u
8BEF
\u
FF1A{0}
smfcore.lockMaterials
=
\u9501\u
5B9A
\u7269\u6599
smfcore.storage.error.posNameExist
=
\u
5E93
\u
4F4D
\u
53F7
\u
5DF2
\u5728\u5176\u
4ED6
\u6599\u
4ED3
\u
5B58
\u5728\u
FF1A{0}
#smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{0}
#smfclient.nlp.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1}
#smfclient.nlp.inputOk={0}\u5165\u5E93\u5230{1}\u6210\u529F
...
...
src/main/resources/messages_en_US.properties
查看文件 @
1ea87e8
...
...
@@ -349,4 +349,5 @@ smfcore.selfAudit.noPos=Self Audit{0}No depot number found
smfcore.mesApi.inCheck.error
=
MES verification error
\u
FF1A{0}
smfcore.mesApi.loginCheck.fail
=
MES Login fail
smfcore.mesApi.loginCheck.error
=
MES Login error
\u
FF1A{0}
smfcore.lockMaterials
=
Locking Materials
\ No newline at end of file
smfcore.lockMaterials
=
Locking Materials
smfcore.storage.error.posNameExist
=
Bin number already exists in other bins
\u
FF1A{0}
\ No newline at end of file
src/main/resources/messages_ja_JP.properties
查看文件 @
1ea87e8
...
...
@@ -346,4 +346,5 @@ smfcore.selfAudit.noPos=\u76D8\u70B9{0}\u672A\u627E\u5230\u5E93\u4F4D\u53F7
smfcore.mesApi.inCheck.error
=
MES
\u
9A8C
\u
8BC1
\u
51FA
\u9519\u
FF1A{0}
smfcore.mesApi.loginCheck.fail
=
MES
\u
767B
\u9646\u
9A8C
\u
8BC1
\u5931\u
8D25
smfcore.mesApi.loginCheck.error
=
MES
\u
767B
\u9646\u
9A8C
\u
8BC1
\u9519\u
8BEF
\u
FF1A{0}
smfcore.lockMaterials
=
\u9501\u
5B9A
\u7269\u6599
\ No newline at end of file
smfcore.lockMaterials
=
\u9501\u
5B9A
\u7269\u6599
smfcore.storage.error.posNameExist
=
\u
5E93
\u
4F4D
\u
53F7
\u
5DF2
\u5728\u5176\u
4ED6
\u6599\u
4ED3
\u
5B58
\u5728\u
FF1A{0}
\ No newline at end of file
src/main/resources/messages_zh_CN.properties
查看文件 @
1ea87e8
...
...
@@ -346,4 +346,5 @@ smfcore.selfAudit.noPos=\u76D8\u70B9{0}\u672A\u627E\u5230\u5E93\u4F4D\u53F7
smfcore.mesApi.inCheck.error
=
MES
\u
9A8C
\u
8BC1
\u
51FA
\u9519\u
FF1A{0}
smfcore.mesApi.loginCheck.fail
=
MES
\u
767B
\u9646\u
9A8C
\u
8BC1
\u5931\u
8D25
smfcore.mesApi.loginCheck.error
=
MES
\u
767B
\u9646\u
9A8C
\u
8BC1
\u9519\u
8BEF
\u
FF1A{0}
smfcore.lockMaterials
=
\u9501\u
5B9A
\u7269\u6599
\ No newline at end of file
smfcore.lockMaterials
=
\u9501\u
5B9A
\u7269\u6599
smfcore.storage.error.posNameExist
=
\u
5E93
\u
4F4D
\u
53F7
\u
5DF2
\u5728\u5176\u
4ED6
\u6599\u
4ED3
\u
5B58
\u5728\u
FF1A{0}
\ No newline at end of file
src/main/resources/messages_zh_TW.properties
查看文件 @
1ea87e8
...
...
@@ -347,4 +347,5 @@ smfcore.selfAudit.noPos=\u76E4\u9EDE{0}\u672A\u627E\u5230\u5EAB\u4F4D\u865F
smfcore.mesApi.inCheck.error
=
MES
\u
9A57
\u
8B49
\u
51FA
\u
932F
\u
FF1A{0}
smfcore.mesApi.loginCheck.fail
=
MES
\u
767B
\u9678\u
9A57
\u
8B49
\u5931\u6557
smfcore.mesApi.loginCheck.error
=
MES
\u
767B
\u9678\u
9A57
\u
8B49
\u
932F
\u
8AA4
\u
FF1A{0}
smfcore.lockMaterials
=
\u9396\u
5B9A
\u7269\u6599
\ No newline at end of file
smfcore.lockMaterials
=
\u9396\u
5B9A
\u7269\u6599
smfcore.storage.error.posNameExist
=
\u
5EAB
\u
4F4D
\u
865F
\u
5DF2
\u5728\u5176\u
4ED6
\u6599\u5009\u
5B58
\u5728\u
FF1A{0}
\ No newline at end of file
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论