From 7e7b2e633b7e1e6b443ddc0b550db2f634cc01ba Mon Sep 17 00:00:00 2001 From: Ledo Date: Tue, 4 Mar 2025 21:36:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=8D=E6=9F=A5=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E6=8A=A5=E5=B7=A5=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaskDispatchDetailMapper.java | 24 +++++++++++++++++-- .../taskdispatch/TaskDispatchServiceImpl.java | 14 +++++------ 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java index d321062..7e1128f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java @@ -3,6 +3,7 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch; import cn.hutool.core.collection.CollUtil; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; +import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.TaskDispatchDetailPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.TaskDispatchDetailTotalVO; import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.TaskPlanJDBaoBiaoPageReqVO; @@ -73,7 +74,14 @@ public interface TaskDispatchDetailMapper extends BaseMapperX query = new MPJLambdaWrapper<>(); + query.leftJoin(ProcedureDO.class,"a",ProcedureDO::getId,TaskDispatchDetailDO::getProcedureId) + .eq(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort() - 1) + .eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId()) + .eq(TaskDispatchDetailDO::getProcedureStatus, 2); + return selectOne(query); + } default PageResult selectPageGroup(YgjxPageReqVO pageReqVO) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.select( "DATE_FORMAT(t.create_time, '%Y-%m') as yearMonth,\n" + @@ -274,7 +282,19 @@ public interface TaskDispatchDetailMapper extends BaseMapperX selectListByDispatchIdNew(Long dispatchId) { + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.selectAll(TaskDispatchDetailDO.class) + .select("a.is_report as is_report,a.code as procedure_code") + .select("count(b.amount) as numAmount") + .leftJoin(ProcedureDO.class,"a",ProcedureDO::getId,TaskDispatchDetailDO::getProcedureId) + .leftJoin(TaskReportDO.class,"b",TaskReportDO::getDispatchDetailId,TaskDispatchDetailDO::getId) + .eq(ProcedureDO::getIsReport,1) + .disableSubLogicDel() + .groupBy(TaskDispatchDetailDO::getId) + .eq(TaskDispatchDetailDO::getDispatchId, dispatchId); + return selectList(query); + } default int deleteByDispatchId(Long dispatchId) { return deleteById(dispatchId); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java index b24f82a..0768fe6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java @@ -364,12 +364,12 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { public TaskDispatchDetailDO getTaskDispatchDetail(TaskDispatchDetailPageReqVO pageReqVO){ TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectGet(pageReqVO); if (taskDispatchDetailDO.getSort()!=null&&taskDispatchDetailDO.getSort() != 1){ - TaskDispatchDetailDO taskDispatchDetailDO1 = taskDispatchDetailMapper.selectOne(new LambdaQueryWrapperX() - .eq(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort() - 1) - .eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId()) - .eq(TaskDispatchDetailDO::getProcedureStatus, 2) - ); - +// TaskDispatchDetailDO taskDispatchDetailDO1 = taskDispatchDetailMapper.selectOne(new LambdaQueryWrapperX() +// .eq(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort() - 1) +// .eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId()) +// .eq(TaskDispatchDetailDO::getProcedureStatus, 2) +// ); + TaskDispatchDetailDO taskDispatchDetailDO1 = taskDispatchDetailMapper.selectBeforeDo(taskDispatchDetailDO); if (taskDispatchDetailDO1 == null){ //查不出来上一道工序已完工就代表它没完成 taskDispatchDetailDO.setBeforeProcedureStatus(0); @@ -495,7 +495,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { .eq(TaskDispatchDO::getProjectSubId, taskDispatchDO.getProjectSubId()) .eq(TaskDispatchDO::getDispatchType,"ASSEMBLE")); //零件是否生产完成 - List taskDispatchDetailDOS = taskDispatchDetailMapper.selectListByDispatchId(taskDispatchDO.getId()); + List taskDispatchDetailDOS = taskDispatchDetailMapper.selectListByDispatchIdNew(taskDispatchDO.getId()); List productionList = taskDispatchDetailDOS.stream().filter(e -> !e.getId().equals(taskDispatchDetailDO.getId())).collect(Collectors.toList()); //过程检 零件所有生产派工完成生成 boolean isBomDetailProductionOver = true; From 3d2134ef9a2c8aea5b52197368b7ddd0f1e242e1 Mon Sep 17 00:00:00 2001 From: Ledo Date: Wed, 5 Mar 2025 10:02:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8D=E6=9F=A5=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E6=8A=A5=E5=B7=A5=E7=9A=84=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taskdispatch/TaskDispatchDetailMapper.java | 10 +++++++++- .../taskdispatch/TaskDispatchServiceImpl.java | 15 ++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java index 7e1128f..332b547 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java @@ -76,12 +76,20 @@ public interface TaskDispatchDetailMapper extends BaseMapperX 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::getDispatchId, taskDispatchDetailDO.getDispatchId()) .eq(TaskDispatchDetailDO::getProcedureStatus, 2); return selectOne(query); } + default TaskDispatchDetailDO selectNoReportBeforeDo(TaskDispatchDetailDO taskDispatchDetailDO){ + MPJLambdaWrapper 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 selectPageGroup(YgjxPageReqVO pageReqVO) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.select( "DATE_FORMAT(t.create_time, '%Y-%m') as yearMonth,\n" + diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java index 0768fe6..85912f9 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java @@ -369,12 +369,17 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { // .eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId()) // .eq(TaskDispatchDetailDO::getProcedureStatus, 2) // ); - TaskDispatchDetailDO taskDispatchDetailDO1 = taskDispatchDetailMapper.selectBeforeDo(taskDispatchDetailDO); - if (taskDispatchDetailDO1 == null){ - //查不出来上一道工序已完工就代表它没完成 - taskDispatchDetailDO.setBeforeProcedureStatus(0); - }else{ + TaskDispatchDetailDO taskDispatchDetailDO2 = taskDispatchDetailMapper.selectNoReportBeforeDo(taskDispatchDetailDO); + if (taskDispatchDetailDO2 != null){ taskDispatchDetailDO.setBeforeProcedureStatus(1); + }else{ + TaskDispatchDetailDO taskDispatchDetailDO1 = taskDispatchDetailMapper.selectBeforeDo(taskDispatchDetailDO); + if (taskDispatchDetailDO1 == null){ + //查不出来上一道工序已完工就代表它没完成 + taskDispatchDetailDO.setBeforeProcedureStatus(0); + }else{ + taskDispatchDetailDO.setBeforeProcedureStatus(1); + } } }else{ taskDispatchDetailDO.setBeforeProcedureStatus(1);