licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

不查不要求报工的补充

Browse Source
This commit is contained in:
Ledo 2025-03-05 10:02:40 +08:00
parent 7e7b2e633b
commit 3d2134ef9a
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
View File

@ -76,12 +76,20 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
}*/ }*/
default TaskDispatchDetailDO selectBeforeDo(TaskDispatchDetailDO taskDispatchDetailDO){ default TaskDispatchDetailDO selectBeforeDo(TaskDispatchDetailDO taskDispatchDetailDO){
MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>(); MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>();
query.leftJoin(ProcedureDO.class,"a",ProcedureDO::getId,TaskDispatchDetailDO::getProcedureId) query.selectAll(TaskDispatchDetailDO.class).leftJoin(ProcedureDO.class,"a",ProcedureDO::getId,TaskDispatchDetailDO::getProcedureId)
.eq(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort() - 1) .eq(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort() - 1)
.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId()) .eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId())
.eq(TaskDispatchDetailDO::getProcedureStatus, 2); .eq(TaskDispatchDetailDO::getProcedureStatus, 2);
return selectOne(query); return selectOne(query);
} }
default TaskDispatchDetailDO selectNoReportBeforeDo(TaskDispatchDetailDO taskDispatchDetailDO){
MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>();
query.selectAll(TaskDispatchDetailDO.class).leftJoin(ProcedureDO.class,"a",ProcedureDO::getId,TaskDispatchDetailDO::getProcedureId)
.eq(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort() - 1)
.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId())
.eq(ProcedureDO::getIsReport,0);
return selectOne(query);
}
default PageResult<TaskDispatchDetailDO> selectPageGroup(YgjxPageReqVO pageReqVO) { default PageResult<TaskDispatchDetailDO> selectPageGroup(YgjxPageReqVO pageReqVO) {
MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>(); MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>();
query.select( "DATE_FORMAT(t.create_time, '%Y-%m') as yearMonth,\n" + query.select( "DATE_FORMAT(t.create_time, '%Y-%m') as yearMonth,\n" +

15
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
View File

@ -369,12 +369,17 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
// .eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId()) // .eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId())
// .eq(TaskDispatchDetailDO::getProcedureStatus, 2) // .eq(TaskDispatchDetailDO::getProcedureStatus, 2)
// ); // );
TaskDispatchDetailDO taskDispatchDetailDO1 = taskDispatchDetailMapper.selectBeforeDo(taskDispatchDetailDO); TaskDispatchDetailDO taskDispatchDetailDO2 = taskDispatchDetailMapper.selectNoReportBeforeDo(taskDispatchDetailDO);
if (taskDispatchDetailDO1 == null){ if (taskDispatchDetailDO2 != null){
//查不出来上一道工序已完工就代表它没完成
taskDispatchDetailDO.setBeforeProcedureStatus(0);
}else{
taskDispatchDetailDO.setBeforeProcedureStatus(1); taskDispatchDetailDO.setBeforeProcedureStatus(1);
}else{
TaskDispatchDetailDO taskDispatchDetailDO1 = taskDispatchDetailMapper.selectBeforeDo(taskDispatchDetailDO);
if (taskDispatchDetailDO1 == null){
//查不出来上一道工序已完工就代表它没完成
taskDispatchDetailDO.setBeforeProcedureStatus(0);
}else{
taskDispatchDetailDO.setBeforeProcedureStatus(1);
}
} }
}else{ }else{
taskDispatchDetailDO.setBeforeProcedureStatus(1); taskDispatchDetailDO.setBeforeProcedureStatus(1);