From 6fc8605073cca18f64538f67eac47938e444fba4 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Thu, 13 Mar 2025 18:04:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=8D=95=E7=94=9F=E4=BA=A7=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=8C=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90Bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../optimizeplan/OptimizePlanServiceImpl.java | 14 +++++++++++++- .../controller/admin/dept/DeptController.java | 2 +- .../admin/machine/MachineController.java | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java index 17b07a232..7c0e63bd6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java @@ -15,6 +15,7 @@ import co.elastic.clients.elasticsearch.sql.TranslateRequest; import co.elastic.clients.elasticsearch.sql.TranslateResponse; import co.elastic.clients.json.JsonData; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.cf.imes.framework.common.enums.OrderPlateCutStatusEnum; @@ -1634,6 +1635,13 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { public void updateOrderAndPlanByCutStatus(PlanDO planDO,Long goodsNum,Integer cutedType,List orderIds,Integer boardCount){ + orderMapper.update(new LambdaUpdateWrapper() + .eq(OrderDO::getOrganId, getUserOrganId()) + .eq(OrderDO::getDeleted,false) + .in(OrderDO::getId,orderIds) + .set(OrderDO::getStatus,OrderStatusEnum.IN_PRODUCTION.getStatus())); + + // 未开料 if(OrderPlateCutStatusEnum.NOCUTTING.getStatus().equals(cutedType)){ @@ -1668,8 +1676,11 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { // 已开料 if(OrderPlateCutStatusEnum.OPENED.getStatus().equals(cutedType)){ + planDO.setStatus(PlanStatusEnum.OPENING.getStatus()); + List plateDOList = plateMapper.selectNoCutPlateByPlateId(orderIds, getUserOrganId()); + // 生产单的小板已全部开料 List orderIdList = plateDOList.stream().map(PlateDO::getOrderId).distinct().toList(); orderIds.removeAll(orderIdList); @@ -1693,9 +1704,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { planDO.setStatus(PlanStatusEnum.OPENED.getStatus()); planDO.setProduceTime(LocalDateTime.now()); - planMapper.updateById(planDO); } + planMapper.updateById(planDO); + } } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/DeptController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/DeptController.java index 086bf852a..0842f5f80 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/DeptController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/DeptController.java @@ -59,7 +59,7 @@ public class DeptController { @GetMapping("/list") @Operation(summary = "获取部门列表") - @PreAuthorize("@ss.hasAnyPermissions('system:dept:query','base:dept:query','base:user:query','base:user:update','base:permission:assign-user-role')") + @PreAuthorize("@ss.hasAnyPermissions('system:dept:query','base:dept:query','base:user:query','base:user:update','base:permission:assign-user-role','system:permission:assign-user-role')") public CommonResult> getDeptList(@Valid DeptListReqVO reqVO) { List list = deptService.getDeptList(reqVO); return success(BeanUtils.toBean(list, DeptRespVO.class)); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java index 6effbd6b3..0ebef9aed 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java @@ -94,7 +94,7 @@ public class MachineController { @GetMapping("getMachineTree") @Operation(summary = "获得机台树") - @PreAuthorize("@ss.hasPermission('system:machine:query')") + @PreAuthorize("@ss.hasAnyPermissions('system:machine:query','system:base-setting')") public CommonResult>> getMachineTree(@RequestParam(required = false) Long type) { return success(machineService.getMachineTree(type)); }