diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java index 933728e..46c19f2 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.pgmaster; + import com.chanko.yunxi.mes.module.heli.controller.admin.plansub.vo.PlanSubRespVO; import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.TaskDispatchDetailPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.zjpgmaster.vo.ZjPgMasterSaveReqVO; @@ -126,6 +127,14 @@ public class PgMasterController { PageResult pageResult = pgMasterService.getTaskDispatchDetailPage(pageReqVO); return success(pageResult); } + @GetMapping("/task-dispatch-detail/pages") + @Operation(summary = "获得质量派工单过程检验行分页") + @PreAuthorize("@ss.hasPermission('heli:pg-master-line:query')") + public CommonResult> getPgMasterLinePages(@Valid PgMasterLinePageReqVO pageReqVO) { + PageResult pageResult = pgMasterService.getPgMasterLinePages(pageReqVO); + return success(BeanUtils.toBean(pageResult, PgMasterLineDO.class)); + } + @GetMapping("/task-dispatch-detail/get") @Operation(summary = "获得派工明细分页") @PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/vo/PgMasterLinePageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/vo/PgMasterLinePageReqVO.java index 42ba4d0..a5d7992 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/vo/PgMasterLinePageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/vo/PgMasterLinePageReqVO.java @@ -107,4 +107,17 @@ public class PgMasterLinePageReqVO extends PageParam { @Schema(description = "派工状态") private Integer dispatchStatus; + @Schema(description = "生产计划单号") + private String taskNo; + + @Schema(description = "生产计划id", example = "25586") + private Long taskId; + + @Schema(description = "项目id", example = "20270") + private Long projectId; + + @Schema(description = "报工状态") + private String active; + + } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java index a32c13b..0476817 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java @@ -62,7 +62,7 @@ public interface PgMasterLineMapper extends BaseMapperX { .orderByAsc(PgMasterLineDO::getTaskNo,PgMasterLineDO::getPgNumber) .disableSubLogicDel(); - query.eq(reqVO.getDetilUser() != null, PgMasterLineDO::getDetilUser, reqVO.getDetilUser()) + query.eq(reqVO.getDetilUser() != null&&reqVO.getDetilUser() != 0, PgMasterLineDO::getDetilUser, reqVO.getDetilUser()) .eq(reqVO.getPgType() != null, PgMasterLineDO::getPgType, reqVO.getPgType()) .eq(reqVO.getDispatchStatus() != null, PgMasterLineDO::getDispatchStatus, reqVO.getDispatchStatus()) @@ -72,4 +72,85 @@ public interface PgMasterLineMapper extends BaseMapperX { return selectPage(reqVO, query); } + + + default PageResult selectPages(PgMasterLinePageReqVO reqVO) { + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.select("t.id,t.task_no as taskNo,t.project_name as projectName,t.project_sub_name as projectSubName, " + + "t.material_name as materialName, t.blueprint_no as blueprintNo, t.amount, t.spec ,t.unit, t.detil_user as detilUser, " + + "t.pg_number as pgNumber ,t.start_time as startTime ,t.ent_time as entTime ,t.dispatch_status as dispatchStatus,t.pg_type as pgType ") + + .orderByAsc(PgMasterLineDO::getTaskNo,PgMasterLineDO::getPgNumber) + ; + + query.eq(reqVO.getCreateTime()!= null, PgMasterLineDO::getCreateTime, reqVO.getCreateTime()) + .eq(reqVO.getBomId()!= null, PgMasterLineDO::getBomId, reqVO.getBomId()) + .eq(reqVO.getBomNumber()!= null, PgMasterLineDO::getBomNumber, reqVO.getBomNumber()) + .like(reqVO.getBomName()!= null, PgMasterLineDO::getBomName, reqVO.getBomName()) + .eq(reqVO.getBomNo()!= null, PgMasterLineDO::getBomNo, reqVO.getBomNo()) + .eq(reqVO.getProjectSubId()!= null, PgMasterLineDO::getProjectSubId, reqVO.getProjectSubId()) + .like(reqVO.getProjectSubName()!= null, PgMasterLineDO::getProjectSubName, reqVO.getProjectSubName()) + .eq(reqVO.getProjectSubNumber()!= null, PgMasterLineDO::getProjectSubNumber, reqVO.getProjectSubNumber()) + .eq(reqVO.getType()!= null, PgMasterLineDO::getType, reqVO.getType()) + .eq(reqVO.getMaterialId()!= null, PgMasterLineDO::getMaterialId, reqVO.getMaterialId()) + .eq(reqVO.getMaterialCode()!= null, PgMasterLineDO::getMaterialCode, reqVO.getMaterialCode()) + .like(reqVO.getMaterialName()!= null, PgMasterLineDO::getMaterialName, reqVO.getMaterialName()) + .eq(reqVO.getCompositionId()!= null, PgMasterLineDO::getCompositionId, reqVO.getCompositionId()) + .eq(reqVO.getSpec()!= null, PgMasterLineDO::getSpec, reqVO.getSpec()) + .eq(reqVO.getUnit()!= null, PgMasterLineDO::getUnit, reqVO.getUnit()) + .eq(reqVO.getBlueprintNo()!= null, PgMasterLineDO::getBlueprintNo, reqVO.getBlueprintNo()) + .eq(reqVO.getAmount()!= null, PgMasterLineDO::getAmount, reqVO.getAmount()) + .eq(reqVO.getDetilUser()!= null, PgMasterLineDO::getDetilUser, reqVO.getDetilUser()) + .eq(reqVO.getGongShi()!= null, PgMasterLineDO::getGongShi, reqVO.getGongShi()) + .eq(reqVO.getZlPgId()!= null, PgMasterLineDO::getZlPgId, reqVO.getZlPgId()) + .eq(reqVO.getPgType()!= null, PgMasterLineDO::getPgType, reqVO.getPgType()) + .eq(reqVO.getStartTime()!= null, PgMasterLineDO::getStartTime, reqVO.getStartTime()) + .eq(reqVO.getEntTime()!= null, PgMasterLineDO::getEntTime, reqVO.getEntTime()) + .eq(reqVO.getDispatchStatus()!= null, PgMasterLineDO::getDispatchStatus, reqVO.getDispatchStatus()) + .eq(reqVO.getTaskNo()!= null, PgMasterLineDO::getTaskNo, reqVO.getTaskNo()) + .eq(reqVO.getTaskId()!= null, PgMasterLineDO::getTaskId, reqVO.getTaskId()) + .eq(reqVO.getProjectId()!= null, PgMasterLineDO::getProjectId, reqVO.getProjectId()) + .like(reqVO.getProjectName()!= null, PgMasterLineDO::getProjectName, reqVO.getProjectName()) + .eq(reqVO.getPgNumber()!= null, PgMasterLineDO::getPgNumber, reqVO.getPgNumber()) + .eq(reqVO.getActive()!= null, PgMasterLineDO::getActive, reqVO.getActive()) + .orderByDesc(PgMasterLineDO::getId) + + + ; + + return selectPage(reqVO, query); + /*return selectPage(reqVO, new LambdaQueryWrapperX() + .betweenIfPresent(PgMasterLineDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PgMasterLineDO::getBomId, reqVO.getBomId()) + .eqIfPresent(PgMasterLineDO::getBomNumber, reqVO.getBomNumber()) + .likeIfPresent(PgMasterLineDO::getBomName, reqVO.getBomName()) + .eqIfPresent(PgMasterLineDO::getBomNo, reqVO.getBomNo()) + .eqIfPresent(PgMasterLineDO::getProjectSubId, reqVO.getProjectSubId()) + .likeIfPresent(PgMasterLineDO::getProjectSubName, reqVO.getProjectSubName()) + .eqIfPresent(PgMasterLineDO::getProjectSubNumber, reqVO.getProjectSubNumber()) + .eqIfPresent(PgMasterLineDO::getType, reqVO.getType()) + .eqIfPresent(PgMasterLineDO::getMaterialId, reqVO.getMaterialId()) + .eqIfPresent(PgMasterLineDO::getMaterialCode, reqVO.getMaterialCode()) + .likeIfPresent(PgMasterLineDO::getMaterialName, reqVO.getMaterialName()) + .eqIfPresent(PgMasterLineDO::getCompositionId, reqVO.getCompositionId()) + .eqIfPresent(PgMasterLineDO::getSpec, reqVO.getSpec()) + .eqIfPresent(PgMasterLineDO::getUnit, reqVO.getUnit()) + .eqIfPresent(PgMasterLineDO::getBlueprintNo, reqVO.getBlueprintNo()) + .eqIfPresent(PgMasterLineDO::getAmount, reqVO.getAmount()) + .eqIfPresent(PgMasterLineDO::getDetilUser, reqVO.getDetilUser()) + .eqIfPresent(PgMasterLineDO::getGongShi, reqVO.getGongShi()) + .eqIfPresent(PgMasterLineDO::getZlPgId, reqVO.getZlPgId()) + .eqIfPresent(PgMasterLineDO::getPgType, reqVO.getPgType()) + .betweenIfPresent(PgMasterLineDO::getStartTime, reqVO.getStartTime()) + .betweenIfPresent(PgMasterLineDO::getEntTime, reqVO.getEntTime()) + .eqIfPresent(PgMasterLineDO::getDispatchStatus, reqVO.getDispatchStatus()) + .eqIfPresent(PgMasterLineDO::getTaskNo, reqVO.getTaskNo()) + .eqIfPresent(PgMasterLineDO::getTaskId, reqVO.getTaskId()) + .eqIfPresent(PgMasterLineDO::getProjectId, reqVO.getProjectId()) + .likeIfPresent(PgMasterLineDO::getProjectName, reqVO.getProjectName()) + .eqIfPresent(PgMasterLineDO::getPgNumber, reqVO.getPgNumber()) + .eqIfPresent(PgMasterLineDO::getActive, reqVO.getActive()) + .orderByDesc(PgMasterLineDO::getId));*/ + } + } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java index 00d1e64..298ae71 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java @@ -74,9 +74,9 @@ public interface ProcessDesignMapper extends BaseMapperX { .or() .apply("u5.id = {0} and t.process_design_type = {1}", reqVO.getOwner(), ProcessDesignTypeEnum.BLUEPRINT_3D.name())); } - /*if(reqVO.getUncompletedDesign() != null && reqVO.getUncompletedDesign()){ + if(reqVO.getUncompletedDesign() != null && reqVO.getUncompletedDesign()){ query.and(QueryWrapper -> QueryWrapper.apply("COALESCE(z.progress, 0) < {0}", 100).ne(PlanDO::getStatus, ProjectPlanStatusEnum.TERMINATE.getCode())); - }*/ + } if(reqVO.getPgType() != null){ if(reqVO.getPgType()==0){ query.and(QueryWrapper -> QueryWrapper.apply("z.progress < {0}" , 100).or().apply("z.progress is null")); 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 c00b372..6b9c9f3 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 @@ -68,7 +68,7 @@ public interface TaskDispatchDetailMapper extends BaseMapperX query = new MPJLambdaWrapper<>(); query.eq(TaskDispatchDetailDO::getDispatchId,id) - .eq(TaskDispatchDetailDO::getStatus,2); + .eq(TaskDispatchDetailDO::getProcedureStatus,2); Long aLong = selectCount(query); return aLong.compareTo(Long.valueOf(0))>0; } @@ -162,9 +162,14 @@ public interface TaskDispatchDetailMapper extends BaseMapperX i .and(j -> j.in(TaskDispatchDetailDO::getPostId, postIds)) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java index b4fcf1b..8ef220e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java @@ -57,7 +57,7 @@ public interface ZjPgMasterLineMapper extends BaseMapperX { .orderByDesc(ZjPgMasterLineDO::getId) .disableSubLogicDel(); - query.eq(reqVO.getDetilUser() != null, ZjPgMasterLineDO::getDetilUser, reqVO.getDetilUser()) + query.eq(reqVO.getDetilUser() != null&&reqVO.getDetilUser() != 0, ZjPgMasterLineDO::getDetilUser, reqVO.getDetilUser()) .eq(reqVO.getPgType() != null, ZjPgMasterLineDO::getPgType, reqVO.getPgType()) .eq(reqVO.getDispatchStatus()!=null,ZjPgMasterLineDO::getDispatchStatus, reqVO.getDispatchStatus()) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterService.java index f71de2d..9ca5a21 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterService.java @@ -66,6 +66,8 @@ public interface PgMasterService { PageResult getTaskDispatchDetailPage(PgMasterLinePageReqVO pageReqVO); + PageResult getPgMasterLinePages(PgMasterLinePageReqVO pageReqVO); + PgMasterLineDO getTaskDispatchDetail(PgMasterLinePageReqVO pageReqVO); /** * 获得质量派工单过程检验行列表 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 e41fafa..4e6c87a 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 @@ -233,6 +233,11 @@ public class PgMasterServiceImpl implements PgMasterService { // ==================== 子表（质量派工单过程检验行） ==================== + + @Override + public PageResult getPgMasterLinePages(PgMasterLinePageReqVO pageReqVO) { + return pgMasterLineMapper.selectPages(pageReqVO); + } @Override public PageResult getTaskDispatchDetailPage(PgMasterLinePageReqVO pageReqVO) { return pgMasterLineMapper.selectPage(pageReqVO); 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 7bd66a8..629cbfd 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 @@ -345,7 +345,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { List list = taskDispatchDetailDOPageResult.getList(); List afterList = new ArrayList<>(); if (CollUtil.isNotEmpty(list)){ - Map> collect = list.stream().collect(Collectors.groupingBy(TaskDispatchDetailDO::getId)); + Map> collect = list.stream().collect(Collectors.groupingBy(TaskDispatchDetailDO::getDispatchCode)); collect.forEach((code,list2)->{ list2.sort(Comparator.comparing(TaskDispatchDetailDO::getSort, Comparator.nullsLast(Integer::compareTo))); afterList.addAll(list2); @@ -468,34 +468,90 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { crossOrderManager.generateStockInOrder(taskDispatchDetailDO.getDispatchId(), now, lastReportDO.getAmount()); break; case FINISH: + taskDispatchDetailDO.setProcedureStatus(TaskDispatchProcedureStatusEnum.COMPLETED.getCode()); - // TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectById(taskDispatchDetailDO.getDispatchId()); - List taskDispatchDOS = taskDispatchMapper.selectList(TaskDispatchDO::getPlanId, taskDispatchDO.getPlanId()); - if(CollUtil.isNotEmpty(taskDispatchDOS)){ - List ids = taskDispatchDOS.stream() - .map(TaskDispatchDO::getId) - .collect(Collectors.toList()); - List taskDispatchDetailList = taskDispatchDetailMapper.selectList(new LambdaQueryWrapper() - .in(TaskDispatchDetailDO::getDispatchId, ids)); - boolean isOver = true; - for (TaskDispatchDetailDO dispatchDetailDO : taskDispatchDetailList) { - if (dispatchDetailDO.getId() != taskDispatchDetailDO.getId()){ - if (dispatchDetailDO.getProcedureStatus()!= TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){ - isOver = false; - break; - } - } - } - if (isOver){ - planDO.setStatus(3); - planMapper.updateById(planDO); - if(taskDispatchDO.getDispatchType().equals("ASSEMBLE")){ - zjPgMasterService.insertZjList(planDO.getId(),planDO.getProjectId()); - } else if (taskDispatchDO.getDispatchType().equals("PRODUCTION")) { - pgMasterService.insertPgList(planDO.getId(),planDO.getProjectId()); + //子项目装配是否完成 + List taskDispatchAssembleOverList = taskDispatchMapper.selectList( + new LambdaQueryWrapper() + .eq(TaskDispatchDO::getProjectSubId, taskDispatchDO.getProjectSubId()) + .eq(TaskDispatchDO::getDispatchType,"ASSEMBLE")); + //零件是否生产完成 + List taskDispatchDetailDOS = taskDispatchDetailMapper.selectListByDispatchId(taskDispatchDO.getId()); + List productionList = taskDispatchDetailDOS.stream().filter(e -> e.getDispatchType().equals("PRODUCTION") && !e.getId().equals(taskDispatchDetailDO.getId())).collect(Collectors.toList()); + //过程检 零件所有生产派工完成生成 + boolean isBomDetailProductionOver = true; + //终检 子项目装配派工都完成 + boolean isProjectSubAssembleOver = true; + //生产零件派工判断是否生成过程检 + if (CollUtil.isNotEmpty(productionList)){ + for (TaskDispatchDetailDO dispatchDetailDO : productionList) { + if (dispatchDetailDO.getProcedureStatus() !=TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){ + isBomDetailProductionOver = false; + break; } } } + if (CollUtil.isNotEmpty(productionList)){ + for (TaskDispatchDetailDO dispatchDetailDO : productionList) { + if (!dispatchDetailDO.getId().equals(taskDispatchDetailDO.getId()) && + dispatchDetailDO.getProcedureStatus() !=TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){ + //如果其他的有未完成的 + isProjectSubAssembleOver = false; + break; + } + } + } + if (taskDispatchDO.getDispatchType().equals("PRODUCTION") && isBomDetailProductionOver){ + pgMasterService.insertPgList(planDO.getId(),planDO.getProjectId()); + }else if (taskDispatchDO.getDispatchType().equals("ASSEMBLE") && isProjectSubAssembleOver){ + zjPgMasterService.insertZjList(planDO.getId(),planDO.getProjectId()); + } +// // TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectById(taskDispatchDetailDO.getDispatchId()); +// List idsProduction = new ArrayList<>(); +// List idsAssemble = new ArrayList<>(); +// //生产计划是否完成 查所有 +// List taskDispatchDOS = taskDispatchMapper.selectList(new LambdaQueryWrapper() +// .eq(TaskDispatchDO::getPlanId, taskDispatchDO.getPlanId())); +// if(CollUtil.isNotEmpty(taskDispatchDOS)){ +// idsAssemble = taskDispatchDOS.stream().filter(e-> e.getDispatchType().equals("ASSEMBLE")) +// .map(TaskDispatchDO::getId) +// .collect(Collectors.toList()); +// idsProduction = taskDispatchDOS.stream().filter(e-> e.getDispatchType().equals("PRODUCTION")) +// .map(TaskDispatchDO::getId) +// .collect(Collectors.toList()); +// List taskDispatchDetailAssembleList = taskDispatchDetailMapper.selectList(new LambdaQueryWrapper() +// .in(TaskDispatchDetailDO::getDispatchId, idsAssemble)); +// List taskDispatchDetailProductionList = taskDispatchDetailMapper.selectList(new LambdaQueryWrapper() +// .in(TaskDispatchDetailDO::getDispatchId, idsProduction)); +// +// boolean isProductionOver = true; +// boolean isAssembleOver = true; +// for (TaskDispatchDetailDO dispatchDetailDO : taskDispatchDetailAssembleList) { +// if (dispatchDetailDO.getId() != taskDispatchDetailDO.getId()){ +// if (dispatchDetailDO.getProcedureStatus()!= TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){ +// isAssembleOver = false; +// break; +// } +// } +// } +// for (TaskDispatchDetailDO dispatchDetailDO : taskDispatchDetailProductionList) { +// if (dispatchDetailDO.getId() != taskDispatchDetailDO.getId()){ +// if (dispatchDetailDO.getProcedureStatus()!= TaskDispatchProcedureStatusEnum.COMPLETED.getCode()){ +// isProductionOver = false; +// break; +// } +// } +// } +// if (taskDispatchDO.getDispatchType().equals("PRODUCTION") && isProductionOver){ +// pgMasterService.insertPgList(planDO.getId(),planDO.getProjectId()); +// }else if (taskDispatchDO.getDispatchType().equals("ASSEMBLE") && isAssembleOver){ +// zjPgMasterService.insertZjList(planDO.getId(),planDO.getProjectId()); +// } +// if (isProductionOver&&isAssembleOver){ +// planDO.setStatus(3); +// planMapper.updateById(planDO); +// } +// } taskDispatchDetailMapper.updateById(taskDispatchDetailDO); break; } diff --git a/mes-ui/mes-ui-admin-vue3/heli-web.tar b/mes-ui/mes-ui-admin-vue3/heli-web.tar deleted file mode 100644 index 98af501..0000000 Binary files a/mes-ui/mes-ui-admin-vue3/heli-web.tar and /dev/null differ diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/pgmaster/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/pgmaster/index.ts index a5e9dff..fee668b 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/pgmaster/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/pgmaster/index.ts @@ -18,6 +18,13 @@ export const getSearchBomMx = async (task_id: number,project_id: number) => { } +// 查询质量派工单过程检验行分页 +export const getPgMasterLinePage = async (params) => { + return await request.get({ url: `/heli/pg-master/task-dispatch-detail/pages`, params }) +} + + + // 查询质量过程检派工单主分页 export const getPgMasterPage = async (params) => { return await request.get({ url: `/heli/pg-master/page`, params }) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/PgMasterLineForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/PgMasterLineForm.vue new file mode 100644 index 0000000..cc7f195 --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/PgMasterLineForm.vue @@ -0,0 +1,244 @@ + + \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/index.vue new file mode 100644 index 0000000..c6f98aa --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/index.vue @@ -0,0 +1,357 @@ + + + \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue index 0c09aa4..8c90bd6 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue @@ -448,7 +448,7 @@ v-if="formData.dispatchStatus == 2" @click="printHandle(formData.id)" :disabled= - + 该派工单，存在报工完数据，是否继续？ @@ -859,6 +859,7 @@ const centerDialogVisible = ref(false); const isSureCancle = ref(false) const sureToCancle = () =>{ isSureCancle.value = true; + centerDialogVisible.value = false; submitForm('CANCEL_SUBMIT'); } const submitForm = async (operate) => { diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue index 4833c78..f574125 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue @@ -453,7 +453,7 @@ v-if="formData.dispatchStatus == 2" @click="printHandle(formData.id)" :disabled= - + 该派工单，存在报工完数据，是否继续？ @@ -1030,6 +1030,7 @@ const queryData = async (id?: number) => { const isSureCancle = ref(false) const sureToCancle = () =>{ isSureCancle.value = true; + centerDialogVisible.value = false; submitForm('CANCEL_SUBMIT'); } const submitForm = async (operate) => { diff --git a/mes-ui/mini-app/src/pages/approveOrder/approveOrder-detail.vue b/mes-ui/mini-app/src/pages/approveOrder/approveOrder-detail.vue index 539be3b..e81f13e 100644 --- a/mes-ui/mini-app/src/pages/approveOrder/approveOrder-detail.vue +++ b/mes-ui/mini-app/src/pages/approveOrder/approveOrder-detail.vue @@ -11,7 +11,7 @@ import { getFileAPI, getLogAPI, } from '@/services/approveOrder' -import {Base64} from '@/utils/base64.js'; +import {Base64} from '@/uni_modules/base64/base64.js'; const popup = ref() @@ -209,32 +209,10 @@ const handleDownload = (pdfUrl: any) => { window.open(fileUrl.value); // #endif //#ifdef MP-WEIXIN - uni.showLoading({ - title: '正在加载中..' - }) - uni.downloadFile({ - url: pdfUrl, - success: function(res) { - var filePath = res.tempFilePath; - uni.openDocument({ - filePath: filePath, - showMenu: true, - success: function(res) { - console.log('打开文档成功'); - uni.hideLoading() - }, - }); - }, - complete: function(r) { - uni.hideLoading() - } - }); - // fileUrl.value = 'https://star.hz-hl.com/FileServer/onlinePreview?url='+encodeURIComponent(Base64.encode(pdfUrl)); - - // uni.navigateTo({ - // url: './components/showFileWx?fileUrl=' + encodeURIComponent(fileUrl.value) - // }); - // #endif + uni.navigateTo({ + url: './components/showFileWx?fileUrl=' + encodeURIComponent(Base64.encode(pdfUrl)) + }); + //#endif // showFile.value = true; // if (pdfUrl) { diff --git a/mes-ui/mini-app/src/pages/approveOrder/components/showFileWx.vue b/mes-ui/mini-app/src/pages/approveOrder/components/showFileWx.vue index adb542d..5f211c5 100644 --- a/mes-ui/mini-app/src/pages/approveOrder/components/showFileWx.vue +++ b/mes-ui/mini-app/src/pages/approveOrder/components/showFileWx.vue @@ -1,30 +1,38 @@ - + - - \ No newline at end of file diff --git a/mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue b/mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue index 4b314e9..2494aaf 100644 --- a/mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue +++ b/mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue @@ -27,7 +27,7 @@ const isLoading = ref(false) const queryParams: Required = { pageNo: 1, pageSize: 5, - detilUser: null, + detilUser: 0, // pgType: 0, // 工序完成状态列表 diff --git a/mes-ui/mini-app/src/pages/zjPgMaster/components/dataItem.vue b/mes-ui/mini-app/src/pages/zjPgMaster/components/dataItem.vue index 14198fd..3c72553 100644 --- a/mes-ui/mini-app/src/pages/zjPgMaster/components/dataItem.vue +++ b/mes-ui/mini-app/src/pages/zjPgMaster/components/dataItem.vue @@ -27,7 +27,7 @@ const isLoading = ref(false) const queryParams: Required = { pageNo: 1, pageSize: 5, - detilUser: null, + detilUser: 0, // pgType: 0, // 工序完成状态列表 @@ -39,8 +39,6 @@ dispatchStatus:2 } const dataList = ref([]) const getListData = async () => { - console.log("props.orderState"); - console.log(props.orderState); queryParams.pgType = props.orderState; // 如果数据出于加载中，退出函数 if (isLoading.value) return diff --git a/mes-ui/mini-app/src/services/constants.ts b/mes-ui/mini-app/src/services/constants.ts index 3d1eddf..1297d38 100644 --- a/mes-ui/mini-app/src/services/constants.ts +++ b/mes-ui/mini-app/src/services/constants.ts @@ -10,5 +10,5 @@ // export const serviceDomain = 'https://star.hz-hl.com' // export const serviceDomain = 'http://222.71.165.187:9010' -export const serviceDomain = 'http://localhost:8080' -// export const serviceDomain = 'https://nxhs.cjyx.cc' \ No newline at end of file +// export const serviceDomain = 'http://localhost:8080' +export const serviceDomain = 'https://nxhs.cjyx.cc' \ No newline at end of file diff --git a/mes-ui/mini-app/src/utils/base64.js b/mes-ui/mini-app/src/uni_modules/base64/base64.js similarity index 100% rename from mes-ui/mini-app/src/utils/base64.js rename to mes-ui/mini-app/src/uni_modules/base64/base64.js diff --git a/mes-ui/mini-app/src/utils/http.ts b/mes-ui/mini-app/src/utils/http.ts index 7007ffc..64815d6 100644 --- a/mes-ui/mini-app/src/utils/http.ts +++ b/mes-ui/mini-app/src/utils/http.ts @@ -86,7 +86,6 @@ export const http = (options: UniApp.RequestOptions) => { ...options, // 响应成功 success(res) { - console.log(res) // 状态码 2xx， axios 就是这样设计的 if (res.statusCode >= 200 && res.statusCode < 300) { if (res.data?.code == 0) {