|
|
|
@ -484,12 +484,14 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan |
|
|
|
// 查询所有未解绑的数据
|
|
|
|
// 查询所有未解绑的数据
|
|
|
|
List<MacToolUse> mtuList = macToolUseService.listByNoFinished(); |
|
|
|
List<MacToolUse> mtuList = macToolUseService.listByNoFinished(); |
|
|
|
if (mtuList == null || mtuList.isEmpty()) { |
|
|
|
if (mtuList == null || mtuList.isEmpty()) { |
|
|
|
|
|
|
|
log.error("未查询到已绑定数据"); |
|
|
|
return true; |
|
|
|
return true; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 查询所有的配置项
|
|
|
|
// 查询所有的配置项
|
|
|
|
List<Dict> configs = DictCache.getList(DictEnum.UNBIND_CONFIG.getName()); |
|
|
|
List<Dict> configs = DictCache.getList(DictEnum.UNBIND_CONFIG.getName()); |
|
|
|
if (configs == null || configs.isEmpty()) { |
|
|
|
if (configs == null || configs.isEmpty()) { |
|
|
|
|
|
|
|
log.error("解绑配置为空"); |
|
|
|
return true; |
|
|
|
return true; |
|
|
|
} |
|
|
|
} |
|
|
|
Map<String, Integer> ucMap = new LinkedHashMap<>(); |
|
|
|
Map<String, Integer> ucMap = new LinkedHashMap<>(); |
|
|
|
@ -529,6 +531,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan |
|
|
|
list.add(mtu); |
|
|
|
list.add(mtu); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
log.info("本次待解绑数量:{}", list.size()); |
|
|
|
if (list.isEmpty()) { |
|
|
|
if (list.isEmpty()) { |
|
|
|
return true; |
|
|
|
return true; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -565,6 +568,7 @@ public class PdaSaveServiceImpl extends BaseServiceImpl<WorkPlanMapper, WorkPlan |
|
|
|
equipmentService.updateById(dec); |
|
|
|
equipmentService.updateById(dec); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
log.info("自动解绑完成"); |
|
|
|
return true; |
|
|
|
return true; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|