Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
smf-core
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 19775fb0
由
LN
编写于
2023-04-17 14:25:44 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
盘点bug修改
1 个父辈
00fa23ee
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
11 行增加
和
5 行删除
src/main/java/com/neotel/smfcore/core/selfAudit/rest/SelfAuditDeviceController.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/selfAudit/rest/SelfAuditDeviceController.java
查看文件 @
19775fb
...
...
@@ -104,7 +104,7 @@ public class SelfAuditDeviceController {
}
}
//根据CID获取盘点的下一个库位
return
ResultBean
.
new
OkResult
(
"ok"
);
return
ResultBean
.
new
ErrorResult
(
101
,
"smfcore.selfAudit.noPos"
,
"盘点{0}未找到库位号"
,
new
String
[]{
selfAudit
.
getBatchNo
()}
);
}
@ApiOperation
(
"盘点: 库位已出库完成 "
)
@PostMapping
(
value
=
"/posOutEnd"
)
...
...
@@ -188,6 +188,7 @@ public class SelfAuditDeviceController {
for
(
SelfAuditItem
item
:
items
)
{
if
(
item
.
getPosName
().
equals
(
posName
))
{
findOk
=
true
;
log
.
info
(
" 盘点["
+
selfAudit
.
getBatchNo
()
+
"]库位入库完成:posName["
+
item
.
getPosName
()
+
"]barcode["
+
item
.
getBarcode
()
+
"],actualBarcode=["
+
actualBarcode
+
"]"
);
StoragePos
storagePos
=
storagePosManager
.
getByPosName
(
posName
);
...
...
src/main/resources/messages.properties
查看文件 @
19775fb
...
...
@@ -345,6 +345,7 @@ order.error.executing={0}\u5DF2\u5728\u4EFB\u52A1\u5217\u8868\u4E2D
smfcore.queryPos.solderOutFail
=
[{0}]checkOut fail,currStatus[{1}]
smfcore.operationFailure
=
\u
64CD
\u
4F5C
\u5931\u
8D25
smfcore.hotayi.machineID.error
=
machineID inconsistency [{0}] [{1}]
smfcore.selfAudit.noPos
=
\u
76D8
\u
70B9{0}
\u
672A
\u
627E
\u5230\u
5E93
\u
4F4D
\u
53F7
#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
查看文件 @
19775fb
...
...
@@ -343,4 +343,5 @@ smfcore.shelf.error.storageError=Task does not match the specified shelf [{0}]
order.error.executing
=
{0} Already in the task list
smfcore.queryPos.solderOutFail
=
[{0}]checkOut fail,currStatus[{1}]
smfcore.operationFailure
=
Operation failed
smfcore.hotayi.machineID.error
=
machineID inconsistency [{0}] [{1}]
\ No newline at end of file
smfcore.hotayi.machineID.error
=
machineID inconsistency [{0}] [{1}]
smfcore.selfAudit.noPos
=
Self Audit{0}No depot number found
\ No newline at end of file
src/main/resources/messages_ja_JP.properties
查看文件 @
19775fb
...
...
@@ -340,4 +340,5 @@ smfcore.shelf.error.storageError=\u4EFB\u52A1\u4E0E\u6307\u5B9A\u6599\u67B6[{0}]
order.error.executing
=
{0}
\u
5DF2
\u5728\u
4EFB
\u
52A1
\u5217\u8868\u
4E2D
smfcore.queryPos.solderOutFail
=
[{0}]checkOut fail,currStatus[{1}]
smfcore.operationFailure
=
\u
64CD
\u
4F5C
\u5931\u
8D25
smfcore.hotayi.machineID.error
=
machineID inconsistency [{0}] [{1}]
\ No newline at end of file
smfcore.hotayi.machineID.error
=
machineID inconsistency [{0}] [{1}]
smfcore.selfAudit.noPos
=
\u
76D8
\u
70B9{0}
\u
672A
\u
627E
\u5230\u
5E93
\u
4F4D
\u
53F7
\ No newline at end of file
src/main/resources/messages_zh_CN.properties
查看文件 @
19775fb
...
...
@@ -340,4 +340,5 @@ smfcore.shelf.error.storageError=\u4EFB\u52A1\u4E0E\u6307\u5B9A\u6599\u67B6[{0}]
order.error.executing
=
{0}
\u
5DF2
\u5728\u
4EFB
\u
52A1
\u5217\u8868\u
4E2D
smfcore.queryPos.solderOutFail
=
[{0}]
\u
51FA
\u
5E93
\u5931\u
8D25
\u
FF0C
\u
5F53
\u
524D
\u
72B6
\u6001\u
FF1A[{1}]
smfcore.operationFailure
=
\u
64CD
\u
4F5C
\u5931\u
8D25
smfcore.hotayi.machineID.error
=
machineID inconsistency [{0}] [{1}]
\ No newline at end of file
smfcore.hotayi.machineID.error
=
machineID inconsistency [{0}] [{1}]
smfcore.selfAudit.noPos
=
\u
76D8
\u
70B9{0}
\u
672A
\u
627E
\u5230\u
5E93
\u
4F4D
\u
53F7
\ No newline at end of file
src/main/resources/messages_zh_TW.properties
查看文件 @
19775fb
...
...
@@ -341,4 +341,5 @@ smfcore.shelf.error.storageError=\u4EFB\u52D9\u8207\u6307\u5B9A\u6599\u67B6[{0}]
order.error.executing
=
{0}
\u
5DF2
\u5728\u
4EFB
\u
52D9
\u5217\u8868\u
4E2D
smfcore.queryPos.solderOutFail
=
[{0}]
\u
51FA
\u
5E93
\u5931\u
8D25
\u
FF0C
\u
5F53
\u
524D
\u
72B6
\u6001\u
FF1A[{1}]
smfcore.operationFailure
=
\u
64CD
\u
4F5C
\u5931\u
8D25
smfcore.hotayi.machineID.error
=
machineID inconsistency [{0}] [{1}]
\ No newline at end of file
smfcore.hotayi.machineID.error
=
machineID inconsistency [{0}] [{1}]
smfcore.selfAudit.noPos
=
\u
76E4
\u
9EDE{0}
\u
672A
\u
627E
\u5230\u
5EAB
\u
4F4D
\u
865F
\ No newline at end of file
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论