Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
38112736
Commit
38112736
authored
Mar 31, 2022
by
KeYong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改装备更新bug
parent
16bd0f69
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
EquipmentDetailController.java
...oin/equipmanage/controller/EquipmentDetailController.java
+4
-2
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java
View file @
38112736
...
@@ -222,14 +222,16 @@ public class EquipmentDetailController extends AbstractBaseController {
...
@@ -222,14 +222,16 @@ public class EquipmentDetailController extends AbstractBaseController {
if
(!
ObjectUtils
.
isEmpty
(
bean
))
{
if
(!
ObjectUtils
.
isEmpty
(
bean
))
{
equipmentSpecific
.
setEquipmentCode
(
bean
.
getCode
());
equipmentSpecific
.
setEquipmentCode
(
bean
.
getCode
());
}
}
Long
warehouseStructureId
=
ObjectUtils
.
isEmpty
(
equipmentSpecific
.
getStockDetail
())
?
null
:
equipmentSpecific
.
getStockDetail
().
getWarehouseStructureId
();
Long
warehouseStructureId
=
ObjectUtils
.
isEmpty
(
equipmentSpecific
.
getStockDetail
())
?
null
:
equipmentSpecific
.
getStockDetail
().
getWarehouseStructureId
();
if
(
warehouseStructureId
!=
null
)
{
if
(
warehouseStructureId
!=
null
)
{
WarehouseStructure
warehouseStructure
=
warehouseStructureService
.
getById
(
warehouseStructureId
);
WarehouseStructure
warehouseStructure
=
warehouseStructureService
.
getById
(
warehouseStructureId
);
if
(!
ObjectUtils
.
isEmpty
(
warehouseStructure
))
{
if
(!
ObjectUtils
.
isEmpty
(
warehouseStructure
))
{
equipmentSpecific
.
setPosition
(
warehouseStructure
.
getFullName
());
equipmentSpecific
.
setPosition
(
warehouseStructure
.
getFullName
());
}
}
}
}
equipmentSpecific
.
getStockDetail
().
setDescription
(
equipmentDetail
.
getArea
());
if
(!
ObjectUtils
.
isEmpty
(
equipmentSpecific
.
getStockDetail
()))
{
equipmentSpecific
.
getStockDetail
().
setDescription
(
equipmentDetail
.
getArea
());
}
equipmentSpecificSerivce
.
updateEquipmentSpecific
(
equipmentSpecific
,
getSelectedOrgInfo
(),
getUserInfo
());
equipmentSpecificSerivce
.
updateEquipmentSpecific
(
equipmentSpecific
,
getSelectedOrgInfo
(),
getUserInfo
());
// TODO 后续判断成功,执行同步
// TODO 后续判断成功,执行同步
// 编辑同步redis装备iotcode数据
// 编辑同步redis装备iotcode数据
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment