机台删除，工序加工，排单加工时间，排单数据筛选Bug修改

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/api/process/ProcessApiImpl.java

@@ -2,6 +2,9 @@ package com.cf.imes.module.system.api.process;
 
 
 import com.cf.imes.framework.common.enums.ProcessProcessingTypeEnum;
+import com.cf.imes.framework.common.util.object.BeanUtils;
+import com.cf.imes.framework.organ.core.context.OrganContextHolder;
+import com.cf.imes.module.system.api.process.dto.ProcessDTO;
 import com.cf.imes.module.system.dal.dataobject.process.ProcessDO;
 import com.cf.imes.module.system.dal.mysql.process.ProcessMapper;
 import org.springframework.validation.annotation.Validated;
@@ -10,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId;
@@ -27,9 +31,9 @@ public class ProcessApiImpl implements ProcessApi {
 
 
     @Override
-    public BigDecimal getProcess() {
+    public BigDecimal getProcess(Long processId) {
 
-        ProcessDO processDO = processMapper.selectByType(ProcessProcessingTypeEnum.COMPONENTPROCESSING.getNumber(),getUserOrganId());
+        ProcessDO processDO = processMapper.selectByType(processId,getUserOrganId());
 
 
         return processDO == null ? BigDecimal.ZERO : processDO.getPieceRate();
@@ -37,5 +41,16 @@ public class ProcessApiImpl implements ProcessApi {
 
 
 
+    @Override
+    public List<ProcessDTO> getUserProcess(Long userId) {
+
+        List<ProcessDO> processDOS = processMapper.selectProcessList(getUserOrganId(), userId)
+                .stream()
+                .filter(f-> Objects.equals(f.getType(),ProcessProcessingTypeEnum.CUTTINGMATERIALS.getNumber()))
+                .toList();
+
+        return BeanUtils.toBean(processDOS,ProcessDTO.class);
+    }
+
 
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/process/ProcessMapper.java

@@ -69,10 +69,10 @@ public interface ProcessMapper extends BaseMapperX<ProcessDO> {
 
 
 
-    default ProcessDO selectByType(Integer number,Long organId) {
+    default ProcessDO selectByType(Long processId,Long organId) {
         return selectOne(new MPJLambdaWrapperX<ProcessDO>()
                 .eq(ProcessDO::getOrganId, organId)
-                .eqIfPresent(ProcessDO::getType,number));
+                .eqIfPresent(ProcessDO::getId,processId));
 
 
     }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/rpc/config/RpcConfiguration.java

@@ -1,12 +1,13 @@
 package com.cf.imes.module.system.framework.rpc.config;
 
 import com.cf.imes.module.executor.api.orderProcess.OrderProcessApi;
+import com.cf.imes.module.executor.api.plan.OrderPlanApi;
 import com.cf.imes.module.infra.api.file.FileApi;
 import com.cf.imes.module.infra.api.websocket.WebSocketSenderApi;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration(proxyBeanMethods = false)
-@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class, OrderProcessApi.class})
+@EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class, OrderProcessApi.class, OrderPlanApi.class})
 public class RpcConfiguration {
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java

@@ -17,6 +17,7 @@ import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cf.imes.framework.organ.core.aop.OrganIgnore;
 import com.cf.imes.framework.security.core.LoginUser;
 import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
+import com.cf.imes.module.executor.api.plan.OrderPlanApi;
 import com.cf.imes.module.system.controller.admin.machine.vo.*;
 import com.cf.imes.module.system.convert.machine.MachineConvert;
 import com.cf.imes.module.system.dal.dataobject.machine.DrillSettingDO;
@@ -77,6 +78,9 @@ public class MachineServiceImpl implements MachineService {
     @Resource
     private MachineTemplateLimitMapper machineTemplateLimitMapper;
 
+    @Resource
+    private OrderPlanApi orderPlanApi;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createCutting(CuttingSaveReqVO createReqVO) {
@@ -119,6 +123,10 @@ public class MachineServiceImpl implements MachineService {
         if (machineDO == null) {
             throw exception(MACHINE_NOT_EXISTS);
         }
+        // 校验当前机台是否使用
+        if(orderPlanApi.getOrderPlan(id).getData()){
+            throw exception(THE_CURRENT_MACHINE_IS_ALREADY_IN_USE);
+        }
         machineMapper.deleteById(id);
     }
 

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java

@@ -3,6 +3,7 @@ package com.cf.imes.module.system.service.process;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;;
+import com.cf.imes.framework.common.enums.ProcessProcessingTypeEnum;
 import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil;
 import com.cf.imes.framework.organ.core.context.OrganContextHolder;
 import com.cf.imes.module.system.controller.admin.process.vo.process.*;
@@ -233,7 +234,11 @@ public class ProcessServiceImpl implements ProcessService {
 
         // 获取组织id
         Long organId = OrganContextHolder.getOrganId();
-        return processMapper.selectProcessList(organId,userId);
+        return processMapper.selectProcessList(organId,userId)
+                .stream()
+                .filter(f-> (!Objects.equals(f.getType(), ProcessProcessingTypeEnum.CUTTINGMATERIALS.getNumber())))
+                .toList();
+
     }