Skip to content

A
amos-boot-biz
Commit 328fb53e authored by KeYong's avatar KeYong
Browse files
Options

Merge branch 'develop_station' into developer

parents 83269f1c 38112736
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java
View file @ 328fb53e
...@@ -277,7 +277,9 @@ public class EquipmentDetailController extends AbstractBaseController { ...@@ -277,7 +277,9 @@ public class EquipmentDetailController extends AbstractBaseController {
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数据
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment