From 130d293ce51b44429b86596599e5972eb7692abc Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Tue, 25 Jun 2024 18:04:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E5=88=86=E9=A1=B5=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=EF=BC=8C=E5=B7=A5=E5=BA=8F=E6=9D=83=E9=99=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/plan/PlanController.java | 6 +-- .../executor/dal/mysql/plan/PlanMapper.java | 8 ++-- .../executor/dal/mysql/plate/PlateMapper.java | 2 +- .../executor/service/plan/PlanService.java | 2 +- .../service/plan/PlanServiceImpl.java | 4 +- .../resources/mapper/plate/PlateMapper.xml | 7 ++- .../process/ProductionProcessController.java | 6 +-- .../mysql/query/ProductionStatusMapper.java | 22 +++++----- .../manage/service/pack/PackServiceImpl.java | 2 +- .../mysql/query/ProductionStatusMapper.xml | 43 ++++++++++++++++++- .../admin/process/ProcessController.java | 2 +- 11 files changed, 75 insertions(+), 29 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java index fe85b87c4..f449cd7cc 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java @@ -164,10 +164,10 @@ public class PlanController { @GetMapping("getPlateList") @Operation(summary = "根据排单ID获取板材列表（未分页）") - @Parameter(name = "planId", description = "排单id", required = true, example = "1024") + @Parameter(name = "planIds", description = "排单id", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('placeorder:orderlist')") - public CommonResult> getPlateList(@Valid @RequestParam("planId") Long planId) { - return success(planService.getPlateList(planId)); + public CommonResult> getPlateList(@Valid @RequestParam("planIds") List planIds) { + return success(planService.getPlateList(planIds)); } } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java index 9219e5715..9de1610fa 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java @@ -29,14 +29,14 @@ public interface PlanMapper extends BaseMapperX { if(StrUtil.isNotBlank(reqVO.getCustomer())) { return selectJoinPage(reqVO, PlanDO.class, new MPJLambdaWrapperX() .eq(PlanDO::getOrganId,getUserOrganId()) - .eqIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo()) + .likeIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo()) .eqIfPresent(PlanDO::getSort, reqVO.getSort()) .eqIfPresent(PlanDO::getType, reqVO.getType()) .eqIfPresent(PlanDO::getStatus, reqVO.getStatus()) .eqIfPresent(PlanDO::getIsPay, reqVO.getIsPay()) .eqIfPresent(PlanDO::getMachineId, reqVO.getMachineId()) .betweenIfPresent(PlanDO::getPlanTime, reqVO.getPlanTime()) - .eqIfPresent(PlanDO::getOrderNos, reqVO.getOrderNos()) + .likeIfPresent(PlanDO::getOrderNos, reqVO.getOrderNos()) .eqIfPresent(PlanDO::getRemark, reqVO.getRemark()) .betweenIfPresent(PlanDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(PlanDO::getOperator, reqVO.getOperator()) @@ -52,14 +52,14 @@ public interface PlanMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .eq(PlanDO::getOrganId,getUserOrganId()) - .eqIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo()) + .likeIfPresent(PlanDO::getPlanNo, reqVO.getPlanNo()) .eqIfPresent(PlanDO::getSort, reqVO.getSort()) .eqIfPresent(PlanDO::getType, reqVO.getType()) .eqIfPresent(PlanDO::getStatus, reqVO.getStatus()) .eqIfPresent(PlanDO::getIsPay, reqVO.getIsPay()) .eqIfPresent(PlanDO::getMachineId, reqVO.getMachineId()) .betweenIfPresent(PlanDO::getPlanTime, reqVO.getPlanTime()) - .eqIfPresent(PlanDO::getOrderNos, reqVO.getOrderNos()) + .likeIfPresent(PlanDO::getOrderNos, reqVO.getOrderNos()) .eqIfPresent(PlanDO::getRemark, reqVO.getRemark()) .betweenIfPresent(PlanDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(PlanDO::getOperator, reqVO.getOperator()) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java index 6eeba3dac..88adfbbe0 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java @@ -116,7 +116,7 @@ public interface PlateMapper extends BaseMapperX { List selectPlateIdListByBodyId(@Param("bodyId") Long bodyId, @Param("organId") Long organId); - List selectPlateListByPlanId(@Param("planId") Long planId, @Param("organId") Long organId); + List selectPlateListByPlanId(@Param("planIds") List planIds, @Param("organId") Long organId); // 根据需要删除的小板id查找具体信息 List selectPlateGoodsListByList(@Param("plates") List goodsIdList, @Param("orderId") Long orderId, @Param("organId") Long organId); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java index 4e65c1c05..0a8ed8a91 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java @@ -70,5 +70,5 @@ public interface PlanService { Boolean setSort(List list); - List getPlateList(Long planId); + List getPlateList(List planIds); } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index e085fb63f..5efdfdebe 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java @@ -510,10 +510,10 @@ public class PlanServiceImpl implements PlanService { @Override - public List getPlateList(Long planId) { + public List getPlateList(List planIds) { - return plateMapper.selectPlateListByPlanId(planId,getUserOrganId()); + return plateMapper.selectPlateListByPlanId(planIds,getUserOrganId()); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml index f7faf5b75..4f6980704 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml @@ -301,7 +301,12 @@ left join order_plate a on b.plate_id = a.id and b.order_id = a.order_id and b.organ_id = a.organ_id left join order_goods e on a.goods_id = e.id and a.order_id = e.order_id and a.organ_id = e.organ_id - where p.plan_id = #{planId} and p.organ_id = #{organId} + where p.organ_id = #{organId} + and p.plan_id in + + + #{planIds} + order by a.order_id,plateName; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java index 7f84a1476..6a23b5932 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/ProductionProcessController.java @@ -40,7 +40,7 @@ public class ProductionProcessController { @GetMapping("/page") @Operation(summary = "查看生产工序分页") - @PreAuthorize("@ss.hasPermission('manage:process:query')") + @PreAuthorize("@ss.hasPermission('product:process:query')") public CommonResult> getUserPage(@Valid ProcessPageReqVO pageReqVO) { return success(productionProcessService.getProcessPage(pageReqVO)); @@ -53,7 +53,7 @@ public class ProductionProcessController { @PutMapping("/update") @Operation(summary = "修改生产工序明细和步骤表的状态") - @PreAuthorize("@ss.hasPermission('manage:process:update')") + @PreAuthorize("@ss.hasPermission('product:process:work')") public CommonResult updateProcessStatus(@Valid @RequestBody OrderProcessStepItemVO reqVo){ productionProcessService.updateProcessStatus(reqVo); return success(true); @@ -64,7 +64,7 @@ public class ProductionProcessController { @GetMapping("/selectPlate") @Operation(summary = "查看当前生产单的工序对应的板件信息") - @PreAuthorize("@ss.hasPermission('manage:process:view')") + @PreAuthorize("@ss.hasPermission('product:process:view')") public CommonResult selectPlate(@Valid ProcessPlateReqVO reqVO){ return success(productionProcessService.selectPlate(reqVO)); } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.java index 07bc55bb5..ab6e9464c 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.java @@ -44,16 +44,16 @@ public interface ProductionStatusMapper extends BaseMapperX { PrintOrderRespVO selectPrintOrder(@Param("orderNo") Long orderNo,@Param("organId")Long organId); - default List selectPackPage(PackPageReqVO pageReqVO,Long organId) { - return selectList(new LambdaQueryWrapperX() - .eq(OrderDO::getOrganId,organId) - .likeIfPresent(OrderDO::getId, String.valueOf(pageReqVO.getOrderId())) - .eqIfPresent(OrderDO::getCustomOrderNo, pageReqVO.getCustomOrderNo()) - .likeIfPresent(OrderDO::getCustomer, pageReqVO.getCustomer()) - .likeIfPresent(OrderDO::getAddress, pageReqVO.getAddress()) - .eqIfPresent(OrderDO::getStatus, pageReqVO.getStatus()) - .orderByDesc(OrderDO::getCreateTime)); - } +// default List selectOrderIds(PackPageReqVO pageReqVO,Long organId) { +// return selectList(new LambdaQueryWrapperX() +// .eq(OrderDO::getOrganId,organId) +// .eqIfPresent(OrderDO::getId, pageReqVO.getOrderId()) +// .eqIfPresent(OrderDO::getCustomOrderNo, pageReqVO.getCustomOrderNo()) +// .likeIfPresent(OrderDO::getCustomer, pageReqVO.getCustomer()) +// .likeIfPresent(OrderDO::getAddress, pageReqVO.getAddress()) +// .eqIfPresent(OrderDO::getStatus, pageReqVO.getStatus()) +// .orderByDesc(OrderDO::getCreateTime)); +// } IPage selectOrderPlate( @Param("page") IPage page, @Param("orderIds") List orderIds, @Param("organId") Long organId); @@ -64,4 +64,6 @@ public interface ProductionStatusMapper extends BaseMapperX { + List selectOrderIds(@Param("pageReqVO") PackPageReqVO pageReqVO,@Param("organId") Long organId); + } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java index 07cbed1db..d090ca0ca 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/pack/PackServiceImpl.java @@ -74,7 +74,7 @@ public class PackServiceImpl implements PackService { PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); // 根据生产状态查询生产单号 - List orderIds = productionStatusMapper.selectPackPage(pageReqVO,getUserOrganId()).stream().map(OrderDO::getId).collect(Collectors.toList()); + List orderIds = productionStatusMapper.selectOrderIds(pageReqVO,getUserOrganId()).stream().map(m->m.getId()).collect(Collectors.toList()); if(orderIds.isEmpty()){ return null; diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml index b32806d44..46173b425 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/query/ProductionStatusMapper.xml @@ -57,7 +57,7 @@ + + + \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessController.java index 07ff27d15..ca68d0afa 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessController.java @@ -119,7 +119,7 @@ public class ProcessController { @GetMapping("/select") @Operation(summary = "查看当前登录用户的组织的工序信息") @Parameter(name = "userId", description = "当前登录的用户ID", required = true, example = "1") - @PreAuthorize("@ss.hasPermission('manage:process:query')") + @PreAuthorize("@ss.hasPermission('system:process:query')") public CommonResult> getUserPage(@Valid @RequestParam("userId") Long userId) { return success(processService.getUserProcess(userId));