Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
smf-core
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 63168527
由
zshaohui
编写于
2023-02-15 17:29:45 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
库位批量启动或禁用
1 个父辈
59765f11
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
44 行增加
和
0 行删除
src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java
src/main/java/com/neotel/smfcore/core/storage/rest/dto/StoragePosEnabledDto.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/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java
查看文件 @
6316852
...
...
@@ -31,6 +31,7 @@ import com.neotel.smfcore.core.storage.service.po.Storage;
import
com.neotel.smfcore.core.storage.service.po.StoragePos
;
import
com.neotel.smfcore.core.system.util.TaskService
;
import
com.neotel.smfcore.custom.siemens.SiemensApi
;
import
com.neotel.smfcore.security.annotation.AnonymousAccess
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.RequiredArgsConstructor
;
...
...
@@ -239,6 +240,27 @@ public class StoragePosController {
return
ResultBean
.
newOkResult
(
""
);
}
@ApiOperation
(
"批量启用或禁用库位"
)
@PutMapping
(
"/batchEnabledOrDisabledPos"
)
@PreAuthorize
(
"@el.check('storagePos:edit')"
)
public
ResultBean
batchEnabledOrDisabledPos
(
@RequestBody
StoragePosEnabledDto
enabledDto
)
{
List
<
String
>
idList
=
enabledDto
.
getIdList
();
if
(
idList
==
null
||
idList
.
isEmpty
())
{
return
ResultBean
.
newErrorResult
(
1
,
"smfcore.valueCanotNull"
,
"{0}不能为空"
,
new
String
[]{
"ID"
});
}
storagePosManager
.
batchUpdatePosEnabled
(
idList
,
enabledDto
.
isEnabled
());
//查询库位具体信息,更新缓存
List
<
StoragePos
>
posList
=
storagePosManager
.
findPosByIdList
(
idList
);
for
(
StoragePos
pos
:
posList
)
{
dataCache
.
updateDisablePos
(
pos
);
log
.
info
(
"启用或禁用库位:库位号["
+
pos
.
getId
()
+
"]["
+
pos
.
getPosName
()
+
"]="
+
enabledDto
.
isEnabled
());
DeviceMessageUtil
.
addEnabledPosMessage
(
pos
,
SecurityUtils
.
getCurrentUsername
());
}
for
(
Storage
storage
:
dataCache
.
getAllStorage
().
values
())
{
dataCache
.
reloadStorage
(
storage
,
storage
.
getCid
());
}
return
ResultBean
.
newOkResult
(
""
);
}
@ApiOperation
(
"修改库位"
)
@PutMapping
...
...
src/main/java/com/neotel/smfcore/core/storage/rest/dto/StoragePosEnabledDto.java
查看文件 @
6316852
...
...
@@ -5,6 +5,7 @@ import lombok.Getter;
import
lombok.Setter
;
import
java.io.Serializable
;
import
java.util.List
;
@Getter
@Setter
...
...
@@ -12,6 +13,9 @@ public class StoragePosEnabledDto implements Serializable {
@ApiModelProperty
(
"库位ID"
)
private
String
id
;
@ApiModelProperty
(
"库位ID列表"
)
private
List
<
String
>
idList
;
@ApiModelProperty
(
"启用/禁用"
)
private
boolean
enabled
=
true
;
}
src/main/java/com/neotel/smfcore/core/storage/service/manager/IStoragePosManager.java
查看文件 @
6316852
...
...
@@ -74,4 +74,8 @@ public interface IStoragePosManager extends IBaseManager<StoragePos> {
List
<
StoragePos
>
findDisabled
();
StoragePos
getEmptyWarmPos
(
Storage
storage
,
Barcode
barcode
,
Collection
<
String
>
excludePosIds
)
throws
ValidateException
;
void
batchUpdatePosEnabled
(
List
<
String
>
idList
,
boolean
enabled
);
List
<
StoragePos
>
findPosByIdList
(
List
<
String
>
idList
);
}
src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StoragePosManagerImpl.java
查看文件 @
6316852
...
...
@@ -622,4 +622,18 @@ public class StoragePosManagerImpl implements IStoragePosManager {
return
getEmptyPos
(
storage
,
barcode
,
excludePosIds
,
true
);
}
@Override
public
void
batchUpdatePosEnabled
(
List
<
String
>
idList
,
boolean
enabled
)
{
Query
query
=
new
Query
(
Criteria
.
where
(
"id"
).
in
(
idList
));
Update
update
=
new
Update
();
update
.
set
(
"enabled"
,
enabled
);
storagePosDao
.
updateMulti
(
query
,
update
);
}
@Override
public
List
<
StoragePos
>
findPosByIdList
(
List
<
String
>
idList
)
{
Query
query
=
new
Query
(
Criteria
.
where
(
"id"
).
in
(
idList
));
return
storagePosDao
.
findByQuery
(
query
);
}
}
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论