Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

排单生产状态，角色权限Bug修改

Browse Source
This commit is contained in:
liuzhaotian
2025-03-13 18:04:44 +08:00
parent cb276b1cba
commit 6fc8605073
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+13 -1
View File
@@ -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<Long> orderIds,Integer boardCount){
orderMapper.update(new LambdaUpdateWrapper<OrderDO>()
.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<PlateDO> plateDOList = plateMapper.selectNoCutPlateByPlateId(orderIds, getUserOrganId());
// 生产单的小板已全部开料
List<Long> 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);
}
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/dept/DeptController.java
+1 -1
View File
@@ -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<List<DeptRespVO>> getDeptList(@Valid DeptListReqVO reqVO) {
List<DeptDO> list = deptService.getDeptList(reqVO);
return success(BeanUtils.toBean(list, DeptRespVO.class));
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java
+1 -1
View File
@@ -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<Map<Integer, List<MachineVO>>> getMachineTree(@RequestParam(required = false) Long type) {
return success(machineService.getMachineTree(type));
}