Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

999库巡检工单生成BUG解决

Browse Source
orign^2
wws 1 year ago
parent 84bbed960a
commit 6048b4cb4a
1 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File

75
op-modules/op-device/src/main/java/com/op/device/service/impl/DeviceTaskServiceImpl.java
Unescape Escape View File

@ -78,9 +78,10 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
private EquSpareApplyMapper equSpareApplyMapper; private EquSpareApplyMapper equSpareApplyMapper;
@Autowired @Autowired
private SparePartsLedgerMapper sparePartsLedgerMapper; private SparePartsLedgerMapper sparePartsLedgerMapper;
/** /**
* 根据点检计划生成点检任务 * 根据点检计划生成点检任务
* **/ **/
@Override @Override
public AjaxResult createSpotCheckPlanTask() { public AjaxResult createSpotCheckPlanTask() {
@ -111,7 +112,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
/** /**
* 根据巡检计划生成点检任务 * 根据巡检计划生成点检任务
* **/ **/
@Override @Override
public AjaxResult createPatrolCheckPlanTask() { public AjaxResult createPatrolCheckPlanTask() {
@ -127,11 +128,9 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
new LinkedBlockingQueue<Runnable>()); new LinkedBlockingQueue<Runnable>());
try { try {
dateSources.forEach(dateSource -> { dateSources.forEach(dateSource -> {
if("ds_1000".equals(dateSource.get("poolName"))){//TODO生产去掉 logger.info("++++++++++++" + dateSource.get("poolName") + "++++巡检开始++++++++++");
logger.info("++++++++++++" + dateSource.get("poolName") + "++++巡检开始++++++++++"); Runnable run = () -> createPatrolCheckPlanFunc(dateSource.get("poolName"));
Runnable run = () -> createPatrolCheckPlanFunc(dateSource.get("poolName")); executorService.execute(run);
executorService.execute(run);
}
}); });
} catch (Exception e) { } catch (Exception e) {
logger.error("service == dataClearTask == exception", e); logger.error("service == dataClearTask == exception", e);
@ -144,7 +143,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
/** /**
* 根据保养计划生成点检任务 * 根据保养计划生成点检任务
* **/ **/
@Override @Override
public AjaxResult createMaintenancePlanTask() { public AjaxResult createMaintenancePlanTask() {
@ -173,19 +172,19 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
return success(); return success();
} }
public void createSpotCheckPlanFunc(String poolName){ public void createSpotCheckPlanFunc(String poolName) {
DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key
/**equ_plan equ_plan_equ**/ /**equ_plan equ_plan_equ**/
EquPlan equPlan = new EquPlan(); EquPlan equPlan = new EquPlan();
equPlan.setPlanType("spotInspection"); equPlan.setPlanType("spotInspection");
List<EquPlan> plans = deviceTaskMapper.getPlans(equPlan); List<EquPlan> plans = deviceTaskMapper.getPlans(equPlan);
for(EquPlan plan:plans){ for (EquPlan plan : plans) {
EquOrder hasTask = deviceTaskMapper.getNewTaskOrder(plan); EquOrder hasTask = deviceTaskMapper.getNewTaskOrder(plan);
if(hasTask==null || Integer.parseInt(plan.getPlanLoop())<= hasTask.getDays()){ if (hasTask == null || Integer.parseInt(plan.getPlanLoop()) <= hasTask.getDays()) {
//生成点检计划 //生成点检计划
int m = this.createOrderPlan(plan); int m = this.createOrderPlan(plan);
if(m==0){ if (m == 0) {
error("equ_order相关添加失败"); error("equ_order相关添加失败");
} }
} }
@ -193,19 +192,19 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
logger.info("++++++++++++" + poolName + "++++点检结束++++++++++"); logger.info("++++++++++++" + poolName + "++++点检结束++++++++++");
} }
public void createPatrolCheckPlanFunc(String poolName){ public void createPatrolCheckPlanFunc(String poolName) {
DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key
/**equ_plan equ_plan_equ**/ /**equ_plan equ_plan_equ**/
EquPlan equPlan = new EquPlan(); EquPlan equPlan = new EquPlan();
equPlan.setPlanType("inspection"); equPlan.setPlanType("inspection");
List<EquPlan> plans = deviceTaskMapper.getPlans(equPlan); List<EquPlan> plans = deviceTaskMapper.getPlans(equPlan);
for(EquPlan plan:plans){ for (EquPlan plan : plans) {
EquOrder hasTask = deviceTaskMapper.getNewTaskOrder(plan); EquOrder hasTask = deviceTaskMapper.getNewTaskOrder(plan);
if(hasTask==null || Integer.parseInt(plan.getPlanLoop())<= hasTask.getDays()){ if (hasTask == null || Integer.parseInt(plan.getPlanLoop()) <= hasTask.getDays()) {
//生成巡检计划 //生成巡检计划
int m = this.createOrderPlan(plan); int m = this.createOrderPlan(plan);
if(m==0){ if (m == 0) {
error("equ_order相关添加失败"); error("equ_order相关添加失败");
} }
} }
@ -213,29 +212,29 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
logger.info("++++++++++++" + poolName + "++++巡检结束++++++++++"); logger.info("++++++++++++" + poolName + "++++巡检结束++++++++++");
} }
public void createMaintenancePlanFunc(String poolName){ public void createMaintenancePlanFunc(String poolName) {
DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key DynamicDataSourceContextHolder.push(poolName);// 这是数据源的key
/**equ_plan equ_plan_equ**/ /**equ_plan equ_plan_equ**/
EquPlan equPlan = new EquPlan(); EquPlan equPlan = new EquPlan();
equPlan.setPlanType("maintenance"); equPlan.setPlanType("maintenance");
List<EquPlan> plans = deviceTaskMapper.getPlans(equPlan); List<EquPlan> plans = deviceTaskMapper.getPlans(equPlan);
for(EquPlan plan:plans){ for (EquPlan plan : plans) {
EquOrder hasTask = null; EquOrder hasTask = null;
if("1".equals(plan.getCalculationRule())){ if ("1".equals(plan.getCalculationRule())) {
//根据order_start//1按上次保养时间 //根据order_start//1按上次保养时间
hasTask = deviceTaskMapper.getNewTaskOrder0(plan); hasTask = deviceTaskMapper.getNewTaskOrder0(plan);
}else if("0".equals(plan.getCalculationRule())){ } else if ("0".equals(plan.getCalculationRule())) {
//根据createTime//0按固定周期 //根据createTime//0按固定周期
hasTask = deviceTaskMapper.getNewTaskOrder(plan); hasTask = deviceTaskMapper.getNewTaskOrder(plan);
}else if("2".equals(plan.getCalculationRule())){ } else if ("2".equals(plan.getCalculationRule())) {
//单次生成保养计划 //单次生成保养计划
} }
if(hasTask==null || Integer.parseInt(plan.getPlanLoop())<= hasTask.getDays()){ if (hasTask == null || Integer.parseInt(plan.getPlanLoop()) <= hasTask.getDays()) {
//生成保养计划 //生成保养计划
int m = this.createOrderPlan(plan); int m = this.createOrderPlan(plan);
if(m==0){ if (m == 0) {
error("equ_order相关添加失败"); error("equ_order相关添加失败");
} }
} }
@ -243,7 +242,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
logger.info("++++++++++++" + poolName + "++++保养结束++++++++++"); logger.info("++++++++++++" + poolName + "++++保养结束++++++++++");
} }
private int createOrderPlan(EquPlan plan){ private int createOrderPlan(EquPlan plan) {
Date nowtime = DateUtils.getNowDate(); Date nowtime = DateUtils.getNowDate();
String createBy = "job"; String createBy = "job";
String factory = plan.getFactoryCode(); String factory = plan.getFactoryCode();
@ -251,21 +250,21 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
/**equ_plan->equ_order********************************************************************/ /**equ_plan->equ_order********************************************************************/
EquOrder order = new EquOrder(); EquOrder order = new EquOrder();
//源->目标 //源->目标
BeanUtils.copyProperties(plan,order); BeanUtils.copyProperties(plan, order);
order.setOrderId(IdUtils.fastSimpleUUID()); order.setOrderId(IdUtils.fastSimpleUUID());
order.setCreateBy(createBy); order.setCreateBy(createBy);
order.setCreateTime(nowtime); order.setCreateTime(nowtime);
// 流水号 // 流水号
String serialNum = String.format("%03d",equOrderMapper.selectSerialNumber()); String serialNum = String.format("%03d", equOrderMapper.selectSerialNumber());
String orderCode = "O"+DateUtils.dateTimeNow(DateUtils.YYYYMMDD)+serialNum; String orderCode = "O" + DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + serialNum;
order.setOrderCode(orderCode); order.setOrderCode(orderCode);
if("1".equals(plan.getUpkeep())) {//1委外工单 if ("1".equals(plan.getUpkeep())) {//1委外工单
order.setOutsourceCode("BW"+orderCode); order.setOutsourceCode("BW" + orderCode);
} }
/**equ_order**/ /**equ_order**/
sce = equOrderMapper.insertEquOrder(order); sce = equOrderMapper.insertEquOrder(order);
System.out.println(plan.getPlanCode()+"========equ_order:"+sce); System.out.println(plan.getPlanCode() + "========equ_order:" + sce);
/**equ_plan_equ_spare->equ_spare_apply*************************************************************/ /**equ_plan_equ_spare->equ_spare_apply*************************************************************/
EquPlanEquSpare equPlanEquSpare = new EquPlanEquSpare(); EquPlanEquSpare equPlanEquSpare = new EquPlanEquSpare();
equPlanEquSpare.setParentCode(plan.getPlanEquId()); equPlanEquSpare.setParentCode(plan.getPlanEquId());
@ -276,7 +275,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
for (EquPlanEquSpare spare : spares) { for (EquPlanEquSpare spare : spares) {
EquSpareApply apply = new EquSpareApply(); EquSpareApply apply = new EquSpareApply();
apply.setApplyId(IdUtils.fastSimpleUUID()); apply.setApplyId(IdUtils.fastSimpleUUID());
apply.setApplyCode("A"+orderCode+String.format("%02d",applySerialNum)); apply.setApplyCode("A" + orderCode + String.format("%02d", applySerialNum));
applySerialNum++; applySerialNum++;
apply.setSpareCode(spare.getMaterialCode()); apply.setSpareCode(spare.getMaterialCode());
apply.setSpareName(spare.getMaterialDesc()); apply.setSpareName(spare.getMaterialDesc());
@ -310,13 +309,13 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
List<EquPlanStandard> standards = new ArrayList<>(); List<EquPlanStandard> standards = new ArrayList<>();
List<EquPlanStandard> standards0 = null; List<EquPlanStandard> standards0 = null;
for(EquPlanDetail itme:details){ for (EquPlanDetail itme : details) {
String detailId = IdUtils.fastSimpleUUID(); String detailId = IdUtils.fastSimpleUUID();
EquPlanStandard standardqo = new EquPlanStandard(); EquPlanStandard standardqo = new EquPlanStandard();
//equ_plan_detail的id //equ_plan_detail的id
standardqo.setParentCode(itme.getId()); standardqo.setParentCode(itme.getId());
standards0 = equPlanStandardMapper.selectEquPlanStandardList(standardqo); standards0 = equPlanStandardMapper.selectEquPlanStandardList(standardqo);
for(EquPlanStandard standard:standards0) { for (EquPlanStandard standard : standards0) {
standard.setId(IdUtils.fastSimpleUUID()); standard.setId(IdUtils.fastSimpleUUID());
standard.setCreateTime(nowtime); standard.setCreateTime(nowtime);
standard.setCreateBy(createBy); standard.setCreateBy(createBy);
@ -332,19 +331,19 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
itme.setDelFlag("0"); itme.setDelFlag("0");
itme.setParentCode(orderCode); itme.setParentCode(orderCode);
} }
if(!CollectionUtils.isEmpty(details)) { if (!CollectionUtils.isEmpty(details)) {
sce = equOrderDetailMapper.insertEquOrderDetails(details); sce = equOrderDetailMapper.insertEquOrderDetails(details);
System.out.println(plan.getPlanCode() + "========equ_order_detail:" + sce); System.out.println(plan.getPlanCode() + "========equ_order_detail:" + sce);
} }
/**equ_plan_standard->equ_order_standard*******************************************************/ /**equ_plan_standard->equ_order_standard*******************************************************/
if(!CollectionUtils.isEmpty(standards)) { if (!CollectionUtils.isEmpty(standards)) {
sce = equOrderStandardMapper.insertEquOrderStandards(standards); sce = equOrderStandardMapper.insertEquOrderStandards(standards);
System.out.println(plan.getPlanCode() + "========equ_order_standard:" + sce); System.out.println(plan.getPlanCode() + "========equ_order_standard:" + sce);
} }
/**equ_plan_person->equ_order_standard*********************************************************/ /**equ_plan_person->equ_order_standard*********************************************************/
if("1".equals(plan.getUpkeep())){//1委外 if ("1".equals(plan.getUpkeep())) {//1委外
EquOutsourceWork equOutsourceWork = new EquOutsourceWork(); EquOutsourceWork equOutsourceWork = new EquOutsourceWork();
BeanUtils.copyProperties(plan,equOutsourceWork); BeanUtils.copyProperties(plan, equOutsourceWork);
equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID()); equOutsourceWork.setWorkId(IdUtils.fastSimpleUUID());
equOutsourceWork.setWorkCode(order.getOutsourceCode()); equOutsourceWork.setWorkCode(order.getOutsourceCode());
equOutsourceWork.setWorkType("1");//1委外保养0委外维修 equOutsourceWork.setWorkType("1");//1委外保养0委外维修
@ -354,7 +353,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService {
equOutsourceWork.setRepairCode(orderCode); equOutsourceWork.setRepairCode(orderCode);
sce = equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork); sce = equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork);
System.out.println(plan.getPlanCode() + "========equ_outsource_work:" + sce); System.out.println(plan.getPlanCode() + "========equ_outsource_work:" + sce);
}else { } else {
EquPlanPerson equPlanPerson = new EquPlanPerson(); EquPlanPerson equPlanPerson = new EquPlanPerson();
equPlanPerson.setPlanCode(plan.getPlanCode()); equPlanPerson.setPlanCode(plan.getPlanCode());
List<EquPlanPerson> persons = equPlanPersonMapper.selectEquPlanPersonList(equPlanPerson); List<EquPlanPerson> persons = equPlanPersonMapper.selectEquPlanPersonList(equPlanPerson);

Write Preview
Loading…
Cancel
Save