Commit 38112736 authored by KeYong's avatar KeYong

修改装备更新bug

parent 16bd0f69
...@@ -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数据
......
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