Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
smf-core
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 29b8938d
由
LN
编写于
2024-11-21 14:54:11 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
lineID未显示问题
1 个父辈
6d9e4888
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
3 行增加
和
5 行删除
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
src/main/java/com/neotel/smfcore/custom/micron1053/task/MicronDispatchController.java
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
查看文件 @
29b8938
...
@@ -1176,10 +1176,10 @@ public class LiteOrderCache {
...
@@ -1176,10 +1176,10 @@ public class LiteOrderCache {
if
(
ObjectUtil
.
isEmpty
(
reservedLinePrepOrderId
)){
if
(
ObjectUtil
.
isEmpty
(
reservedLinePrepOrderId
)){
reservedLinePrepOrderId
=
""
;
reservedLinePrepOrderId
=
""
;
}
}
reelItem
.
updateAppendData
(
"lineId"
,
reservedLinePrepOrderId
);
if
(
s
!=
null
&&
s
.
isAvailable
())
{
if
(
s
!=
null
&&
s
.
isAvailable
())
{
reelItem
.
setStatus
(
OrderItemStatus
.
CheckOk
);
reelItem
.
setStatus
(
OrderItemStatus
.
CheckOk
);
reelItem
.
updateAppendData
(
"lineId"
,
reservedLinePrepOrderId
);
//reservedLinePrepOrderId
//reservedLinePrepOrderId
//预留数量
//预留数量
StoragePos
pos
=
storagePosManager
.
getByBarcode
(
s
.
getSerialNum
());
StoragePos
pos
=
storagePosManager
.
getByBarcode
(
s
.
getSerialNum
());
...
...
src/main/java/com/neotel/smfcore/custom/micron1053/task/MicronDispatchController.java
查看文件 @
29b8938
...
@@ -647,6 +647,7 @@ public class MicronDispatchController {
...
@@ -647,6 +647,7 @@ public class MicronDispatchController {
if
(
ObjectUtil
.
isEmpty
(
reservedLinePrepOrderId
)){
if
(
ObjectUtil
.
isEmpty
(
reservedLinePrepOrderId
)){
reservedLinePrepOrderId
=
""
;
reservedLinePrepOrderId
=
""
;
}
}
reelItem
.
updateAppendData
(
"lineId"
,
reservedLinePrepOrderId
);
if
(
s
!=
null
&&
s
.
isAvailable
())
{
if
(
s
!=
null
&&
s
.
isAvailable
())
{
reelItem
.
setStatus
(
OrderItemStatus
.
CheckOk
);
reelItem
.
setStatus
(
OrderItemStatus
.
CheckOk
);
...
@@ -658,7 +659,6 @@ public class MicronDispatchController {
...
@@ -658,7 +659,6 @@ public class MicronDispatchController {
storagePosManager
.
save
(
pos
);
storagePosManager
.
save
(
pos
);
item
.
setOutNum
(
item
.
getOutNum
()
+
pos
.
getBarcode
().
getAmount
());
item
.
setOutNum
(
item
.
getOutNum
()
+
pos
.
getBarcode
().
getAmount
());
item
.
setOutReelCount
(
item
.
getOutReelCount
()
+
1
);
item
.
setOutReelCount
(
item
.
getOutReelCount
()
+
1
);
reelItem
.
updateAppendData
(
"lineId"
,
reservedLinePrepOrderId
);
order
.
setTaskReelCount
(
order
.
getTaskReelCount
()
+
1
);
order
.
setTaskReelCount
(
order
.
getTaskReelCount
()
+
1
);
}
else
if
(
s
!=
null
&&
s
.
isReserved
())
{
}
else
if
(
s
!=
null
&&
s
.
isReserved
())
{
...
@@ -668,7 +668,6 @@ public class MicronDispatchController {
...
@@ -668,7 +668,6 @@ public class MicronDispatchController {
}
}
reelItem
.
setExecutFailReason
(
str
);
reelItem
.
setExecutFailReason
(
str
);
reelItem
.
setStatus
(
OrderItemStatus
.
Reserved
);
reelItem
.
setStatus
(
OrderItemStatus
.
Reserved
);
reelItem
.
updateAppendData
(
"lineId"
,
reservedLinePrepOrderId
);
log
.
info
(
"工单【"
+
order
.
getOrderNo
()
+
"】PN ["
+
item
.
getPn
()
+
"] RI ["
+
reelItem
.
getRi
()
+
"] API009 验证失败,更改状态为 Reserved"
);
log
.
info
(
"工单【"
+
order
.
getOrderNo
()
+
"】PN ["
+
item
.
getPn
()
+
"] RI ["
+
reelItem
.
getRi
()
+
"] API009 验证失败,更改状态为 Reserved"
);
}
else
{
}
else
{
String
str
=
s
.
getDescription
();
String
str
=
s
.
getDescription
();
...
@@ -677,7 +676,6 @@ public class MicronDispatchController {
...
@@ -677,7 +676,6 @@ public class MicronDispatchController {
}
}
reelItem
.
setExecutFailReason
(
str
);
reelItem
.
setExecutFailReason
(
str
);
reelItem
.
setStatus
(
OrderItemStatus
.
CheckFail
);
reelItem
.
setStatus
(
OrderItemStatus
.
CheckFail
);
reelItem
.
updateAppendData
(
"lineId"
,
reservedLinePrepOrderId
);
log
.
info
(
"工单【"
+
order
.
getOrderNo
()
+
"】PN ["
+
item
.
getPn
()
+
"] RI ["
+
reelItem
.
getRi
()
+
"] API009 验证失败,更改状态为 CheckFail"
);
log
.
info
(
"工单【"
+
order
.
getOrderNo
()
+
"】PN ["
+
item
.
getPn
()
+
"] RI ["
+
reelItem
.
getRi
()
+
"] API009 验证失败,更改状态为 CheckFail"
);
}
}
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论