宁夏三级mom后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
gaoluyang
2 天以前 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java


@@ -21,7 +21,6 @@


import cn.iocoder.yudao.module.mes.service.pro.route.*;


import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;


import cn.iocoder.yudao.module.mes.service.pro.task.MesProTaskService;


import cn.iocoder.yudao.module.mes.service.cal.holiday.MesCalHolidayService;


import jakarta.annotation.Resource;


import org.springframework.context.annotation.Lazy;


import org.springframework.stereotype.Service;


@@ -49,7 +48,6 @@


    @Resource private MesProRouteProductService routeProductService;


    @Resource private MesProProcessService processService;


    @Resource private MesMdItemService itemService;


    @Resource private MesCalHolidayService holidayService;


    @Resource @Lazy private cn.iocoder.yudao.module.mes.service.pd.processparamtemplate.MesPdProcessParamTemplateService paramTemplateService;


    @Resource private MesProScheduleGuardService guard;


    @Resource private CrmCustomerApi customerApi;


@@ -127,7 +125,6 @@


        result.setPreviewTime(now());


        var orders = workOrderMapper.selectByIds(request.getWorkOrderIds());


        var orderMap = orders.stream().collect(Collectors.toMap(MesProWorkOrderDO::getId, order -> order));


        List<Long> permitted = customerApi.getPermittedCustomerIds();


        var stations = workstationService.getWorkstationListByStatus(0).stream()


                .sorted(Comparator.comparing(MesMdWorkstationDO::getId)).toList();


        var machineMap = machineryMapper.selectList().stream().collect(Collectors.toMap(MesDvMachineryDO::getId, machine -> machine));


@@ -138,9 +135,8 @@


                .filter(task -> !Objects.equals(task.getStatus(), MesProTaskStatusEnum.CANCELED.getStatus()))


                .forEach(task -> allRelevantTasks.put(task.getId(), task));


        var existingTasks = new ArrayList<>(allRelevantTasks.values());


        var holidays = holidayService.getHolidayList(request.getStartTime().toLocalDate().atStartOfDay(), request.getStartTime().plusYears(1));


        Set<LocalDate> holidayDates = holidays.stream().filter(day -> Objects.equals(day.getType(), 2))


                .map(day -> day.getDay().toLocalDate()).collect(Collectors.toSet());


        // 排班管理（含节假日设置）已下线，排产不再按节假日跳过


        Set<LocalDate> holidayDates = Set.of();


        var calendar = new MesProScheduleEngine.Calendar(holidayDates, request.getStartTime().toLocalDate().plusYears(1));


        List<MesProScheduleEngine.Busy> busy = new ArrayList<>();


        Set<Long> unknownStations = new HashSet<>();


@@ -170,9 +166,6 @@


            result.getOrders().add(orderPlan);


            try {


                if (order == null) throw new IllegalArgumentException("工单不存在或已删除");


                if (permitted != null && order.getClientId() != null && !permitted.contains(order.getClientId())) {


                    throw new IllegalArgumentException("无权操作该客户的工单");


                }


                orderPlan.setWorkOrderCode(order.getCode());


                orderPlan.setWorkOrderName(order.getName());


                orderPlan.setQuantity(order.getQuantity());