From 8c65f898ed6e5b0c7a94c792c4562f6ec831dccd Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期六, 07 十一月 2026 08:50:53 +0800
Subject: [PATCH] feat: 完善质检、生产、销售、财务与人事模块并接入审批流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java
index 026a97f..6849be0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/schedule/MesProBatchScheduleService.java
+++ b/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());
--
Gitblit v1.9.3