From b30c865dad98352c1683872f6681af7ba5ca5d86 Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Mon, 8 Jul 2024 16:04:19 +0800 Subject: [PATCH] fix org work --- sql/mysql/view.sql | 7 +++- .../admin/orgworker/OrgWorkerController.java | 13 +++---- .../orgworker/vo/OrgWorkerSaveReqVO.java | 2 + .../ProduceReportController.java | 17 ++++---- .../dal/dataobject/orgworker/OrgWorkerDO.java | 11 +++--- .../dal/mysql/orgworker/OrgWorkerMapper.java | 2 + .../orgworker/OrgWorkerServiceImpl.java | 39 ++++++++++++------- 7 files changed, 54 insertions(+), 37 deletions(-) diff --git a/sql/mysql/view.sql b/sql/mysql/view.sql index ed911a2800..ca9ff19504 100644 --- a/sql/mysql/view.sql +++ b/sql/mysql/view.sql @@ -29,4 +29,9 @@ FROM ( `wp`.`report_id` = `pd`.`id` and `wp`.`deleted` = 0 and `pd`.`deleted` =0 - ))) \ No newline at end of file + ))) + + +UPDATE mes_org_worker wo + JOIN mes_organization org ON wo.org_id = org.org_id +SET wo.org_type = org.org_type; \ 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/OrgWorkerController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/OrgWorkerController.java index a6824e499f..c9a2094b7d 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 @@ -22,7 +22,6 @@ 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; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -49,7 +48,7 @@ public class OrgWorkerController { @PostMapping("/create") @Operation(summary = "创建工位安排") - @PreAuthorize("@ss.hasPermission('mes:org-worker:create')") + //@PreAuthorize("@ss.hasPermission('mes:org-worker:create')") public CommonResult createOrgWorker(@Valid @RequestBody OrgWorkerSaveReqVO createReqVO) { return success(orgWorkerService.createOrgWorker(createReqVO)); } @@ -60,7 +59,7 @@ public class OrgWorkerController { } @PutMapping("/update") @Operation(summary = "更新工位安排") - @PreAuthorize("@ss.hasPermission('mes:org-worker:update')") + //@PreAuthorize("@ss.hasPermission('mes:org-worker:update')") public CommonResult updateOrgWorker(@Valid @RequestBody OrgWorkerSaveReqVO updateReqVO) { orgWorkerService.updateOrgWorker(updateReqVO); return success(true); @@ -69,7 +68,7 @@ public class OrgWorkerController { @DeleteMapping("/delete") @Operation(summary = "删除工位安排") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:org-worker:delete')") + //@PreAuthorize("@ss.hasPermission('mes:org-worker:delete')") public CommonResult deleteOrgWorker(@RequestParam("id") Long id) { orgWorkerService.deleteOrgWorker(id); return success(true); @@ -78,7 +77,7 @@ public class OrgWorkerController { @GetMapping("/get") @Operation(summary = "获得工位安排") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:org-worker:query')") + //@PreAuthorize("@ss.hasPermission('mes:org-worker:query')") public CommonResult getOrgWorker(@RequestParam("id") Long id) { OrgWorkerDO orgWorker = orgWorkerService.getOrgWorker(id); return success(BeanUtils.toBean(orgWorker, OrgWorkerRespVO.class)); @@ -87,15 +86,13 @@ public class OrgWorkerController { @GetMapping("/page") @Operation(summary = "获得个人工位安排分页") public CommonResult> getOrgWorkerPage(@Valid OrgWorkerPageReqVO pageReqVO) { -// Long userId = getLoginUserId(); -// pageReqVO.setWorkerId(userId); PageResult pageResult = orgWorkerService.getOrgWorkerPage(pageReqVO); return success(pageResult); } @GetMapping("/export-excel") @Operation(summary = "导出工位安排 Excel") - @PreAuthorize("@ss.hasPermission('mes:org-worker:export')") + //@PreAuthorize("@ss.hasPermission('mes:org-worker:export')") @ApiAccessLog(operateType = EXPORT) public void exportOrgWorkerExcel(@Valid OrgWorkerPageReqVO pageReqVO, 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/vo/OrgWorkerSaveReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/vo/OrgWorkerSaveReqVO.java index cf5d42c7a5..ac562a366e 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/vo/OrgWorkerSaveReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/orgworker/vo/OrgWorkerSaveReqVO.java @@ -19,6 +19,8 @@ public class OrgWorkerSaveReqVO { @Schema(description = "工位id", requiredMode = Schema.RequiredMode.REQUIRED, example = "4727") @NotNull(message = "工位id不能为空") private Long orgId; + @Schema(description = "工位类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "4727") + private String orgType; @Schema(description = "工作日期", requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime workDate; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportController.java index eae8d01cb0..5ae4f7d294 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/ProduceReportController.java @@ -18,7 +18,6 @@ import cn.iocoder.yudao.module.mes.service.workteam.WorkTeamService; 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.*; @@ -46,7 +45,7 @@ public class ProduceReportController { @PostMapping("/create") @Operation(summary = "创建生产报工单") - @PreAuthorize("@ss.hasPermission('mes:produce-report:create')") + //@PreAuthorize("@ss.hasPermission('mes:produce-report:create')") public CommonResult createProduceReport(@Valid @RequestBody ProduceReportSaveReqVO createReqVO) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime localDateTime = LocalDateTime.parse(createReqVO.getReportDateString(), formatter); @@ -56,7 +55,7 @@ public class ProduceReportController { @PutMapping("/update") @Operation(summary = "更新生产报工单") - @PreAuthorize("@ss.hasPermission('mes:produce-report:update')") + //@PreAuthorize("@ss.hasPermission('mes:produce-report:update')") public CommonResult updateProduceReport(@Valid @RequestBody ProduceReportSaveReqVO updateReqVO) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); LocalDateTime localDateTime = LocalDateTime.parse(updateReqVO.getReportDateString(), formatter); @@ -68,7 +67,7 @@ public class ProduceReportController { @DeleteMapping("/delete") @Operation(summary = "删除生产报工单") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('mes:produce-report:delete')") + //@PreAuthorize("@ss.hasPermission('mes:produce-report:delete')") public CommonResult deleteProduceReport(@RequestParam("id") Long id) { produceReportService.deleteProduceReport(id); return success(true); @@ -77,7 +76,7 @@ public class ProduceReportController { @GetMapping("/get") @Operation(summary = "获得生产报工单") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('mes:produce-report:query')") + //@PreAuthorize("@ss.hasPermission('mes:produce-report:query')") public CommonResult getProduceReport(@RequestParam("id") Long id) { ProduceReportDO produceReport = produceReportService.getProduceReport(id); return success(BeanUtils.toBean(produceReport, ProduceReportRespVO.class)); @@ -85,7 +84,7 @@ public class ProduceReportController { @GetMapping("/page") @Operation(summary = "获得生产报工单分页") - @PreAuthorize("@ss.hasPermission('mes:produce-report:query')") + //@PreAuthorize("@ss.hasPermission('mes:produce-report:query')") public CommonResult> getProduceReportPage(@Valid ProduceReportPageReqVO pageReqVO) { PageResult pageResult = produceReportService.getProduceReportPage(pageReqVO); @@ -96,7 +95,7 @@ public class ProduceReportController { @GetMapping("/pageReplace") @Operation(summary = "获得生产报工单分页-代报工") - @PreAuthorize("@ss.hasPermission('mes:produce-report:query')") + //@PreAuthorize("@ss.hasPermission('mes:produce-report:query')") public CommonResult> getProduceReportPageReplace(@Valid ProduceReportPageReqVO pageReqVO) { Long userId = getLoginUserId(); WorkTeamDO workTeamDO = new WorkTeamDO().setTeamLeaderId(userId); @@ -116,7 +115,7 @@ public class ProduceReportController { } @GetMapping("/export-excel") @Operation(summary = "导出生产报工单 Excel") - @PreAuthorize("@ss.hasPermission('mes:produce-report:export')") + //@PreAuthorize("@ss.hasPermission('mes:produce-report:export')") @ApiAccessLog(operateType = EXPORT) public void exportProduceReportExcel(@Valid ProduceReportPageReqVO pageReqVO, HttpServletResponse response) throws IOException { @@ -133,7 +132,7 @@ public class ProduceReportController { @GetMapping("/produce-report-detail/list-by-report-id") @Operation(summary = "获得生产报工明细列表") @Parameter(name = "reportId", description = "报工单id") - @PreAuthorize("@ss.hasPermission('mes:produce-report:query')") + //@PreAuthorize("@ss.hasPermission('mes:produce-report:query')") public CommonResult> getProduceReportDetailListByReportId(@RequestParam("reportId") Long reportId) { return success(produceReportService.getDetailListByReportId(reportId)); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/orgworker/OrgWorkerDO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/orgworker/OrgWorkerDO.java index 9c79df0176..8bdd4c3c4b 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/orgworker/OrgWorkerDO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/orgworker/OrgWorkerDO.java @@ -1,12 +1,12 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.orgworker; +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 lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; + import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; /** * 工位安排 DO @@ -32,6 +32,7 @@ public class OrgWorkerDO extends BaseDO { * 工位id */ private Long orgId; + private String orgType; /** * 工作日期 */ 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 33f86ac4dd..d89cbdde55 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 @@ -20,6 +20,7 @@ public interface OrgWorkerMapper extends BaseMapperX { default PageResult selectPage(OrgWorkerPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(OrgWorkerDO::getOrgId, reqVO.getOrgId()) + .eqIfPresent(OrgWorkerDO::getOrgType, reqVO.getOrgType()) .betweenIfPresent(OrgWorkerDO::getWorkDate, reqVO.getWorkDate()) .eqIfPresent(OrgWorkerDO::getGroupType, reqVO.getGroupType()) .eqIfPresent(OrgWorkerDO::getWorkerId, reqVO.getWorkerId()) @@ -32,6 +33,7 @@ public interface OrgWorkerMapper extends BaseMapperX { return selectList(new LambdaQueryWrapperX() .eqIfPresent(OrgWorkerDO::getWorkerId, reqVO.getWorkerId()) .eqIfPresent(OrgWorkerDO::getOrgId, reqVO.getOrgId()) + .eqIfPresent(OrgWorkerDO::getOrgType, reqVO.getOrgType()) .eqIfPresent(OrgWorkerDO::getGroupType, reqVO.getGroupType()) .betweenIfPresent(OrgWorkerDO::getWorkDate, reqVO.getWorkDate()) .betweenIfPresent(OrgWorkerDO::getCreateTime, reqVO.getCreateTime()) 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 ff131122f4..2785e59cab 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 @@ -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.mes.controller.admin.organization.vo.OrgClassEnum; import cn.iocoder.yudao.module.mes.controller.admin.organization.vo.OrganizationListReqVO; import cn.iocoder.yudao.module.mes.controller.admin.orgworker.vo.OrgWorkerPageReqVO; import cn.iocoder.yudao.module.mes.controller.admin.orgworker.vo.OrgWorkerRespVO; @@ -14,7 +15,6 @@ import cn.iocoder.yudao.module.mes.dal.mysql.orgworker.OrgWorkerMapper; import cn.iocoder.yudao.module.mes.service.organization.OrganizationService; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -40,11 +40,18 @@ public class OrgWorkerServiceImpl implements OrgWorkerService { @Resource private OrgWorkerMapper orgWorkerMapper; + @Resource + private OrganizationService organizationService; + + @Resource + private AdminUserApi adminUserApi; @Override public Long createOrgWorker(OrgWorkerSaveReqVO createReqVO) { + OrganizationDO organizationDO = organizationService.getOrganization(createReqVO.getOrgId()); // 插入 OrgWorkerDO orgWorker = BeanUtils.toBean(createReqVO, OrgWorkerDO.class); + orgWorker.setOrgType(organizationDO.getOrgType()); //多个日期 if(createReqVO.getPlanDates()!=null && createReqVO.getPlanDates().length>0){ //校验同工位、同班别、同日期是否已经存在，存在则失败（）不保存 @@ -97,23 +104,27 @@ public class OrgWorkerServiceImpl implements OrgWorkerService { @Override public PageResult getOrgWorkerPage(OrgWorkerPageReqVO pageReqVO) { - //查询工位类型时 - if(pageReqVO.getOrgId()==null && StringUtils.isNotEmpty(pageReqVO.getOrgType())){ - OrganizationListReqVO reqVO = new OrganizationListReqVO(); - reqVO.setOrgType(pageReqVO.getOrgType()); - List list = organizationService.getOrganizationListNoParent(reqVO); - List ids = list.stream() - .map(OrganizationDO::getId) - .collect(Collectors.toList()); - pageReqVO.setOrgIds(ids); + OrganizationListReqVO reqVO = new OrganizationListReqVO(); + boolean orgSearch = false; + //查询某个工序及其下属工序 + if(pageReqVO.getOrgId()!=null){ + OrganizationDO organizationDO = organizationService.getOrganization(pageReqVO.getOrgId()); + if(organizationDO.getOrgClass().equals(OrgClassEnum.工序.getValue())){ + reqVO.setParentId(pageReqVO.getOrgId()); + List orgList = organizationService.getOrganizationListNoParent(reqVO); + if(orgList!=null && orgList.size()>0){ + List ids = orgList.stream() + .map(OrganizationDO::getId) + .collect(Collectors.toList()); + pageReqVO.setOrgIds(ids); + pageReqVO.setOrgId(null); + } + } } PageResult pageResult = orgWorkerMapper.selectPage(pageReqVO); return new PageResult<>(buildVOList(pageResult.getList()),pageResult.getTotal()); } - @Resource - private OrganizationService organizationService; - @Resource - private AdminUserApi adminUserApi; + @Override public List buildVOList(List list) { if (CollUtil.isEmpty(list)) {