Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
smf-core
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit a43c781e
由
LN
编写于
2023-03-24 16:26:51 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
盘点功能修改
1 个父辈
d43f041b
隐藏空白字符变更
内嵌
并排
正在显示
13 个修改的文件
包含
81 行增加
和
25 行删除
src/main/java/com/neotel/smfcore/core/device/handler/impl/RobotBoxHandler.java
src/main/java/com/neotel/smfcore/core/selfAudit/rest/SelfAuditController.java
src/main/java/com/neotel/smfcore/core/selfAudit/rest/SelfAuditDeviceController.java
src/main/java/com/neotel/smfcore/core/selfAudit/rest/dto/SelfAuditDto.java
src/main/java/com/neotel/smfcore/core/selfAudit/rest/dto/SelfAuditItemDto.java
src/main/java/com/neotel/smfcore/core/selfAudit/rest/query/SelfAuditCriteria.java
src/main/java/com/neotel/smfcore/core/selfAudit/service/po/SelfAudit.java
src/main/java/com/neotel/smfcore/core/selfAudit/service/po/SelfAuditItem.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/device/handler/impl/RobotBoxHandler.java
查看文件 @
a43c781
...
@@ -483,7 +483,7 @@ public class RobotBoxHandler extends BaseDeviceHandler {
...
@@ -483,7 +483,7 @@ public class RobotBoxHandler extends BaseDeviceHandler {
errorMsg
=
ve
.
getMessage
();
errorMsg
=
ve
.
getMessage
();
log
.
info
(
"Failed to find empty storage space:"
+
errorMsg
);
log
.
info
(
"Failed to find empty storage space:"
+
errorMsg
);
resultMap
.
put
(
"result"
,
"105"
);
resultMap
.
put
(
"result"
,
"105"
);
errorMsg
=
MessageUtils
.
getText
(
ve
.
getMsgKey
(),
new
Locale
(
"en"
,
"US"
),
ve
.
getDefaultMsg
());
errorMsg
=
MessageUtils
.
getText
(
ve
.
getMsgKey
(),
ve
.
getMsgParam
(),
new
Locale
(
"en"
,
"US"
),
ve
.
getDefaultMsg
());
resultMap
.
put
(
"msg"
,
errorMsg
);
resultMap
.
put
(
"msg"
,
errorMsg
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
errorMsg
=
e
.
getMessage
();
errorMsg
=
e
.
getMessage
();
...
...
src/main/java/com/neotel/smfcore/core/selfAudit/rest/SelfAuditController.java
查看文件 @
a43c781
package
com
.
neotel
.
smfcore
.
core
.
selfAudit
.
rest
;
package
com
.
neotel
.
smfcore
.
core
.
selfAudit
.
rest
;
import
cn.hutool.core.util.ObjectUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.neotel.smfcore.common.bean.PageData
;
import
com.neotel.smfcore.common.bean.PageData
;
import
com.neotel.smfcore.common.bean.ResultBean
;
import
com.neotel.smfcore.common.bean.ResultBean
;
import
com.neotel.smfcore.common.exception.ValidateException
;
import
com.neotel.smfcore.common.exception.ValidateException
;
...
@@ -61,19 +62,37 @@ public class SelfAuditController {
...
@@ -61,19 +62,37 @@ public class SelfAuditController {
String
batchNo
=
dataCache
.
getCache
(
Constants
.
CACHE_SELFAUDIT_BATCHNO
);
String
batchNo
=
dataCache
.
getCache
(
Constants
.
CACHE_SELFAUDIT_BATCHNO
);
if
(
ObjectUtil
.
isNotEmpty
(
batchNo
))
{
if
(
ObjectUtil
.
isNotEmpty
(
batchNo
))
{
SelfAudit
selfAudit
=
selfAuditManager
.
findByBatchNo
(
batchNo
);
SelfAudit
selfAudit
=
selfAuditManager
.
findByBatchNo
(
batchNo
);
if
(
selfAudit
.
getStatus
().
equals
(
SELFAUDIT_STATUS
.
END
)
||
selfAudit
.
getStatus
().
equals
(
SELFAUDIT_STATUS
.
FINISHED
))
{
//如果当前是暂停,可以继续
if
(
selfAudit
.
getStatus
().
equals
(
SELFAUDIT_STATUS
.
PAUSE
.
name
())){
//手动继续盘点
log
.
info
(
"手动继续盘点:"
+
batchNo
);
selfAudit
.
setStatus
(
SELFAUDIT_STATUS
.
EXECUTING
.
name
());
selfAuditManager
.
save
(
selfAudit
);
//更新缓存
SelfAuditUtil
.
updateShelfAudit
(
selfAudit
);
return
ResultBean
.
newOkResult
(
"OK"
);
}
if
(
selfAudit
.
getStatus
().
equals
(
SELFAUDIT_STATUS
.
END
.
name
())
||
selfAudit
.
getStatus
().
equals
(
SELFAUDIT_STATUS
.
FINISHED
.
name
()))
{
log
.
info
(
"从dataCache删除已完成的盘点批次号:"
+
batchNo
+
" "
);
dataCache
.
updateCache
(
Constants
.
CACHE_SELFAUDIT_BATCHNO
,
""
);
}
else
{
}
else
{
ResultBean
.
newErrorResult
(
99
,
"smfcore.selfAudit.preNotEnd"
,
"上次盘点{0}还未完成"
,
new
String
[]{
batchNo
});
throw
new
ValidateException
(
"smfcore.selfAudit.preNotEnd"
,
"上次盘点{0}还未完成"
,
new
String
[]{
batchNo
});
}
}
}
}
log
.
info
(
"从dataCache删除已完成的盘点批次号:"
+
batchNo
+
" "
);
dataCache
.
updateCache
(
Constants
.
CACHE_SELFAUDIT_BATCHNO
,
""
);
//开始新的盘点
//开始新的盘点
String
[]
storageIds
=
(
String
[])
mapValues
.
get
(
"storageIds"
);
Object
object
=
mapValues
.
get
(
"storageIds"
);
if
(
storageIds
==
null
||
storageIds
.
length
<=
0
)
{
if
(
ObjectUtil
.
isEmpty
(
object
)
)
{
ResultBean
.
newErrorResult
(
99
,
"smfcore.selfAudit.noStorage"
,
"请选择要盘点的设备"
);
throw
new
ValidateException
(
"smfcore.selfAudit.noStorage"
,
"请选择要盘点的设备"
);
}
}
List
<
String
>
storageIds
=
JSON
.
parseArray
(
object
.
toString
(),
String
.
class
);
if
(
storageIds
==
null
||
storageIds
.
size
()
<=
0
)
{
throw
new
ValidateException
(
"smfcore.selfAudit.noStorage"
,
"请选择要盘点的设备"
);
}
log
.
info
(
"开始盘点: 设备ID["
+
String
.
join
(
","
,
storageIds
)+
"] 创建盘点数据"
);
List
<
SelfAuditItem
>
items
=
new
ArrayList
<>();
List
<
SelfAuditItem
>
items
=
new
ArrayList
<>();
List
<
String
>
storageIdList
=
new
ArrayList
<>();
List
<
String
>
storageIdList
=
new
ArrayList
<>();
// List<StoragePos> allPosList=new ArrayList<>();
// List<StoragePos> allPosList=new ArrayList<>();
...
@@ -98,12 +117,13 @@ public class SelfAuditController {
...
@@ -98,12 +117,13 @@ public class SelfAuditController {
SelfAudit
audit
=
new
SelfAudit
(
no
,
SELFAUDIT_STATUS
.
NEW
.
name
(),
items
.
size
(),
0
,
storageIdList
,
new
ArrayList
<>()
);
SelfAudit
audit
=
new
SelfAudit
(
no
,
SELFAUDIT_STATUS
.
NEW
.
name
(),
items
.
size
(),
0
,
storageIdList
,
new
ArrayList
<>()
);
log
.
info
(
"
开始盘点
: 批次号["
+
no
+
"] 设备ID["
+
String
.
join
(
","
,
storageIdList
)+
"] 盘点库位数量:["
+
items
.
size
()+
"] "
);
log
.
info
(
"
盘点数据创建完成
: 批次号["
+
no
+
"] 设备ID["
+
String
.
join
(
","
,
storageIdList
)+
"] 盘点库位数量:["
+
items
.
size
()+
"] "
);
audit
=
selfAuditManager
.
createSelfAudit
(
audit
,
items
);
audit
=
selfAuditManager
.
createSelfAudit
(
audit
,
items
);
SelfAuditDto
dto
=
selfAuditMapper
.
toDto
(
audit
);
SelfAuditDto
dto
=
selfAuditMapper
.
toDto
(
audit
);
//更新缓存
//更新缓存
SelfAuditUtil
.
updateShelfAudit
(
audit
);
SelfAuditUtil
.
updateShelfAudit
(
audit
);
dataCache
.
updateCache
(
Constants
.
CACHE_SELFAUDIT_BATCHNO
,
no
);
return
ResultBean
.
newOkResult
(
dto
);
return
ResultBean
.
newOkResult
(
dto
);
}
}
...
@@ -112,8 +132,14 @@ public class SelfAuditController {
...
@@ -112,8 +132,14 @@ public class SelfAuditController {
public
ResultBean
pause
(
@RequestBody
Map
<
String
,
String
>
mapValues
)
{
public
ResultBean
pause
(
@RequestBody
Map
<
String
,
String
>
mapValues
)
{
String
batchNo
=
mapValues
.
get
(
"batchNo"
);
String
batchNo
=
mapValues
.
get
(
"batchNo"
);
SelfAudit
selfAudit
=
getInfoByBatchNo
(
batchNo
);
SelfAudit
selfAudit
=
getInfoByBatchNo
(
batchNo
);
if
(
selfAudit
.
getStatus
().
equals
(
SELFAUDIT_STATUS
.
END
.
name
())
||
selfAudit
.
getStatus
().
equals
(
SELFAUDIT_STATUS
.
FINISHED
.
name
())
||
selfAudit
.
getStatus
().
equals
(
SELFAUDIT_STATUS
.
PAUSE
.
name
()))
{
throw
new
ValidateException
(
"smfcore.micron.operationFailure"
,
"操作失败"
);
}
//结束盘点
//结束盘点
log
.
info
(
"手动暂停盘点
,批次号
:"
+
batchNo
);
log
.
info
(
"手动暂停盘点:"
+
batchNo
);
selfAudit
.
setStatus
(
SELFAUDIT_STATUS
.
PAUSE
.
name
());
selfAudit
.
setStatus
(
SELFAUDIT_STATUS
.
PAUSE
.
name
());
selfAuditManager
.
save
(
selfAudit
);
selfAuditManager
.
save
(
selfAudit
);
//更新缓存
//更新缓存
...
@@ -127,11 +153,11 @@ public class SelfAuditController {
...
@@ -127,11 +153,11 @@ public class SelfAuditController {
SelfAudit
selfAudit
=
getInfoByBatchNo
(
batchNo
);
SelfAudit
selfAudit
=
getInfoByBatchNo
(
batchNo
);
//结束盘点
//结束盘点
log
.
info
(
"手动结束盘点
,批次号
:"
+
batchNo
);
log
.
info
(
"手动结束盘点:"
+
batchNo
);
selfAudit
.
setStatus
(
SELFAUDIT_STATUS
.
END
.
name
());
selfAudit
.
setStatus
(
SELFAUDIT_STATUS
.
END
.
name
());
selfAuditManager
.
save
(
selfAudit
);
selfAuditManager
.
save
(
selfAudit
);
//清空dataCache
//清空dataCache
log
.
info
(
"手动结束盘点
,批次号
:"
+
batchNo
+
" 完成,从dataCache删除批次号"
);
log
.
info
(
"手动结束盘点:"
+
batchNo
+
" 完成,从dataCache删除批次号"
);
dataCache
.
updateCache
(
Constants
.
CACHE_SELFAUDIT_BATCHNO
,
""
);
dataCache
.
updateCache
(
Constants
.
CACHE_SELFAUDIT_BATCHNO
,
""
);
//更新缓存
//更新缓存
SelfAuditUtil
.
updateShelfAudit
(
selfAudit
);
SelfAuditUtil
.
updateShelfAudit
(
selfAudit
);
...
@@ -170,6 +196,11 @@ public class SelfAuditController {
...
@@ -170,6 +196,11 @@ public class SelfAuditController {
if
(
selfAudit
==
null
)
{
if
(
selfAudit
==
null
)
{
selfAudit
=
selfAuditManager
.
findByBatchNo
(
batchNo
);
selfAudit
=
selfAuditManager
.
findByBatchNo
(
batchNo
);
}
}
if
(
selfAudit
.
getStatus
().
equals
(
SELFAUDIT_STATUS
.
END
.
name
())
||
selfAudit
.
getStatus
().
equals
(
SELFAUDIT_STATUS
.
FINISHED
.
name
()))
{
log
.
info
(
"从dataCache删除已完成的盘点批次号:"
+
batchNo
+
" "
);
dataCache
.
updateCache
(
Constants
.
CACHE_SELFAUDIT_BATCHNO
,
""
);
return
null
;
}
if
(
selfAudit
!=
null
)
{
if
(
selfAudit
!=
null
)
{
return
toSelfAuditDto
(
selfAudit
);
return
toSelfAuditDto
(
selfAudit
);
}
}
...
...
src/main/java/com/neotel/smfcore/core/selfAudit/rest/SelfAuditDeviceController.java
查看文件 @
a43c781
...
@@ -7,6 +7,7 @@ import com.neotel.smfcore.common.utils.Constants;
...
@@ -7,6 +7,7 @@ import com.neotel.smfcore.common.utils.Constants;
import
com.neotel.smfcore.core.barcode.service.po.Barcode
;
import
com.neotel.smfcore.core.barcode.service.po.Barcode
;
import
com.neotel.smfcore.core.barcode.utils.CodeResolve
;
import
com.neotel.smfcore.core.barcode.utils.CodeResolve
;
import
com.neotel.smfcore.core.device.util.DataCache
;
import
com.neotel.smfcore.core.device.util.DataCache
;
import
com.neotel.smfcore.core.selfAudit.enums.SELFAUDIT_STATUS
;
import
com.neotel.smfcore.core.selfAudit.service.manager.ISelfAuditItemManager
;
import
com.neotel.smfcore.core.selfAudit.service.manager.ISelfAuditItemManager
;
import
com.neotel.smfcore.core.selfAudit.service.manager.ISelfAuditManager
;
import
com.neotel.smfcore.core.selfAudit.service.manager.ISelfAuditManager
;
import
com.neotel.smfcore.core.selfAudit.service.po.SelfAudit
;
import
com.neotel.smfcore.core.selfAudit.service.po.SelfAudit
;
...
@@ -59,6 +60,14 @@ public class SelfAuditDeviceController {
...
@@ -59,6 +60,14 @@ public class SelfAuditDeviceController {
if
(
selfAudit
==
null
)
{
if
(
selfAudit
==
null
)
{
selfAudit
=
selfAuditManager
.
findByBatchNo
(
batchNo
);
selfAudit
=
selfAuditManager
.
findByBatchNo
(
batchNo
);
}
}
//如果已结束
if
(
selfAudit
.
getStatus
().
equals
(
SELFAUDIT_STATUS
.
END
.
name
())
||
selfAudit
.
getStatus
().
equals
(
SELFAUDIT_STATUS
.
FINISHED
.
name
()))
{
log
.
info
(
"从dataCache删除已完成的盘点批次号:"
+
batchNo
+
" "
);
dataCache
.
updateCache
(
Constants
.
CACHE_SELFAUDIT_BATCHNO
,
""
);
return
null
;
}
return
selfAudit
;
return
selfAudit
;
}
}
return
null
;
return
null
;
...
@@ -74,6 +83,10 @@ public class SelfAuditDeviceController {
...
@@ -74,6 +83,10 @@ public class SelfAuditDeviceController {
return
ResultBean
.
newErrorResult
(
99
,
"smfcore.selfAudit.notFind"
,
"未找到盘点信息"
);
return
ResultBean
.
newErrorResult
(
99
,
"smfcore.selfAudit.notFind"
,
"未找到盘点信息"
);
}
}
if
(
selfAudit
.
getStatus
().
equals
(
SELFAUDIT_STATUS
.
PAUSE
.
name
()))
{
return
ResultBean
.
newErrorResult
(
100
,
"smfcore.selfAudit.pause"
,
"盘点{0}已暂停"
,
new
String
[]{
selfAudit
.
getBatchNo
()});
}
String
cid
=
request
.
getParameter
(
"cid"
);
String
cid
=
request
.
getParameter
(
"cid"
);
//根据CID 查找下一个
//根据CID 查找下一个
List
<
SelfAuditItem
>
items
=
selfAudit
.
getItems
();
List
<
SelfAuditItem
>
items
=
selfAudit
.
getItems
();
...
...
src/main/java/com/neotel/smfcore/core/selfAudit/rest/dto/SelfAuditDto.java
查看文件 @
a43c781
...
@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
...
@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
import
org.springframework.data.annotation.Transient
;
import
org.springframework.data.annotation.Transient
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
@Data
@Data
@AllArgsConstructor
@AllArgsConstructor
...
@@ -19,12 +20,16 @@ public class SelfAuditDto implements Serializable {
...
@@ -19,12 +20,16 @@ public class SelfAuditDto implements Serializable {
@ApiModelProperty
(
"状态"
)
@ApiModelProperty
(
"状态"
)
private
String
status
;
private
String
status
;
@ApiModelProperty
(
"盘点选择的料仓ID列表"
)
private
List
<
String
>
storageIds
;
@ApiModelProperty
(
"总库位数"
)
@ApiModelProperty
(
"总库位数"
)
private
Integer
totalItemNum
;
private
Integer
totalItemNum
;
@ApiModelProperty
(
"已结束库位数"
)
@ApiModelProperty
(
"已结束库位数"
)
private
Integer
endItemNum
;
private
Integer
endItemNum
;
private
Date
createDate
;
private
Date
updateDate
;
@Transient
@Transient
private
List
<
SelfAuditItemDto
>
items
;
private
List
<
SelfAuditItemDto
>
items
;
...
...
src/main/java/com/neotel/smfcore/core/selfAudit/rest/dto/SelfAuditItemDto.java
查看文件 @
a43c781
...
@@ -28,4 +28,7 @@ public class SelfAuditItemDto implements Serializable {
...
@@ -28,4 +28,7 @@ public class SelfAuditItemDto implements Serializable {
@ApiModelProperty
(
"实际条码"
)
@ApiModelProperty
(
"实际条码"
)
private
String
actualBarcode
;
private
String
actualBarcode
;
@ApiModelProperty
(
"0=等待中,1=出库完成,2=盘点完成"
)
private
int
itemStatus
=
0
;
}
}
src/main/java/com/neotel/smfcore/core/selfAudit/rest/query/SelfAuditCriteria.java
查看文件 @
a43c781
...
@@ -8,7 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat;
...
@@ -8,7 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import
java.util.Date
;
import
java.util.Date
;
public
class
SelfAuditCriteria
{
public
class
SelfAuditCriteria
{
@QueryCondition
(
blurry
=
"ba
rcode,posName,locInf
o"
)
@QueryCondition
(
blurry
=
"ba
tchN
o"
)
private
String
blurry
;
private
String
blurry
;
@QueryCondition
(
type
=
QueryCondition
.
Type
.
BETWEEN
,
propName
=
"updateDate"
)
@QueryCondition
(
type
=
QueryCondition
.
Type
.
BETWEEN
,
propName
=
"updateDate"
)
...
@@ -16,10 +16,8 @@ public class SelfAuditCriteria {
...
@@ -16,10 +16,8 @@ public class SelfAuditCriteria {
private
BetweenData
<
Date
>
createDate
;
private
BetweenData
<
Date
>
createDate
;
@QueryCondition
(
blurry
=
"barcode"
)
@QueryCondition
(
blurry
=
"batchNo"
)
private
String
barcode
;
private
String
batchNo
;
@QueryCondition
(
blurry
=
"posName"
)
private
String
posName
;
@ApiModelProperty
(
"status"
)
@ApiModelProperty
(
"status"
)
@QueryCondition
(
blurry
=
"status"
)
@QueryCondition
(
blurry
=
"status"
)
...
...
src/main/java/com/neotel/smfcore/core/selfAudit/service/po/SelfAudit.java
查看文件 @
a43c781
...
@@ -21,6 +21,7 @@ public class SelfAudit extends BasePo implements Serializable {
...
@@ -21,6 +21,7 @@ public class SelfAudit extends BasePo implements Serializable {
private
String
batchNo
;
private
String
batchNo
;
/**
/**
* 状态
* 状态
* NEW=新建,EXECUTING=执行中,PAUSE=暂停,FINISHED=已完成,END=已结束
*/
*/
private
String
status
;
private
String
status
;
/**
/**
...
...
src/main/java/com/neotel/smfcore/core/selfAudit/service/po/SelfAuditItem.java
查看文件 @
a43c781
...
@@ -52,12 +52,12 @@ public class SelfAuditItem extends BasePo implements Serializable {
...
@@ -52,12 +52,12 @@ public class SelfAuditItem extends BasePo implements Serializable {
public
static
SelfAuditItem
newItem
(
String
cid
,
String
batchNo
,
StoragePos
pos
){
public
static
SelfAuditItem
newItem
(
String
cid
,
String
batchNo
,
StoragePos
pos
){
SelfAuditItem
item
=
new
SelfAuditItem
();
SelfAuditItem
item
=
new
SelfAuditItem
();
item
.
set
Cid
(
cid
);
item
.
set
BatchNo
(
batchNo
);
item
.
set
Barcode
(
batchNo
);
item
.
set
Cid
(
cid
);
item
.
setPosId
(
pos
.
getId
());
item
.
setPosId
(
pos
.
getId
());
item
.
setPosName
(
pos
.
getPosName
());
item
.
setPosName
(
pos
.
getPosName
());
item
.
setStorageId
(
pos
.
getStorageId
());
item
.
setStorageId
(
pos
.
getStorageId
());
if
(
pos
.
getBarcode
().
getBarcode
()!=
null
)
{
if
(
pos
.
getBarcode
()
!=
null
&&
pos
.
getBarcode
()
.
getBarcode
()!=
null
)
{
item
.
setBarcode
(
pos
.
getBarcode
().
getBarcode
());
item
.
setBarcode
(
pos
.
getBarcode
().
getBarcode
());
}
else
{
}
else
{
item
.
setBarcode
(
""
);
item
.
setBarcode
(
""
);
...
...
src/main/resources/messages.properties
查看文件 @
a43c781
...
@@ -338,6 +338,7 @@ smfcore.selfAudit.noStorage=\u8BF7\u9009\u62E9\u8981\u76D8\u70B9\u7684\u8BBE\u59
...
@@ -338,6 +338,7 @@ smfcore.selfAudit.noStorage=\u8BF7\u9009\u62E9\u8981\u76D8\u70B9\u7684\u8BBE\u59
smfcore.selfAudit.notExist
=
\u
672A
\u
627E
\u5230\u6279\u
6B21
\u
53F7[{0}]
\u7684\u
76D8
\u
70B9
\u
4FE1
\u
606F
smfcore.selfAudit.notExist
=
\u
672A
\u
627E
\u5230\u6279\u
6B21
\u
53F7[{0}]
\u7684\u
76D8
\u
70B9
\u
4FE1
\u
606F
smfcore.selfAudit.hasEnd
=
[{0}]
\u
76D8
\u
70B9
\u
5DF2
\u
5B8C
\u6210
smfcore.selfAudit.hasEnd
=
[{0}]
\u
76D8
\u
70B9
\u
5DF2
\u
5B8C
\u6210
smfcore.selfAudit.notFind
=
\u
672A
\u
627E
\u5230\u
76D8
\u
70B9
\u
4FE1
\u
606F
smfcore.selfAudit.notFind
=
\u
672A
\u
627E
\u5230\u
76D8
\u
70B9
\u
4FE1
\u
606F
smfcore.selfAudit.pause
=
\u
76D8
\u
70B9{0}
\u
5DF2
\u6682\u
505C
#smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{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.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1}
#smfclient.nlp.inputOk={0}\u5165\u5E93\u5230{1}\u6210\u529F
#smfclient.nlp.inputOk={0}\u5165\u5E93\u5230{1}\u6210\u529F
...
...
src/main/resources/messages_en_US.properties
查看文件 @
a43c781
...
@@ -336,4 +336,5 @@ smfcore.selfAudit.preNotEnd=The last self audit {0} is still incomplete
...
@@ -336,4 +336,5 @@ smfcore.selfAudit.preNotEnd=The last self audit {0} is still incomplete
smfcore.selfAudit.noStorage
=
Please select the equipment to be self audit
smfcore.selfAudit.noStorage
=
Please select the equipment to be self audit
smfcore.selfAudit.notExist
=
[{0}] self audit information not found
smfcore.selfAudit.notExist
=
[{0}] self audit information not found
smfcore.selfAudit.hasEnd
=
[{0}] self audit is complete
smfcore.selfAudit.hasEnd
=
[{0}] self audit is complete
smfcore.selfAudit.notFind
=
self audit is not found
\ No newline at end of file
\ No newline at end of file
smfcore.selfAudit.notFind
=
self audit is not found
smfcore.selfAudit.pause
=
self audit {0} has Paused
\ No newline at end of file
\ No newline at end of file
src/main/resources/messages_ja_JP.properties
查看文件 @
a43c781
...
@@ -333,4 +333,5 @@ smfcore.selfAudit.preNotEnd=\u6700\u5F8C\u306E\u30A4\u30F3\u30D9\u30F3\u30C8\u30
...
@@ -333,4 +333,5 @@ smfcore.selfAudit.preNotEnd=\u6700\u5F8C\u306E\u30A4\u30F3\u30D9\u30F3\u30C8\u30
smfcore.selfAudit.noStorage
=
\u
30A4
\u
30F3
\u
30D9
\u
30F3
\u
30C8
\u
30EA
\u5316\u3059\u
308B
\u
6A5F
\u5668\u3092\u9078\u
629E
\u3057\u3066\u
304F
\u3060\u3055\u3044
smfcore.selfAudit.noStorage
=
\u
30A4
\u
30F3
\u
30D9
\u
30F3
\u
30C8
\u
30EA
\u5316\u3059\u
308B
\u
6A5F
\u5668\u3092\u9078\u
629E
\u3057\u3066\u
304F
\u3060\u3055\u3044
smfcore.selfAudit.notExist
=
\u
30ED
\u
30C3
\u
30C8
\u
756A
\u
53F7[{0}]
\u
306E
\u
30A4
\u
30F3
\u
30D9
\u
30F3
\u
30C8
\u
30EA
\u
60C5
\u5831\u
304C
\u
898B
\u3064\u
304B
\u3089\u
306A
\u3044
smfcore.selfAudit.notExist
=
\u
30ED
\u
30C3
\u
30C8
\u
756A
\u
53F7[{0}]
\u
306E
\u
30A4
\u
30F3
\u
30D9
\u
30F3
\u
30C8
\u
30EA
\u
60C5
\u5831\u
304C
\u
898B
\u3064\u
304B
\u3089\u
306A
\u3044
smfcore.selfAudit.hasEnd
=
[{0}]
\u
30A4
\u
30F3
\u
30D9
\u
30F3
\u
30C8
\u
30EA
\u
30FC
\u
5B8C
\u6210
smfcore.selfAudit.hasEnd
=
[{0}]
\u
30A4
\u
30F3
\u
30D9
\u
30F3
\u
30C8
\u
30EA
\u
30FC
\u
5B8C
\u6210
smfcore.selfAudit.notFind
=
\u
30A4
\u
30F3
\u
30D9
\u
30F3
\u
30C8
\u
30EA
\u
60C5
\u5831\u
304C
\u
898B
\u3064\u
304B
\u3089\u
306A
\u3044
smfcore.selfAudit.notFind
=
\u
30A4
\u
30F3
\u
30D9
\u
30F3
\u
30C8
\u
30EA
\u
60C5
\u5831\u
304C
\u
898B
\u3064\u
304B
\u3089\u
306A
\u3044
smfcore.selfAudit.pause=
\u
30BB
\u
30EB
\u
30D5
\u
30C6
\u
30B9
\u
30C8{0}
\u
304C
\u
4E2D
\u
65AD
\u3055\u
308C
\u
307E
\u3057\u
305F
\ No newline at end of file
\ No newline at end of file
src/main/resources/messages_zh_CN.properties
查看文件 @
a43c781
...
@@ -333,4 +333,5 @@ smfcore.selfAudit.preNotEnd=\u4E0A\u6B21\u76D8\u70B9{0}\u8FD8\u672A\u5B8C\u6210
...
@@ -333,4 +333,5 @@ smfcore.selfAudit.preNotEnd=\u4E0A\u6B21\u76D8\u70B9{0}\u8FD8\u672A\u5B8C\u6210
smfcore.selfAudit.noStorage
=
\u
8BF7
\u9009\u
62E9
\u8981\u
76D8
\u
70B9
\u7684\u
8BBE
\u5907
smfcore.selfAudit.noStorage
=
\u
8BF7
\u9009\u
62E9
\u8981\u
76D8
\u
70B9
\u7684\u
8BBE
\u5907
smfcore.selfAudit.notExist
=
\u
672A
\u
627E
\u5230\u6279\u
6B21
\u
53F7[{0}]
\u7684\u
76D8
\u
70B9
\u
4FE1
\u
606F
smfcore.selfAudit.notExist
=
\u
672A
\u
627E
\u5230\u6279\u
6B21
\u
53F7[{0}]
\u7684\u
76D8
\u
70B9
\u
4FE1
\u
606F
smfcore.selfAudit.hasEnd
=
[{0}]
\u
76D8
\u
70B9
\u
5DF2
\u
5B8C
\u6210
smfcore.selfAudit.hasEnd
=
[{0}]
\u
76D8
\u
70B9
\u
5DF2
\u
5B8C
\u6210
smfcore.selfAudit.notFind
=
\u
672A
\u
627E
\u5230\u
76D8
\u
70B9
\u
4FE1
\u
606F
\ No newline at end of file
\ No newline at end of file
smfcore.selfAudit.notFind
=
\u
672A
\u
627E
\u5230\u
76D8
\u
70B9
\u
4FE1
\u
606F
smfcore.selfAudit.pause
=
\u
76D8
\u
70B9{0}
\u
5DF2
\u6682\u
505C
\ No newline at end of file
\ No newline at end of file
src/main/resources/messages_zh_TW.properties
查看文件 @
a43c781
...
@@ -334,4 +334,5 @@ smfcore.selfAudit.preNotEnd=\u4E0A\u6B21\u76E4\u9EDE{0}\u9084\u672A\u5B8C\u6210
...
@@ -334,4 +334,5 @@ smfcore.selfAudit.preNotEnd=\u4E0A\u6B21\u76E4\u9EDE{0}\u9084\u672A\u5B8C\u6210
smfcore.selfAudit.noStorage
=
\u
8ACB
\u9078\u
64C7
\u8981\u
76E4
\u
9EDE
\u7684\u
8A2D
\u5099
smfcore.selfAudit.noStorage
=
\u
8ACB
\u9078\u
64C7
\u8981\u
76E4
\u
9EDE
\u7684\u
8A2D
\u5099
smfcore.selfAudit.notExist
=
\u
672A
\u
627E
\u5230\u6279\u
6B21
\u
865F[{0}]
\u7684\u
76E4
\u
9EDE
\u
4FE1
\u
606F
smfcore.selfAudit.notExist
=
\u
672A
\u
627E
\u5230\u6279\u
6B21
\u
865F[{0}]
\u7684\u
76E4
\u
9EDE
\u
4FE1
\u
606F
smfcore.selfAudit.hasEnd
=
[{0}]
\u
76E4
\u
9EDE
\u
5DF2
\u
5B8C
\u6210
smfcore.selfAudit.hasEnd
=
[{0}]
\u
76E4
\u
9EDE
\u
5DF2
\u
5B8C
\u6210
smfcore.selfAudit.notFind
=
\u
672A
\u
627E
\u5230\u
76E4
\u
9EDE
\u
4FE1
\u
606F
\ No newline at end of file
\ No newline at end of file
smfcore.selfAudit.notFind
=
\u
672A
\u
627E
\u5230\u
76E4
\u
9EDE
\u
4FE1
\u
606F
smfcore.selfAudit.pause
=
\u
76E4
\u
9EDE{0}
\u
5DF2
\u
66AB
\u
505C
\ No newline at end of file
\ No newline at end of file
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论