From 4d8682e6ddc08cbd187bdf13588f198986d02743 Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Mon, 1 Jul 2024 17:51:07 +0800 Subject: [PATCH] fix produce report --- .../organization/OrganizationController.java | 13 +- .../admin/orgworker/OrgWorkerController.java | 129 +++++++++++++++++- .../orgworker/vo/OrgWorkerPageReqVO.java | 2 + .../admin/orgworker/vo/OrgWorkerRespVO.java | 3 + .../controller/admin/plan/PlanController.java | 31 +++-- .../ProduceReportDetailController.java | 13 +- .../vo/ProduceReportDetailPageReqVO.java | 3 + .../vo/ProduceReportDetailRespVO.java | 5 + .../vo/ProduceReportDetailSaveReqVO.java | 15 +- .../producereport/ProduceReportDetailDO.java | 3 + .../dal/mysql/orgworker/OrgWorkerMapper.java | 2 + .../ProduceReportDetailMapper.java | 5 + .../mysql/workteam/WorkTeamDetailMapper.java | 9 ++ .../dal/mysql/workteam/WorkTeamMapper.java | 3 + .../service/orgworker/OrgWorkerService.java | 2 + .../orgworker/OrgWorkerServiceImpl.java | 9 +- .../module/mes/service/plan/PlanService.java | 4 + .../mes/service/plan/PlanServiceImpl.java | 12 ++ .../mes/service/workteam/WorkTeamService.java | 5 + .../service/workteam/WorkTeamServiceImpl.java | 13 ++ 20 files changed, 259 insertions(+), 22 deletions(-) diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/organization/OrganizationController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/organization/OrganizationController.java index 0b598c343f..ba7812828d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/organization/OrganizationController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/organization/OrganizationController.java @@ -12,7 +12,6 @@ import cn.iocoder.yudao.module.mes.service.organization.OrganizationService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -36,14 +35,14 @@ public class OrganizationController { @PostMapping("/create") @Operation(summary = "创建产线工位") - @PreAuthorize("@ss.hasPermission('mes:organization:create')") + //@PreAuthorize("@ss.hasPermission('mes:organization:create')") public CommonResult createOrganization(@Valid @RequestBody OrganizationSaveReqVO createReqVO) { return success(organizationService.createOrganization(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新产线工位") - @PreAuthorize("@ss.hasPermission('mes:organization:update')") + //@PreAuthorize("@ss.hasPermission('mes:organization:update')") public CommonResult updateOrganization(@Valid @RequestBody OrganizationSaveReqVO updateReqVO) { organizationService.updateOrganization(updateReqVO); return success(true); @@ -52,7 +51,7 @@ public class OrganizationController { @DeleteMapping("/delete") @Operation(summary = "删除产线工位") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:organization:delete')") + //@PreAuthorize("@ss.hasPermission('mes:organization:delete')") public CommonResult deleteOrganization(@RequestParam("id") Long id) { organizationService.deleteOrganization(id); return success(true); @@ -61,7 +60,7 @@ public class OrganizationController { @GetMapping("/get") @Operation(summary = "获得产线工位") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:organization:query')") + //@PreAuthorize("@ss.hasPermission('mes:organization:query')") public CommonResult getOrganization(@RequestParam("id") Long id) { OrganizationDO organization = organizationService.getOrganization(id); return success(BeanUtils.toBean(organization, OrganizationRespVO.class)); @@ -69,7 +68,7 @@ public class OrganizationController { @GetMapping("/list") @Operation(summary = "获得产线工位列表") - @PreAuthorize("@ss.hasPermission('mes:organization:query')") + //@PreAuthorize("@ss.hasPermission('mes:organization:query')") public CommonResult> getOrganizationList(@Valid OrganizationListReqVO listReqVO) { List list = organizationService.getOrganizationList(listReqVO); return success(organizationService.buildVOList(list)); @@ -77,7 +76,7 @@ public class OrganizationController { @GetMapping("/export-excel") @Operation(summary = "导出产线工位 Excel") - @PreAuthorize("@ss.hasPermission('mes:organization:export')") + //@PreAuthorize("@ss.hasPermission('mes:organization:export')") @ApiAccessLog(operateType = EXPORT) public void exportOrganizationExcel(@Valid OrganizationListReqVO listReqVO, HttpServletResponse response) throws IOException { diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/OrgWorkerController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/OrgWorkerController.java index 10482cd047..3f637ae22a 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/OrgWorkerController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/OrgWorkerController.java @@ -9,8 +9,16 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.module.mes.controller.admin.orgworker.vo.OrgWorkerPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.orgworker.vo.OrgWorkerRespVO; import cn.iocoder.yudao.module.mes.controller.admin.orgworker.vo.OrgWorkerSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.producereport.vo.ProduceReportDetailSaveReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.workteam.vo.WorkTeamUserRoleEnum; +import cn.iocoder.yudao.module.mes.dal.dataobject.organization.OrganizationDO; import cn.iocoder.yudao.module.mes.dal.dataobject.orgworker.OrgWorkerDO; +import cn.iocoder.yudao.module.mes.dal.dataobject.workteam.WorkTeamDetailDO; +import cn.iocoder.yudao.module.mes.service.organization.OrganizationService; import cn.iocoder.yudao.module.mes.service.orgworker.OrgWorkerService; +import cn.iocoder.yudao.module.mes.service.workteam.WorkTeamService; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -22,11 +30,17 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; +import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; - +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; @Tag(name = "管理后台 - 工位安排") @RestController @RequestMapping("/mes/org-worker") @@ -74,8 +88,10 @@ public class OrgWorkerController { } @GetMapping("/page") - @Operation(summary = "获得工位安排分页") + @Operation(summary = "获得个人工位安排分页") public CommonResult> getOrgWorkerPage(@Valid OrgWorkerPageReqVO pageReqVO) { +// Long userId = getLoginUserId(); +// pageReqVO.setWorkerId(userId); PageResult pageResult = orgWorkerService.getOrgWorkerPage(pageReqVO); return success(pageResult); } @@ -92,5 +108,114 @@ public class OrgWorkerController { ExcelUtils.write(response, "工位安排.xls", "数据", OrgWorkerRespVO.class, list); } + @Resource + private OrganizationService organizationService; + @Resource + private AdminUserApi adminUserApi; + @Resource + private WorkTeamService workTeamService; + + /**个人报工，获取某日期当前用户绑定的工位情况**/ + @GetMapping("/getPersonal") + @Operation(summary = "获得工位安排") + public CommonResult> getPersonal(@Valid ProduceReportDetailSaveReqVO reqVO) { + OrgWorkerPageReqVO pageReqVO = new OrgWorkerPageReqVO().setOrgType(reqVO.getOrgType()).setGroupType(reqVO.getGroupType()); + LocalDateTime[] localDateTimes = {reqVO.getReportDate(),reqVO.getReportDate()}; + pageReqVO.setWorkDate(localDateTimes); + + Long userId = getLoginUserId(); + pageReqVO.setWorkerId(userId); + List orgWorkers = orgWorkerService.getOrgWorkerByReportResVo(pageReqVO); + List ids = orgWorkers.stream().map(OrgWorkerDO::getOrgId).collect(Collectors.toList()); + List list = organizationService.getList(ids); + return success(list); + } + /**代替报工，获取某日期某用户绑定的工位情况**/ + @GetMapping("/getOtherPersonal") + @Operation(summary = "获得工位安排") + public CommonResult> getOtherPersonal(@Valid ProduceReportDetailSaveReqVO reqVO) { + OrgWorkerPageReqVO pageReqVO = new OrgWorkerPageReqVO().setOrgType(reqVO.getOrgType()).setGroupType(reqVO.getGroupType()); + LocalDateTime[] localDateTimes = {reqVO.getReportDate(),reqVO.getReportDate()}; + pageReqVO.setWorkDate(localDateTimes); + + List orgWorkers = orgWorkerService.getOrgWorkerByReportResVo(pageReqVO); + List ids = orgWorkers.stream().map(OrgWorkerDO::getOrgId).collect(Collectors.toList()); + List list = organizationService.getList(ids); + return success(list); + } + /**个人报工，用户列表**/ + @GetMapping("/getPersonalUser") + @Operation(summary = "获得用户列表") + public CommonResult> getPersonalUser() { + + Long userId = getLoginUserId(); + List ids = new ArrayList<>(); + ids.add(userId); + Map userMap = adminUserApi.getUserMap(ids); + List userRespDTOS = new ArrayList<>(); + if(userMap.containsKey(userId)) + userRespDTOS.add(userMap.get(userId)); + return success(userRespDTOS); + } + /**代替报工，用户列表**/ + @GetMapping("/getOtherPersonalUser") + @Operation(summary = "获得用户列表") + public CommonResult> getOtherPersonalUser() { + Long userId = getLoginUserId(); + List detailDOList = workTeamService.getUserWorkTeamDetail(userId, WorkTeamUserRoleEnum.组长.getValue()); + //组长的话把这些组的工人列表都查上,其他人所有人都查 + List workTeamIds =null; + if(detailDOList!=null && detailDOList.size()>0){ + workTeamIds = detailDOList.stream().map(WorkTeamDetailDO::getWorkTeamId).collect(Collectors.toList()); + } + List workTeamDetailDOS = workTeamService.getDetailByWorkTeamIds(workTeamIds); + Set idsSet = convertSet(workTeamDetailDOS, WorkTeamDetailDO::getUserId); + + List ids = new ArrayList<>(); + if(idsSet!=null && idsSet.size()>0){ + ids = new ArrayList<>(idsSet); + } + Map userMap = adminUserApi.getUserMap(ids); + return success(new ArrayList<>(userMap.values())); + } + + /**个人报工，获取某日期当前用户绑定的工位情况**/ + @GetMapping("/getOrgWorkerRespVO") + @Operation(summary = "获得工位安排") + public CommonResult> getOrgWorkerRespVO(@Valid ProduceReportDetailSaveReqVO reqVO) { + OrgWorkerPageReqVO pageReqVO = new OrgWorkerPageReqVO().setOrgType(reqVO.getOrgType()).setGroupType(reqVO.getGroupType()); + LocalDateTime[] localDateTimes = {reqVO.getReportDate(),reqVO.getReportDate()}; + pageReqVO.setWorkDate(localDateTimes); + + Long userId = getLoginUserId(); + pageReqVO.setWorkerId(userId); + List orgWorkers = orgWorkerService.getOrgWorkerByReportResVo(pageReqVO); + return success( orgWorkerService.buildVOList(orgWorkers)); + } + /**代替报工，获取某日期某用户绑定的工位情况**/ + @GetMapping("/getOtherOrgWorkerRespVO") + @Operation(summary = "获得工位安排") + public CommonResult> getOtherOrgWorkerRespVO(@Valid ProduceReportDetailSaveReqVO reqVO) { + OrgWorkerPageReqVO pageReqVO = new OrgWorkerPageReqVO().setOrgType(reqVO.getOrgType()).setGroupType(reqVO.getGroupType()); + LocalDateTime[] localDateTimes = {reqVO.getReportDate(),reqVO.getReportDate()}; + pageReqVO.setWorkDate(localDateTimes); + pageReqVO.setWorkerId(reqVO.getUserId()); + + Long userId = getLoginUserId(); + List detailDOList = workTeamService.getUserWorkTeamDetail(userId, WorkTeamUserRoleEnum.组长.getValue()); + //组长的话把这些组的工人列表都查上,其他人所有人都查 + List workTeamIds =null; + if(detailDOList!=null && detailDOList.size()>0){ + workTeamIds = detailDOList.stream().map(WorkTeamDetailDO::getWorkTeamId).collect(Collectors.toList()); + } + List workTeamDetailDOS = workTeamService.getDetailByWorkTeamIds(workTeamIds); + Set idsSet = convertSet(workTeamDetailDOS, WorkTeamDetailDO::getUserId); + if(idsSet!=null && idsSet.size()>0){ + pageReqVO.setWorkerIds(new ArrayList<>(idsSet)); + } + List orgWorkers = orgWorkerService.getOrgWorkerByReportResVo(pageReqVO); + + return success(orgWorkerService.buildVOList(orgWorkers)); + } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/vo/OrgWorkerPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/vo/OrgWorkerPageReqVO.java index 1802c9b031..2f55606265 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/vo/OrgWorkerPageReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/vo/OrgWorkerPageReqVO.java @@ -35,6 +35,8 @@ public class OrgWorkerPageReqVO extends PageParam { @Schema(description = "工人id", example = "2095") private Long workerId; + @Schema(description = "工人id", example = "4727") + private List workerIds; @Schema(description = "报工单id", example = "5496") private Long reportId; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/vo/OrgWorkerRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/vo/OrgWorkerRespVO.java index 2a60ee84ed..fb89ae63f8 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/vo/OrgWorkerRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/vo/OrgWorkerRespVO.java @@ -23,6 +23,9 @@ public class OrgWorkerRespVO { @Schema(description = "工位", requiredMode = Schema.RequiredMode.REQUIRED, example = "4727") @ExcelProperty("工位") private String orgName; + @Schema(description = "工位", requiredMode = Schema.RequiredMode.REQUIRED, example = "4727") + @ExcelProperty("工序类型") + private String orgType; @Schema(description = "工作日期", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("工作日期") diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java index ba20074f96..9f78c0a87e 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/plan/PlanController.java @@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProductRespVO; import cn.iocoder.yudao.module.mes.controller.admin.itemrequisition.vo.ItemRequisitionSaveReqVO; import cn.iocoder.yudao.module.mes.controller.admin.plan.vo.*; import cn.iocoder.yudao.module.mes.dal.dataobject.plan.PlanDO; @@ -16,7 +17,6 @@ import cn.iocoder.yudao.module.mes.service.plan.PlanService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -24,6 +24,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; @@ -44,14 +45,14 @@ public class PlanController { @PostMapping("/create") @Operation(summary = "创建生产计划") - @PreAuthorize("@ss.hasPermission('mes:plan:create')") + //@PreAuthorize("@ss.hasPermission('mes:plan:create')") public CommonResult createPlan(@Valid @RequestBody PlanSaveReqVO createReqVO) { return success(planService.createPlan(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新生产计划") - @PreAuthorize("@ss.hasPermission('mes:plan:update')") + //@PreAuthorize("@ss.hasPermission('mes:plan:update')") public CommonResult updatePlan(@Valid @RequestBody PlanSaveReqVO updateReqVO) { planService.updatePlan(updateReqVO); return success(true); @@ -60,7 +61,7 @@ public class PlanController { @DeleteMapping("/delete") @Operation(summary = "删除生产计划") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:plan:delete')") + //@PreAuthorize("@ss.hasPermission('mes:plan:delete')") public CommonResult deletePlan(@RequestParam("id") Long id) { planService.deletePlan(id); return success(true); @@ -69,7 +70,7 @@ public class PlanController { @GetMapping("/get") @Operation(summary = "获得生产计划") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:plan:query')") + //@PreAuthorize("@ss.hasPermission('mes:plan:query')") public CommonResult getPlan(@RequestParam("id") Long id) { PlanDO plan = planService.getPlan(id); return success(BeanUtils.toBean(plan, PlanRespVO.class)); @@ -77,7 +78,7 @@ public class PlanController { @GetMapping("/page") @Operation(summary = "获得生产计划分页") - @PreAuthorize("@ss.hasPermission('mes:plan:query')") + //@PreAuthorize("@ss.hasPermission('mes:plan:query')") public CommonResult> getPlanPage(@Valid PlanPageReqVO pageReqVO) { PageResult pageResult = planService.getPlanPage(pageReqVO); return success(pageResult); @@ -85,7 +86,7 @@ public class PlanController { @GetMapping("/export-excel") @Operation(summary = "导出生产计划 Excel") - @PreAuthorize("@ss.hasPermission('mes:plan:export')") + //@PreAuthorize("@ss.hasPermission('mes:plan:export')") @ApiAccessLog(operateType = EXPORT) public void exportPlanExcel(@Valid PlanPageReqVO pageReqVO, HttpServletResponse response) throws IOException { @@ -110,7 +111,7 @@ public class PlanController { @PutMapping("/paigong") @Operation(summary = "计划派工") - @PreAuthorize("@ss.hasPermission('mes:plan:update')") + //@PreAuthorize("@ss.hasPermission('mes:plan:update')") public CommonResult updatePlan(@Valid @RequestBody ItemRequisitionSaveReqVO saveReqVO) { PlanDO planDO = planMapper.selectById(saveReqVO.getPlanId()); List list = analysisService.getItemAnalysis(planDO); @@ -120,7 +121,7 @@ public class PlanController { @PutMapping("/updateStatus") @Operation(summary = "更新生产计划状态") - @PreAuthorize("@ss.hasPermission('mes:plan:update')") + //@PreAuthorize("@ss.hasPermission('mes:plan:update')") public CommonResult updatePlanStatus(@Valid @RequestBody PlanStatusUpdateVO statusUpdateVO) { System.out.println(statusUpdateVO); PlanDO planDO = planMapper.selectById(statusUpdateVO.getId()); @@ -139,4 +140,16 @@ public class PlanController { planMapper.updateById(planDO); return success(true); } + + @GetMapping("/getProductByStatus") + @Operation(summary = "获得生产计划") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + //@PreAuthorize("@ss.hasPermission('mes:plan:query')") + public CommonResult> getPlan() { + List status = new ArrayList<>(); + status.add(PlanStatusEnum.开工.getValue()); + status.add(PlanStatusEnum.完工.getValue()); + List proList = planService.getProductByPlanStatus(status); + return success(proList); + } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportDetailController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportDetailController.java index 554541e33f..2449802ecf 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportDetailController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportDetailController.java @@ -22,6 +22,8 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; @@ -40,6 +42,9 @@ public class ProduceReportDetailController { @Operation(summary = "创建生产报工明细") @PreAuthorize("@ss.hasPermission('mes:produce-report-detail:create')") public CommonResult createProduceReportDetail(@Valid @RequestBody ProduceReportDetailSaveReqVO createReqVO) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime localDateTime = LocalDateTime.parse(createReqVO.getReportDateString(), formatter); + createReqVO.setReportDate(localDateTime); return success(produceReportDetailService.createProduceReportDetail(createReqVO)); } @@ -76,6 +81,13 @@ public class ProduceReportDetailController { PageResult pageResult = produceReportDetailService.getProduceReportDetailPage(pageReqVO); return success(BeanUtils.toBean(pageResult, ProduceReportDetailRespVO.class)); } +// @GetMapping("/pageReplacePage") +// @Operation(summary = "获得代报工生产报工明细分页") +// @PreAuthorize("@ss.hasPermission('mes:produce-report-detail:query')") +// public CommonResult> getProduceReportDetailPage(@Valid ProduceReportDetailPageReqVO pageReqVO) { +// PageResult pageResult = produceReportDetailService.getProduceReportDetailPage(pageReqVO); +// return success(BeanUtils.toBean(pageResult, ProduceReportDetailRespVO.class)); +// } @GetMapping("/export-excel") @Operation(summary = "导出生产报工明细 Excel") @@ -89,5 +101,4 @@ public class ProduceReportDetailController { ExcelUtils.write(response, "生产报工明细.xls", "数据", ProduceReportDetailRespVO.class, BeanUtils.toBean(list, ProduceReportDetailRespVO.class)); } - } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/vo/ProduceReportDetailPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/vo/ProduceReportDetailPageReqVO.java index 3d66366195..8333ebf4aa 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/vo/ProduceReportDetailPageReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/vo/ProduceReportDetailPageReqVO.java @@ -81,4 +81,7 @@ public class ProduceReportDetailPageReqVO extends PageParam { */ @Schema(description = "报工类型") private String reportType; + + @Schema(description = "班别", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + private Integer groupType; } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/vo/ProduceReportDetailRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/vo/ProduceReportDetailRespVO.java index d008bed0d4..efc606973f 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/vo/ProduceReportDetailRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/vo/ProduceReportDetailRespVO.java @@ -104,4 +104,9 @@ public class ProduceReportDetailRespVO { @Schema(description = "报工类型") @ExcelProperty("报工类型") private String reportType; + + @Schema(description = "班别", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @ExcelProperty(value = "班别", converter = DictConvert.class) + @DictFormat("mes_group_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 + private Integer groupType; } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/vo/ProduceReportDetailSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/vo/ProduceReportDetailSaveReqVO.java index f590ae5d38..c3cc0c0936 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/vo/ProduceReportDetailSaveReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/vo/ProduceReportDetailSaveReqVO.java @@ -2,11 +2,13 @@ package cn.iocoder.yudao.module.mes.controller.admin.producereport.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.time.LocalDateTime; +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + @Schema(description = "管理后台 - 生产报工明细新增/修改 Request VO") @Data public class ProduceReportDetailSaveReqVO { @@ -21,7 +23,6 @@ public class ProduceReportDetailSaveReqVO { private Long planId; @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14517") - @NotNull(message = "产品ID不能为空") private Long productId; @Schema(description = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "23386") @@ -58,6 +59,7 @@ public class ProduceReportDetailSaveReqVO { private BigDecimal totalNumber; @Schema(description = "报工日期") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime reportDate; @Schema(description = "计件时间") @@ -66,4 +68,13 @@ public class ProduceReportDetailSaveReqVO { @Schema(description = "报工状态", example = "1") private Integer reportStatus; + @Schema(description = "班别", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + private Integer groupType; + @Schema(description = "班别", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + private String orgType; + @Schema(description = "班别", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + private String reportType; + + @Schema(description = "报工日期字符串") + private String reportDateString; } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/producereport/ProduceReportDetailDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/producereport/ProduceReportDetailDO.java index 0bea3fc59b..633d7ad205 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/producereport/ProduceReportDetailDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/producereport/ProduceReportDetailDO.java @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.math.BigDecimal; @@ -108,4 +109,6 @@ public class ProduceReportDetailDO extends BaseDO { */ private Integer reportStatus; + @Schema(description = "班别", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + private Integer groupType; } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/orgworker/OrgWorkerMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/orgworker/OrgWorkerMapper.java index e1819c9b70..09f652c58a 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/orgworker/OrgWorkerMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/orgworker/OrgWorkerMapper.java @@ -35,6 +35,8 @@ public interface OrgWorkerMapper extends BaseMapperX { .eqIfPresent(OrgWorkerDO::getGroupType, reqVO.getGroupType()) .betweenIfPresent(OrgWorkerDO::getWorkDate, reqVO.getWorkDate()) .betweenIfPresent(OrgWorkerDO::getCreateTime, reqVO.getCreateTime()) + .in(reqVO.getWorkerIds()!=null&&reqVO.getWorkerIds().size()>0, + OrgWorkerDO::getWorkerId, reqVO.getWorkerIds()) .orderByAsc(OrgWorkerDO::getId)); } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/producereport/ProduceReportDetailMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/producereport/ProduceReportDetailMapper.java index 4f2b5bd3b9..2e0934beac 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/producereport/ProduceReportDetailMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/producereport/ProduceReportDetailMapper.java @@ -37,6 +37,11 @@ public interface ProduceReportDetailMapper extends BaseMapperX { return selectList(new LambdaQueryWrapperX() .inIfPresent(WorkTeamDetailDO::getWorkTeamId, teamIds)); } + default List getUserWorkTeamDetail(Long workerId, Integer userRole){ + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(WorkTeamDetailDO::getUserRole, userRole) + .eqIfPresent(WorkTeamDetailDO::getUserId, workerId)); + } + default List getDetailByWorkTeamIds(List workerIds){ + return selectList(new LambdaQueryWrapperX() + .in(workerIds!=null&& workerIds.size()>0,WorkTeamDetailDO::getWorkTeamId, workerIds)); + } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/workteam/WorkTeamMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/workteam/WorkTeamMapper.java index 897083167b..5877f2e057 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/workteam/WorkTeamMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/workteam/WorkTeamMapper.java @@ -37,4 +37,7 @@ public interface WorkTeamMapper extends BaseMapperX { .eqIfPresent(WorkTeamDO::getRemark, detailDO.getRemark()) .eqIfPresent(WorkTeamDO::getIsEnable, detailDO.getIsEnable())); } + default List selectByIds(List ids) { + return selectBatchIds(ids); + } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/orgworker/OrgWorkerService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/orgworker/OrgWorkerService.java index 07277e3b1c..badfafd8d6 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/orgworker/OrgWorkerService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/orgworker/OrgWorkerService.java @@ -54,4 +54,6 @@ public interface OrgWorkerService { */ PageResult getOrgWorkerPage(OrgWorkerPageReqVO pageReqVO); List buildVOList(List list); + + List getOrgWorkerByReportResVo(OrgWorkerPageReqVO pageReqVO); } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/orgworker/OrgWorkerServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/orgworker/OrgWorkerServiceImpl.java index 79c9d17aa8..ff131122f4 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/orgworker/OrgWorkerServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/orgworker/OrgWorkerServiceImpl.java @@ -126,7 +126,8 @@ public class OrgWorkerServiceImpl implements OrgWorkerService { convertSet(list, OrgWorkerDO::getWorkerId)); return BeanUtils.toBean(list, OrgWorkerRespVO.class, item -> { MapUtils.findAndThen(map, item.getOrgId(), - org -> item.setOrgName(org.getName())); + org -> item.setOrgName(org.getName()).setOrgType(org.getOrgType()) + ); MapUtils.findAndThen(userMap, item.getWorkerId(), user -> item.setWorkerName(user.getNickname())); @@ -134,4 +135,10 @@ public class OrgWorkerServiceImpl implements OrgWorkerService { user -> item.setCreator(user.getNickname())); }); } + + + @Override + public List getOrgWorkerByReportResVo(OrgWorkerPageReqVO pageReqVO){ + return orgWorkerMapper.selectList(pageReqVO); + } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanService.java index 69ce6c4aec..7f408559a9 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanService.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.mes.service.plan; import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProductRespVO; import cn.iocoder.yudao.module.mes.controller.admin.itemrequisition.vo.ItemRequisitionSaveReqVO; import cn.iocoder.yudao.module.mes.controller.admin.plan.vo.PlanPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.plan.vo.PlanRespVO; @@ -85,4 +86,7 @@ public interface PlanService { List getPlanByStatusAndPipeline(List statusList, String pipeline); void updateStatus( Long id,Integer status); + + /**获取当前某些状态的计划的产品列表**/ + List getProductByPlanStatus(List statusList); } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java index 7502aea9ce..0eacdf9a5d 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/plan/PlanServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.MapUtils; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProductRespVO; import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO; import cn.iocoder.yudao.module.erp.service.product.ErpProductService; import cn.iocoder.yudao.module.mes.controller.admin.itemrequisition.vo.ItemRequisitionSaveReqVO; @@ -32,6 +33,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; +import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; @@ -208,4 +210,14 @@ public class PlanServiceImpl implements PlanService { public void updateStatus( Long id,Integer status){ planMapper.updateStatus(id, status); } + @Override + public List getProductByPlanStatus(List statusList){ + List planDOList = getPlanByStatus(statusList); + List ids = planDOList.stream().map(PlanDO::getProductId).collect(Collectors.toList()); + if(ids!=null && ids.size()>0){ + List list = productService.buildProductVOList(productService.getProductList(ids)); + return list; + } + return new ArrayList<>(); + } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/workteam/WorkTeamService.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/workteam/WorkTeamService.java index 9d0b065a87..75c4c6fe01 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/workteam/WorkTeamService.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/workteam/WorkTeamService.java @@ -108,4 +108,9 @@ public interface WorkTeamService { */ List getUserList(String processType, String groupType); List getUserList2(Long orgId, String groupType); + + List getUserWorkTeamDetail(Long workerId, Integer userRole); + + List selectByIds(List ids); + List getDetailByWorkTeamIds(List workerIds); } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/workteam/WorkTeamServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/workteam/WorkTeamServiceImpl.java index 4429f64a48..201900de9c 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/workteam/WorkTeamServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/workteam/WorkTeamServiceImpl.java @@ -241,4 +241,17 @@ public class WorkTeamServiceImpl implements WorkTeamService { .collect(Collectors.toList()); return adminUserApi.getUserList(idList); } + + @Override + public List getUserWorkTeamDetail(Long workerId, Integer userRole){ + return workTeamDetailMapper.getUserWorkTeamDetail(workerId,userRole); + } + @Override + public List selectByIds(List ids){ + return workTeamMapper.selectByIds(ids); + } + @Override + public List getDetailByWorkTeamIds(List workerIds){ + return workTeamDetailMapper.getDetailByWorkTeamIds(workerIds); + } } \ No newline at end of file