From e8c40da2228f45bb65876e5600f784e5347f1c69 Mon Sep 17 00:00:00 2001 From: z Date: Fri, 11 Jul 2025 13:54:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E8=B7=9F=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E4=BB=A5=E5=8F=8ABom=E7=BC=96=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fpuserdetail/vo/FpUserDetailRespVO.java | 9 ++ .../admin/fpuserdetail/vo/UserVo.java | 4 + .../vo/TaskDispatchDetailPageReqVO.java | 5 + .../fpuserdetail/FpUserDetailDO.java | 10 ++ .../fpuserdetail/FpUserDetailMapper.java | 5 +- .../dal/mysql/plantask/PlanTaskMapper.java | 4 +- .../processbom/ProcessBomDetailMapper.java | 4 +- .../mysql/processbom/ProcessBomMapper.java | 10 +- .../TaskDispatchDetailMapper.java | 34 ++++- .../fpuserdetail/FpUserDetailServiceImpl.java | 10 ++ .../service/pgmaster/PgMasterServiceImpl.java | 8 +- .../processbom/ProcessBomServiceImpl.java | 8 +- .../taskdispatch/TaskDispatchServiceImpl.java | 6 +- .../UnqualifiedNotificationServiceImpl.java | 3 +- .../UnqualifiedNotificationMapper.xml | 131 +++++++++--------- .../src/views/Home/Index.vue | 5 +- .../src/views/heli/fpuserdetail/edit.vue | 22 ++- .../src/views/heli/fpuserdetail/index.vue | 1 + .../views/heli/materialplan/management.vue | 2 +- .../heli/materialplan/partmanagement.vue | 2 +- .../src/views/heli/taskdispatch/assemble.vue | 2 +- .../src/views/heli/taskdispatch/detail.vue | 2 +- .../views/heli/taskdispatch/detailDialog.vue | 2 +- .../unqualifiednotification/statistic.vue | 2 +- .../pages/index/components/CategoryPanel.vue | 7 +- mes-ui/mini-app/src/pages/index/index.vue | 13 +- 26 files changed, 201 insertions(+), 110 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/vo/FpUserDetailRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/vo/FpUserDetailRespVO.java index 980bbda..c981d81 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/vo/FpUserDetailRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/vo/FpUserDetailRespVO.java @@ -51,5 +51,14 @@ public class FpUserDetailRespVO { @Schema(description = "主表备注", example = "你说的对") @ExcelProperty("备注") private String remarks; + @Schema(description = "工序id") + private Long procedureId; + @Schema(description = "工序编码") + private String code; + + @Schema(description = "工序名称") + private String procedureName; + + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/vo/UserVo.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/vo/UserVo.java index 51a2fe9..4812343 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/vo/UserVo.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/fpuserdetail/vo/UserVo.java @@ -10,6 +10,10 @@ public class UserVo { private Long busyId; @Schema(description = "岗位ID", example = "12927") private String postId; + @Schema(description = "工序id") + private Long procedureId; @Schema(description = "是否负责人") private String isRes; + + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskDispatchDetailPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskDispatchDetailPageReqVO.java index caad2b8..e9da92f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskDispatchDetailPageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskDispatchDetailPageReqVO.java @@ -6,7 +6,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.util.HashSet; import java.util.List; +import java.util.Set; @Schema(description = "管理后台 - 派工单分页 Request VO") @Data @@ -37,4 +39,7 @@ public class TaskDispatchDetailPageReqVO extends PageParam { @Schema(description = "项目或子项目id") private String subOrDetailName; + @Schema(description = "工序集合") + Set procedureIds; + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/fpuserdetail/FpUserDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/fpuserdetail/FpUserDetailDO.java index 98914fa..16ee662 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/fpuserdetail/FpUserDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/fpuserdetail/FpUserDetailDO.java @@ -53,6 +53,14 @@ public class FpUserDetailDO extends BaseDO { */ private String remark; + /** + * 工序id + */ + private Long procedureId; + /** + * 工序编码 + */ + private String code; @TableField(exist = false) private String nickName; @TableField(exist = false) @@ -61,4 +69,6 @@ public class FpUserDetailDO extends BaseDO { private String postName ; @TableField(exist = false) private String remarks; + @TableField(exist = false) + private String procedureName ; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/fpuserdetail/FpUserDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/fpuserdetail/FpUserDetailMapper.java index 5f640b2..685ec87 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/fpuserdetail/FpUserDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/fpuserdetail/FpUserDetailMapper.java @@ -8,6 +8,7 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.fpuserdetail.vo.FpUserD import com.chanko.yunxi.mes.module.heli.controller.admin.fpuserdetail.vo.FpUserDetailSaveReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.fpuser.FpUserDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.fpuserdetail.FpUserDetailDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO; import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; @@ -32,10 +33,12 @@ public interface FpUserDetailMapper extends BaseMapperX { default PageResult selectPage(FpUserDetailPageReqVO reqVO) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(FpUserDetailDO.class) - .select("u.nickname as nickName") + .select("u.nickname as nickName,p.name as procedureName") .select("a.type as type","a.remark as remarks") .leftJoin(AdminUserDO.class, "u", AdminUserDO::getId, FpUserDetailDO::getBusyId) .leftJoin(FpUserDO.class, "a", FpUserDO::getId, FpUserDetailDO::getFpId) + .leftJoin(ProcedureDO.class,"p",ProcedureDO::getId, FpUserDetailDO::getProcedureId) + .disableSubLogicDel() .orderByDesc(FpUserDetailDO::getId); query.like(!StringUtils.isEmpty(reqVO.getBusyId()), "u.nickname", reqVO.getBusyId()) .like(!StringUtils.isEmpty(reqVO.getPostId()),FpUserDetailDO::getPostId, reqVO.getPostId()) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plantask/PlanTaskMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plantask/PlanTaskMapper.java index 1acf13a..fd56c7d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plantask/PlanTaskMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/plantask/PlanTaskMapper.java @@ -34,7 +34,7 @@ public interface PlanTaskMapper extends BaseMapperX { query.selectAll(PlanTaskDO.class) .select("e.name as customerName","p.code as projectCode","p.project_name as projectName","p.project_end_time as projectEndTime") - .select("pl.plan_no as planNo","ps.project_sub_code as projectSubCode","po.name as projectSubName","concat('BOM-', ps.project_sub_code) as bomCode") + .select("pl.plan_no as planNo","ps.project_sub_code as projectSubCode","po.name as projectSubName"," ps.project_sub_code as bomCode") .leftJoin(PlanDO.class, "pl", PlanDO::getId, PlanTaskDO::getProjectPlanId) .leftJoin(PlanSubDO.class, "ps", PlanSubDO::getId, PlanTaskDO::getProjectPlanSubId) .leftJoin(ProjectOrderDO.class, "p", ProjectOrderDO::getId, PlanTaskDO::getProjectId) @@ -72,7 +72,7 @@ public interface PlanTaskMapper extends BaseMapperX { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(PlanTaskDO.class) .select("e.name as customerName","p.code as projectCode","p.project_name as projectName","p.project_end_time as projectEndTime") - .select("pl.plan_no as planNo","po.amount as projectSubNum","ps.project_sub_code as projectSubCode","po.name as projectSubName","concat('BOM-', ps.project_sub_code) as bomCode") + .select("pl.plan_no as planNo","po.amount as projectSubNum","ps.project_sub_code as projectSubCode","po.name as projectSubName"," ps.project_sub_code as bomCode") .leftJoin(PlanDO.class, "pl", PlanDO::getId, PlanTaskDO::getProjectPlanId) .leftJoin(PlanSubDO.class, "ps", PlanSubDO::getId, PlanTaskDO::getProjectPlanSubId) .leftJoin(ProjectOrderDO.class, "p", ProjectOrderDO::getId, PlanTaskDO::getProjectId) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomDetailMapper.java index dcfc88f..79ea996 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomDetailMapper.java @@ -93,7 +93,7 @@ public interface ProcessBomDetailMapper extends BaseMapperX default PageResult selectPageNew(ProcessBomPageReqVO reqVO) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(ProcessBomDetailDO.class) - .select("concat('BOM-', e.project_sub_code) as bomCode", "e.project_sub_code as projectSubCode") + .select("e.project_sub_code as bomCode", "e.project_sub_code as projectSubCode") .select("a.plan_no as planCode", "b.code as projectCode", "c.name as customerName", "b.project_name as projectName") .select("d.name as projectSubName,f.name as compositionName") @@ -108,7 +108,7 @@ public interface ProcessBomDetailMapper extends BaseMapperX .disableSubLogicDel() ; - query.and(!StringUtils.isEmpty(reqVO.getCode()), QueryWrapper -> QueryWrapper.apply("locate({0},concat('BOM-', e.project_sub_code )) > 0", reqVO.getCode())) + query.and(!StringUtils.isEmpty(reqVO.getCode()), QueryWrapper -> QueryWrapper.apply("locate({0}, e.project_sub_code ) > 0", reqVO.getCode())) .like(!StringUtils.isEmpty(reqVO.getPlanCode()), PlanDO::getPlanNo, reqVO.getPlanCode()) .like(!StringUtils.isEmpty(reqVO.getProjectCode()), ProjectOrderDO::getCode, reqVO.getProjectCode()) .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName()) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java index 9e10a49..330e638 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processbom/ProcessBomMapper.java @@ -69,7 +69,7 @@ public interface ProcessBomMapper extends BaseMapperX { default PageResult selectPages(ProcessBomPageReqVO reqVO) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(ProcessBomDO.class) - .select("concat('BOM-', e.project_sub_code) as bomCode", "e.project_sub_code as projectSubCode") + .select(" e.project_sub_code as bomCode", "e.project_sub_code as projectSubCode") // .select( "e.project_sub_code as projectSubCode") .select("a.plan_no as planCode", "b.code as projectCode", "c.name as customerName", "b.project_name as projectName") @@ -83,7 +83,7 @@ public interface ProcessBomMapper extends BaseMapperX { .disableSubLogicDel() ; - query.and(!StringUtils.isEmpty(reqVO.getCode()), QueryWrapper -> QueryWrapper.apply("locate({0},concat('BOM-', e.project_sub_code )) > 0", reqVO.getCode())) + query.and(!StringUtils.isEmpty(reqVO.getCode()), QueryWrapper -> QueryWrapper.apply("locate({0}, e.project_sub_code ) > 0", reqVO.getCode())) .like(!StringUtils.isEmpty(reqVO.getPlanCode()), PlanDO::getPlanNo, reqVO.getPlanCode()) .like(!StringUtils.isEmpty(reqVO.getProjectCode()), ProjectOrderDO::getCode, reqVO.getProjectCode()) .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName()) @@ -100,7 +100,7 @@ public interface ProcessBomMapper extends BaseMapperX { default PageResult selectPage(ProcessBomPageReqVO reqVO) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(ProcessBomDO.class) - .select("concat('BOM-', e.project_sub_code) as bomCode", "e.project_sub_code as projectSubCode") + .select(" e.project_sub_code as bomCode", "e.project_sub_code as projectSubCode") .select("a.plan_no as planCode", "b.code as projectCode", "c.name as customerName", "b.project_name as projectName") .select("d.name as projectSubName") .leftJoin(PlanDO.class, "a", PlanDO::getId, ProcessBomDO::getPlanId) @@ -112,7 +112,7 @@ public interface ProcessBomMapper extends BaseMapperX { .disableSubLogicDel() ; - query.and(!StringUtils.isEmpty(reqVO.getCode()), QueryWrapper -> QueryWrapper.apply("locate({0},concat('BOM-', e.project_sub_code )) > 0", reqVO.getCode())) + query.and(!StringUtils.isEmpty(reqVO.getCode()), QueryWrapper -> QueryWrapper.apply("locate({0}, e.project_sub_code ) > 0", reqVO.getCode())) .like(!StringUtils.isEmpty(reqVO.getPlanCode()), PlanDO::getPlanNo, reqVO.getPlanCode()) .like(!StringUtils.isEmpty(reqVO.getProjectCode()), ProjectOrderDO::getCode, reqVO.getProjectCode()) .like(!StringUtils.isEmpty(reqVO.getCustomerName()), CustomerDO::getName, reqVO.getCustomerName()) @@ -168,7 +168,7 @@ public interface ProcessBomMapper extends BaseMapperX { default ProcessBomDO selectByIdbyid(Long id) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(ProcessBomDO.class) - .select("concat('BOM-', e.project_sub_code) as bomCode", "e.project_sub_code as projectSubCode") + .select(" e.project_sub_code as bomCode", "e.project_sub_code as projectSubCode") .select("a.plan_no as planCode", "b.code as projectCode", "c.name as customerName", "b.project_name as projectName") .select("d.name as projectSubName") .leftJoin(PlanDO.class, "a", PlanDO::getId, ProcessBomDO::getPlanId) 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 20be1f7..909228d 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 @@ -1,6 +1,7 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; @@ -297,7 +298,7 @@ public interface TaskDispatchDetailMapper extends BaseMapperX selectPageWx(TaskDispatchDetailPageReqVO reqVO , Set postIds) { + default PageResult selectPageWx(TaskDispatchDetailPageReqVO reqVO , Map postIds) { // 假设reqVO中包含了页码(page)和每页数量(limit) MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(TaskDispatchDetailDO.class) @@ -329,16 +330,35 @@ public interface TaskDispatchDetailMapper extends BaseMapperX i +// .and(j -> j.in(TaskDispatchDetailDO::getPostId, postIds)) +// .and(j -> j.isNull(TaskDispatchDetailDO::getOwner)) +// .or(k-> k.eq(reqVO.getOwner() != null, TaskDispatchDetailDO::getOwner, reqVO.getOwner())) +// ); +// }else{ +// query.eq(reqVO.getOwner() != null, TaskDispatchDetailDO::getOwner, reqVO.getOwner()); +// } if (CollUtil.isNotEmpty(postIds)) { - query.and(i -> i - .and(j -> j.in(TaskDispatchDetailDO::getPostId, postIds)) - .and(j -> j.isNull(TaskDispatchDetailDO::getOwner)) - .or(k-> k.eq(reqVO.getOwner() != null, TaskDispatchDetailDO::getOwner, reqVO.getOwner())) - ); + query.and(i -> { + // 为每个岗位创建对应的工序查询条件 + for (String postId : postIds.keySet()) { + Long processId = postIds.get(postId); + if (ObjectUtil.isNotEmpty(processId)) { + i.or(j -> j + .eq(TaskDispatchDetailDO::getPostId, postId) + .eq(TaskDispatchDetailDO::getProcedureId, processId) + .isNull(TaskDispatchDetailDO::getOwner) + ); + } + } + }); + // 添加所有者查询条件 + query.or(k-> k.eq(reqVO.getOwner() != null, TaskDispatchDetailDO::getOwner, reqVO.getOwner())); + }else{ query.eq(reqVO.getOwner() != null, TaskDispatchDetailDO::getOwner, reqVO.getOwner()); } - query .in(CollUtil.isNotEmpty(reqVO.getProcedureStatusList()), TaskDispatchDetailDO::getProcedureStatus, reqVO.getProcedureStatusList()) .eq(reqVO.getIsReport() != null, ProcedureDO::getIsReport, reqVO.getIsReport()) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/fpuserdetail/FpUserDetailServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/fpuserdetail/FpUserDetailServiceImpl.java index 6859fc8..029cc17 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/fpuserdetail/FpUserDetailServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/fpuserdetail/FpUserDetailServiceImpl.java @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.heli.service.fpuserdetail; +import cn.hutool.core.util.ObjectUtil; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; import com.chanko.yunxi.mes.module.heli.controller.admin.fpuserdetail.vo.FpUserDetailPageReqVO; @@ -8,8 +9,10 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.fpuserdetail.vo.FpUserD import com.chanko.yunxi.mes.module.heli.controller.admin.fpuserdetail.vo.UserVo; import com.chanko.yunxi.mes.module.heli.dal.dataobject.fpuser.FpUserDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.fpuserdetail.FpUserDetailDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO; import com.chanko.yunxi.mes.module.heli.dal.mysql.fpuser.FpUserMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.fpuserdetail.FpUserDetailMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.procedure.ProcedureMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -32,6 +35,8 @@ public class FpUserDetailServiceImpl implements FpUserDetailService { private FpUserDetailMapper fpUserDetailMapper; @Resource private FpUserMapper fpUserMapper; + @Resource + private ProcedureMapper procedureMapper; @Override public Long createFpUserDetail(FpUserDetailSaveReqVO createReqVO) { if (createReqVO.getType()!=null){ @@ -55,6 +60,11 @@ public class FpUserDetailServiceImpl implements FpUserDetailService { fpUserDetailDO.setBusyId(user.getBusyId()); fpUserDetailDO.setPostId(user.getPostId()); fpUserDetailDO.setIsRes(user.getIsRes()); + fpUserDetailDO.setProcedureId(user.getProcedureId()); + ProcedureDO procedureDO = procedureMapper.selectById(user.getProcedureId()); + if (ObjectUtil.isNotEmpty(procedureDO)){ + fpUserDetailDO.setCode(procedureDO.getCode()); + } fpUserDetailMapper.insert(fpUserDetailDO); } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java index b2a1354..aa87bfa 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java @@ -77,9 +77,9 @@ public class PgMasterServiceImpl implements PgMasterService { pgMasterLineDO.setProcedureId(taskDispatchDetailDO.getProcedureId()); pgMasterLineDO.setDispatchDetailId(taskDispatchDetailDO.getId()); //bom名称 - pgMasterLineDO.setBomName("BOM-"+o.getProjectSubShortName()); + pgMasterLineDO.setBomName(o.getProjectSubShortName()); //bom编号 - pgMasterLineDO.setBomNumber("BOM-"+o.getProjectSubShortName()); + pgMasterLineDO.setBomNumber(o.getProjectSubShortName()); //bom版本号 pgMasterLineDO.setBomNo(o.getVersion()); //子项目id @@ -141,8 +141,8 @@ public class PgMasterServiceImpl implements PgMasterService { processBomDOList.forEach( o ->{ PgMasterLineDO pgMasterLineDO = new PgMasterLineDO(); pgMasterLineDO.setBomId(o.getBomId()); - pgMasterLineDO.setBomName("BOM-"+o.getProjectSubShortName()); - pgMasterLineDO.setBomNumber("BOM-"+o.getProjectSubShortName()); + pgMasterLineDO.setBomName(o.getProjectSubShortName()); + pgMasterLineDO.setBomNumber(o.getProjectSubShortName()); pgMasterLineDO.setBomNo(o.getVersion()); pgMasterLineDO.setProjectSubId(o.getProjectSubId()); pgMasterLineDO.setProjectSubName(o.getProjectSubShortName()); 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 d81136c..a776250 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 @@ -667,7 +667,7 @@ public class ProcessBomServiceImpl implements ProcessBomService { // for (StorageLogNowDO storageLogNowDO : pageResult) { bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 - BdgzsomthingDO.setThings("BOM" + updateObj.getProjectSubCode() + "审核已通过,请推送任务通知单");//事件名称 + BdgzsomthingDO.setThings( updateObj.getProjectSubCode() + "审核已通过,请推送任务通知单");//事件名称 BdgzsomthingDO.setAttr2(getplanid.getPlanNo());//跳转携带参数 BdgzsomthingDO.setAttr3(getplanid.getPlanNo());//独特标识 // BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 @@ -723,7 +723,7 @@ public class ProcessBomServiceImpl implements ProcessBomService { updateObj.setBomStatus(ProcessBomStatusEnum.valueOf(updateReqVO.getActive()).getCode()); } if (updateReqVO.getProjectSubCode() != null){ - updateObj.setCode("BOM-"+updateReqVO.getProjectSubCode() ); + updateObj.setCode(updateReqVO.getProjectSubCode() ); } processBomMapper.updateById(updateObj); @@ -908,7 +908,7 @@ public class ProcessBomServiceImpl implements ProcessBomService { // for (StorageLogNowDO storageLogNowDO : pageResult) { bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 - BdgzsomthingDO.setThings("BOM" + processBomDO.getProjectSubCode() + "已变更");//事件名称 + BdgzsomthingDO.setThings( processBomDO.getProjectSubCode() + "已变更");//事件名称 BdgzsomthingDO.setAttr2(processBomDO.getProjectSubCode());//跳转携带参数 BdgzsomthingDO.setAttr3(processBomDO.getProjectSubCode());//独特标识 // BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 @@ -981,7 +981,7 @@ public class ProcessBomServiceImpl implements ProcessBomService { // for (StorageLogNowDO storageLogNowDO : pageResult) { bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO(); BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称 - BdgzsomthingDO.setThings("BOM" + processBomDO.getProjectSubCode() + "已提交送审");//事件名称 + BdgzsomthingDO.setThings( processBomDO.getProjectSubCode() + "已提交送审");//事件名称 BdgzsomthingDO.setAttr2(processBomDO.getProjectSubCode());//跳转携带参数 BdgzsomthingDO.setAttr3(processBomDO.getProjectSubCode());//独特标识 // BdgzsomthingDO.setClicktime(attentiontodoRespVO.getRemindtime());//提醒周期 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 2063189..2c9ec43 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 @@ -540,9 +540,11 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { @Override public PageResult getTaskDispatchDetailPageWx(TaskDispatchDetailPageReqVO pageReqVO) { List fpUserDetailDOS = fpUserDetailMapper.selectList(new LambdaQueryWrapper().eq(FpUserDetailDO::getBusyId, pageReqVO.getOwner())); - Set postIds = new HashSet<>(); +// Set postIds = new HashSet<>(); +// Set procedureIds = new HashSet<>(); + Map postIds = new HashMap<>(); for (FpUserDetailDO fpUserDetailDO : fpUserDetailDOS) { - postIds.add(fpUserDetailDO.getPostId()); + postIds.put(fpUserDetailDO.getPostId(), fpUserDetailDO.getProcedureId()); } PageResult taskDispatchDetailDOPageResult = taskDispatchDetailMapper.selectPageWx(pageReqVO, postIds); List list = taskDispatchDetailDOPageResult.getList(); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java index 5546b67..cd220dc 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/unqualifiednotification/UnqualifiedNotificationServiceImpl.java @@ -291,8 +291,7 @@ try { public PageResult getUnqualifiedNotificationStatisticPage(UnqualifiedNotificationPageReqVO pageReqVO) { Page page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); List qualityStatistics = unqualifiedNotificationMapper.QualityStatistics(page, pageReqVO); -// return new PageResult<>(qualityStatistics, page.getTotal()); - return null; + return new PageResult<>(qualityStatistics, page.getTotal()); } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml index 040e979..f933eba 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/unqualifiednotification/UnqualifiedNotificationMapper.xml @@ -15,74 +15,77 @@ t.* FROM ( - SELECT - t.create_time as createTime, - t.project_name AS projectName, - c.NAME AS customerName, - t.project_sub_name AS projectSubName, - t.bom_name AS bomName, - 0 AS type, - CASE + SELECT + t.create_time as createTime, + p.project_name AS projectName, + c.NAME AS customerName, + pg.project_sub_name AS projectSubName, + pg.bom_name AS bomName, + 0 AS type, + CASE - WHEN t.is_qua = 1 THEN - '是' - WHEN t.is_qua = 0 THEN - '否' ELSE '未知' - END AS isQua, - t.amount AS amount, - u1.nickname AS userName, - DATE_FORMAT(t.create_time, '%Y-%m-%d') AS testingTime, - pro.NAME AS procedureName, - u2.nickname AS auditorName, - DATE_FORMAT(t.audit_time, '%Y-%m-%d') AS auditTime, - t.audit_opinion AS auditOpinion, - p.CODE AS projectCode, - t.project_sub_number AS projectSubNumber - FROM - quality_pg_master_line t - LEFT JOIN project_sale_order p ON t.project_id = p.id - LEFT JOIN base_customer c ON p.customer_id = c.id - LEFT JOIN system_users u1 ON t.detil_user = u1.id - LEFT JOIN system_users u2 ON t.auditor = u2.id - LEFT JOIN base_procedure pro ON t.procedure_id = pro.id - WHERE - t.is_qua = 1 - AND t.deleted = 0 - - UNION ALL - SELECT + WHEN t.is_qua = 1 THEN + '是' + WHEN t.is_qua = 0 THEN + '否' ELSE '未知' + END AS isQua, + t.amount AS amount, + u1.nickname AS userName, + DATE_FORMAT(t.create_time, '%Y-%m-%d') AS testingTime, + pro.NAME AS procedureName, + u2.nickname AS auditorName, + DATE_FORMAT(t.audit_time, '%Y-%m-%d') AS auditTime, + t.audit_opinion AS auditOpinion, + p.CODE AS projectCode, + pg.project_sub_number AS projectSubNumber + FROM + quality_bg_master_line t + left join quality_pg_master_line pg on t.zj_mx_id=pg.id + LEFT JOIN project_sale_order p ON pg.project_id = p.id + LEFT JOIN base_customer c ON p.customer_id = c.id + LEFT JOIN system_users u1 ON pg.detil_user = u1.id + LEFT JOIN system_users u2 ON t.auditor = u2.id + LEFT JOIN base_procedure pro ON pg.procedure_id = pro.id + WHERE + t.is_qua = 1 + AND t.deleted = 0 + group by t.id + UNION ALL + SELECT t.create_time as createTime, - t.project_name AS projectName, - c.NAME AS customerName, - t.project_sub_name AS projectSubName, - '' AS bomName, - 1 AS type, - CASE + pg.project_name AS projectName, + c.NAME AS customerName, + pg.project_sub_name AS projectSubName, + '' AS bomName, + 1 AS type, + CASE - WHEN t.is_qua = 1 THEN - '是' - WHEN t.is_qua = 0 THEN - '否' ELSE '未知' - END AS isQua, - t.amount AS amount, - u1.nickname AS userName, - DATE_FORMAT(t.create_time, '%Y-%m-%d') AS testingTime, - '' AS procedureName, - u2.nickname AS auditorName, - DATE_FORMAT(t.audit_time, '%Y-%m-%d') AS auditTime, - t.audit_opinion AS auditOpinion, - p.CODE AS projectCode, - t.project_sub_number AS projectSubNumber - FROM - quality_zj_pg_master_line t - LEFT JOIN project_sale_order p ON t.project_id = p.id - LEFT JOIN base_customer c ON p.customer_id = c.id - LEFT JOIN system_users u1 ON t.detil_user = u1.id - LEFT JOIN system_users u2 ON t.auditor = u2.id - WHERE - t.is_qua = 1 - AND t.deleted = 0 + WHEN t.is_qua = 1 THEN + '是' + WHEN t.is_qua = 0 THEN + '否' ELSE '未知' + END AS isQua, + t.amount AS amount, + u1.nickname AS userName, + DATE_FORMAT(t.create_time, '%Y-%m-%d') AS testingTime, + '' AS procedureName, + u2.nickname AS auditorName, + DATE_FORMAT(t.audit_time, '%Y-%m-%d') AS auditTime, + t.audit_opinion AS auditOpinion, + p.CODE AS projectCode, + pg.project_sub_number AS projectSubNumber + FROM + quality_zj_bg_master_line t + left join quality_zj_pg_master_line pg on t.zj_mx_id=pg.id + LEFT JOIN project_sale_order p ON pg.project_id = p.id + LEFT JOIN base_customer c ON p.customer_id = c.id + LEFT JOIN system_users u1 ON pg.detil_user = u1.id + LEFT JOIN system_users u2 ON t.auditor = u2.id + WHERE + t.is_qua = 1 + AND t.deleted = 0 + group by t.id ) t where 1=1 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 8250eb8..7e391dd 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 @@ -663,7 +663,7 @@ const handlePay =async (row: any) => { // router.push({ path: '/order/project', state: { idid: row.idid } }); } if (row.type == '《物料需求计划》提交后') { - // await bdgzsomthingApi.deleteByIdNew(row.id); + await bdgzsomthingApi.deleteByIdNew(row.id); if (row.attr14=='0'){ router.push({ path: '/purchase/buy', state: { idid: row.idid } }); @@ -680,6 +680,9 @@ const handlePay =async (row: any) => { router.push({ path: '/processDesign/heli/processdesign/bomShenhe', state: { idid: row.idid } }); await bdgzsomthingApi.updatebdgzsomthingbyidoneandok(row.id) //直接修改取消显示 } + if (row.type == '《采购订单》到货时通知检验') { + 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/bom', state: { idid: row.idid } }); diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/fpuserdetail/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/fpuserdetail/edit.vue index c22cf28..dab87d4 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/fpuserdetail/edit.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/fpuserdetail/edit.vue @@ -75,6 +75,15 @@ + + +