Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
smf-core
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit b543ae53
由
LN
编写于
2023-04-10 15:21:45 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
reloadStorage 默认不传cid
1 个父辈
2106f462
显示空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
10 行增加
和
10 行删除
src/main/java/com/neotel/smfcore/core/inList/rest/InListController.java
src/main/java/com/neotel/smfcore/core/selfAudit/rest/SelfAuditDeviceController.java
src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java
src/main/java/com/neotel/smfcore/core/system/util/TaskService.java
src/main/java/com/neotel/smfcore/custom/micron20031/MicronSpLoadController.java
src/main/java/com/neotel/smfcore/core/inList/rest/InListController.java
查看文件 @
b543ae5
...
@@ -210,7 +210,7 @@ public class InListController {
...
@@ -210,7 +210,7 @@ public class InListController {
storage
.
setInListName
(
inListName
);
storage
.
setInListName
(
inListName
);
log
.
info
(
"设置组["
+
groupId
+
"]料架["
+
storage
.
getName
()
+
"]的入库单为:["
+
inListName
+
"]"
);
log
.
info
(
"设置组["
+
groupId
+
"]料架["
+
storage
.
getName
()
+
"]的入库单为:["
+
inListName
+
"]"
);
storageManager
.
save
(
storage
);
storageManager
.
save
(
storage
);
dataCache
.
reloadStorage
(
storage
,
storage
.
getCid
()
);
dataCache
.
reloadStorage
(
storage
,
""
);
}
}
}
}
...
@@ -222,7 +222,7 @@ public class InListController {
...
@@ -222,7 +222,7 @@ public class InListController {
storage
.
setInListName
(
inListName
);
storage
.
setInListName
(
inListName
);
log
.
info
(
"设置料架["
+
storage
.
getName
()
+
"]的入库单为:["
+
inListName
+
"]"
);
log
.
info
(
"设置料架["
+
storage
.
getName
()
+
"]的入库单为:["
+
inListName
+
"]"
);
storageManager
.
save
(
storage
);
storageManager
.
save
(
storage
);
dataCache
.
reloadStorage
(
storage
,
storage
.
getCid
()
);
dataCache
.
reloadStorage
(
storage
,
""
);
}
}
}
}
}
}
...
...
src/main/java/com/neotel/smfcore/core/selfAudit/rest/SelfAuditDeviceController.java
查看文件 @
b543ae5
...
@@ -141,7 +141,7 @@ public class SelfAuditDeviceController {
...
@@ -141,7 +141,7 @@ public class SelfAuditDeviceController {
log
.
info
(
opUser
+
"盘点完成,清理库位["
+
storagePos
.
getPosName
()
+
"]中的库存"
+
barcode
.
getBarcode
());
log
.
info
(
opUser
+
"盘点完成,清理库位["
+
storagePos
.
getPosName
()
+
"]中的库存"
+
barcode
.
getBarcode
());
taskService
.
addTaskToFinished
(
storagePos
,
null
,
opUser
+
"-clear"
);
taskService
.
addTaskToFinished
(
storagePos
,
null
,
opUser
+
"-clear"
);
Storage
storage
=
dataCache
.
getStorageById
(
storagePos
.
getStorageId
());
Storage
storage
=
dataCache
.
getStorageById
(
storagePos
.
getStorageId
());
dataCache
.
reloadStorage
(
storage
,
storage
.
getCid
()
);
dataCache
.
reloadStorage
(
storage
,
""
);
}
}
//更新状态
//更新状态
...
...
src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java
查看文件 @
b543ae5
...
@@ -177,7 +177,7 @@ public class StoragePosController {
...
@@ -177,7 +177,7 @@ public class StoragePosController {
}
}
}
}
dataCache
.
reloadStorage
(
storage
,
storage
.
getCid
()
);
dataCache
.
reloadStorage
(
storage
,
""
);
return
ResultBean
.
newOkResult
(
""
);
return
ResultBean
.
newOkResult
(
""
);
}
}
...
@@ -203,7 +203,7 @@ public class StoragePosController {
...
@@ -203,7 +203,7 @@ public class StoragePosController {
log
.
info
(
opUser
+
"清理库位["
+
storagePos
.
getPosName
()
+
"]中的库存"
+
barcode
.
getBarcode
());
log
.
info
(
opUser
+
"清理库位["
+
storagePos
.
getPosName
()
+
"]中的库存"
+
barcode
.
getBarcode
());
taskService
.
addTaskToFinished
(
storagePos
,
null
,
opUser
+
"-clear"
);
taskService
.
addTaskToFinished
(
storagePos
,
null
,
opUser
+
"-clear"
);
Storage
storage
=
dataCache
.
getStorageById
(
storagePos
.
getStorageId
());
Storage
storage
=
dataCache
.
getStorageById
(
storagePos
.
getStorageId
());
dataCache
.
reloadStorage
(
storage
,
storage
.
getCid
()
);
dataCache
.
reloadStorage
(
storage
,
""
);
}
}
return
ResultBean
.
newOkResult
(
""
);
return
ResultBean
.
newOkResult
(
""
);
...
@@ -235,7 +235,7 @@ public class StoragePosController {
...
@@ -235,7 +235,7 @@ public class StoragePosController {
DeviceMessageUtil
.
addEnabledPosMessage
(
pos
,
SecurityUtils
.
getCurrentUsername
());
DeviceMessageUtil
.
addEnabledPosMessage
(
pos
,
SecurityUtils
.
getCurrentUsername
());
Storage
storage
=
dataCache
.
getStorageById
(
pos
.
getStorageId
());
Storage
storage
=
dataCache
.
getStorageById
(
pos
.
getStorageId
());
if
(
storage
!=
null
){
if
(
storage
!=
null
){
dataCache
.
reloadStorage
(
storage
,
storage
.
getCid
()
);
dataCache
.
reloadStorage
(
storage
,
""
);
}
}
return
ResultBean
.
newOkResult
(
""
);
return
ResultBean
.
newOkResult
(
""
);
}
}
...
@@ -257,7 +257,7 @@ public class StoragePosController {
...
@@ -257,7 +257,7 @@ public class StoragePosController {
DeviceMessageUtil
.
addEnabledPosMessage
(
pos
,
SecurityUtils
.
getCurrentUsername
());
DeviceMessageUtil
.
addEnabledPosMessage
(
pos
,
SecurityUtils
.
getCurrentUsername
());
}
}
for
(
Storage
storage
:
dataCache
.
getAllStorage
().
values
())
{
for
(
Storage
storage
:
dataCache
.
getAllStorage
().
values
())
{
dataCache
.
reloadStorage
(
storage
,
storage
.
getCid
()
);
dataCache
.
reloadStorage
(
storage
,
""
);
}
}
return
ResultBean
.
newOkResult
(
""
);
return
ResultBean
.
newOkResult
(
""
);
}
}
...
...
src/main/java/com/neotel/smfcore/core/system/util/TaskService.java
查看文件 @
b543ae5
...
@@ -279,7 +279,7 @@ public class TaskService {
...
@@ -279,7 +279,7 @@ public class TaskService {
DeviceMessageUtil
.
addEnabledPosMessage
(
pos
,
SecurityUtils
.
getCurrentUsername
());
DeviceMessageUtil
.
addEnabledPosMessage
(
pos
,
SecurityUtils
.
getCurrentUsername
());
Storage
storage
=
dataCache
.
getStorageById
(
pos
.
getStorageId
());
Storage
storage
=
dataCache
.
getStorageById
(
pos
.
getStorageId
());
if
(
storage
!=
null
)
{
if
(
storage
!=
null
)
{
dataCache
.
reloadStorage
(
storage
,
storage
.
getCid
()
);
dataCache
.
reloadStorage
(
storage
,
""
);
}
}
}
}
}
}
...
...
src/main/java/com/neotel/smfcore/custom/micron20031/MicronSpLoadController.java
查看文件 @
b543ae5
...
@@ -107,7 +107,7 @@ public class MicronSpLoadController {
...
@@ -107,7 +107,7 @@ public class MicronSpLoadController {
storage
.
setInListName
(
matReqNo
);
storage
.
setInListName
(
matReqNo
);
log
.
info
(
"设置料仓["
+
storage
.
getName
()
+
"]的入库单为:["
+
matReqNo
+
"],同时更新入库单开始时间"
);
log
.
info
(
"设置料仓["
+
storage
.
getName
()
+
"]的入库单为:["
+
matReqNo
+
"],同时更新入库单开始时间"
);
storageManager
.
save
(
storage
);
storageManager
.
save
(
storage
);
dataCache
.
reloadStorage
(
storage
,
storage
.
getCid
()
);
dataCache
.
reloadStorage
(
storage
,
""
);
return
ResultBean
.
newOkResult
(
matReqNo
);
return
ResultBean
.
newOkResult
(
matReqNo
);
}
}
...
@@ -124,7 +124,7 @@ public class MicronSpLoadController {
...
@@ -124,7 +124,7 @@ public class MicronSpLoadController {
storage
.
setInListName
(
""
);
storage
.
setInListName
(
""
);
log
.
info
(
"设置料仓["
+
storage
.
getName
()
+
"]开始 return "
);
log
.
info
(
"设置料仓["
+
storage
.
getName
()
+
"]开始 return "
);
storageManager
.
save
(
storage
);
storageManager
.
save
(
storage
);
dataCache
.
reloadStorage
(
storage
,
storage
.
getCid
()
);
dataCache
.
reloadStorage
(
storage
,
""
);
return
ResultBean
.
newOkResult
(
""
);
return
ResultBean
.
newOkResult
(
""
);
}
}
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论