diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java index 945dabb..cb4fb7b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDO.java @@ -93,7 +93,8 @@ public class TaskDispatchDO extends BaseDO { @TableField(exist = false) private String projectSubCode; - + @TableField(exist = false) + private String name; @TableField(exist = false) private String planCode; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java index 9ca27aa..05b9a56 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java @@ -302,12 +302,12 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { LocalDateTime projectEndTime = deliverOrderDO.getProjectEndTime(); LocalDate projectEndDay = projectEndTime.toLocalDate(); if (today.equals(projectEndDay.minusDays(1))) { - BdgzsomthingDO.setThings("生产任务单编号:"+deliverOrderDO.getCode()+"生产任务单明天到期");//事件名称 + BdgzsomthingDO.setThings("生产任务单编号:"+deliverOrderDO.getCode()+" 工序:"+deliverOrderDO.getName()+"明天到期");//事件名称 } else if (today.equals(projectEndDay)) { - BdgzsomthingDO.setThings("生产任务单编号:"+deliverOrderDO.getCode()+"生产任务单今日到期");//事件名称 + BdgzsomthingDO.setThings("生产任务单编号:"+deliverOrderDO.getCode()+" 工序:"+deliverOrderDO.getName()+"今日到期");//事件名称 System.out.println("projectEndTime 是今天"); } else if (today.isAfter(projectEndDay)) { - BdgzsomthingDO.setThings("生产任务单编号:"+deliverOrderDO.getCode()+"生产任务单已逾期");//事件名称 + BdgzsomthingDO.setThings("生产任务单编号:"+deliverOrderDO.getCode()+" 工序:"+deliverOrderDO.getName()+"已逾期");//事件名称 }else{ BdgzsomthingDO.setAttr4("1"); } @@ -402,11 +402,11 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { LocalDateTime projectEndTime = deliverOrderDO.getProjectEndTime(); LocalDate projectEndDay = projectEndTime.toLocalDate(); if (today5.equals(projectEndDay.minusDays(1))) { - BdgzsomthingDO.setThings("装配任务单编号:"+deliverOrderDO.getCode()+"装配任务单明天到期");//事件名称 + BdgzsomthingDO.setThings("装配任务单编号:"+deliverOrderDO.getCode()+" 工序:"+deliverOrderDO.getName()+"装配任务单明天到期");//事件名称 } else if (today5.equals(projectEndDay)) { - BdgzsomthingDO.setThings("装配任务单编号:"+deliverOrderDO.getCode()+"装配任务单今日到期");//事件名称 + BdgzsomthingDO.setThings("装配任务单编号:"+deliverOrderDO.getCode()+" 工序:"+deliverOrderDO.getName()+"今日到期");//事件名称 } else if (today5.isAfter(projectEndDay)) { - BdgzsomthingDO.setThings("装配任务单编号:"+deliverOrderDO.getCode()+"装配任务单已逾期");//事件名称 + BdgzsomthingDO.setThings("装配任务单编号:"+deliverOrderDO.getCode()+" 工序:"+deliverOrderDO.getName()+"已逾期");//事件名称 }else{ BdgzsomthingDO.setAttr4("1"); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java index 574d820..1906b35 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processbom/ProcessBomServiceImpl.java @@ -30,6 +30,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDeta import com.chanko.yunxi.mes.module.heli.dal.dataobject.shenhe.ShenheDO; import com.chanko.yunxi.mes.module.heli.dal.mysql.attentiontodo.AttentiontodoMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.bdgzsomthing.bdgzsomthingMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.plan.PlanMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.plantask.PlanTaskMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomDetailMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomMapper; @@ -103,6 +104,8 @@ public class ProcessBomServiceImpl implements ProcessBomService { private DictDataMapper dictDataMapper; @Resource private AdminUserService adminUserService; + @Resource + private PlanMapper planMapper; @Override @Transactional(rollbackFor = Exception.class) public Long createProcessBom(ProcessBomSaveReqVO createReqVO) { @@ -563,9 +566,10 @@ public class ProcessBomServiceImpl implements ProcessBomService { } if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())){ - ProcessBomDO processBomDO = processBomMapper.selectById(updateReqVO.getId()); - if (ObjectUtil.isNotEmpty(processBomDO)){ - AdminUserDO user = adminUserService.getUser(Long.valueOf(processBomDO.getCreator())); +// ProcessBomDO processBomDO = processBomMapper.selectById(updateReqVO.getId()); + PlanDO planDO = planMapper.selectOne(new LambdaQueryWrapper().eq(PlanDO::getPlanNo, getplanid.getPlanNo())); + if (ObjectUtil.isNotEmpty(planDO)){ + AdminUserDO user = adminUserService.getUser(Long.valueOf(planDO.getCreator())); if (ObjectUtil.isNotEmpty(user)){ BdgzsomthingDO.setClick(user.getNickname()); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchMapper.xml index 3d22792..e0280a1 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/taskdispatch/TaskDispatchMapper.xml @@ -19,9 +19,10 @@ - select c.code,d.end_time project_end_time from pro_task_dispatch c,(SELECT b.*, COALESCE(SUM(a.amount), 0) AS total_amount + select c.code,d.end_time project_end_time,d.name from pro_task_dispatch c,(SELECT b.*,c.name as name, COALESCE(SUM(a.amount), 0) AS total_amount FROM pro_task_dispatch_detail b LEFT JOIN pro_task_report a ON a.dispatch_detail_id = b.id + LEFT JOIN base_procedure c ON b.procedure_id=c.id WHERE b.end_time <= DATE_ADD(CURDATE(), INTERVAL 1 DAY) and b.tenant_id =#{param1} and b.procedure_status!=2 GROUP BY b.id HAVING COALESCE(SUM(a.amount), 0) < b.amount) d @@ -54,9 +55,10 @@ - select c.code,d.end_time project_end_time from pro_task_dispatch c,(SELECT b.*, COALESCE(SUM(a.amount), 0) AS total_amount + select c.code,d.end_time project_end_time from pro_task_dispatch c,d.name(SELECT b.*, ,c.name as name,COALESCE(SUM(a.amount), 0) AS total_amount FROM pro_task_dispatch_detail b LEFT JOIN pro_task_report a ON a.dispatch_detail_id = b.id + LEFT JOIN base_procedure c ON b.procedure_id=c.id WHERE b.end_time <= DATE_ADD(CURDATE(), INTERVAL 1 DAY) and b.tenant_id =#{param1} and b.procedure_status!=2 GROUP BY b.id HAVING COALESCE(SUM(a.amount), 0) < b.amount) d diff --git a/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue b/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue index fdef46f..3671c90 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue @@ -758,6 +758,11 @@ const handlePaysee =async (row: any) => { router.push({ path: '/quality/unqualifiedNotificationApprove', state: { idid: row.idid } }); await bdgzsomthingApi.updatebdgzsomthingbyidoneandok(row.id) //直接修改取消显示 } + if (row.type == 'BOM变更审核') { + // router.push({ path: '/processDesign/heli/processdesign/bomShenhe', state: { idid: row.idid } }); + // router.push({ path: '/processDesign/heli/processdesign/bomShenhe', state: { idid: row.idid } }); + await bdgzsomthingApi.updatebdgzsomthingbyidoneandok(row.id) //直接修改取消显示 + } if (row.type == '装配任务到期'){ await bdgzsomthingApi.updatebdgzsomthingbyidoneandok(row.id) //直接修改取消显示 }