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


@@ -22,6 +22,7 @@


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 cn.iocoder.yudao.module.mes.util.MesOutputItemUtils;


import jakarta.annotation.Resource;


import org.springframework.context.annotation.Lazy;


import org.springframework.stereotype.Service;


@@ -127,7 +128,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));


@@ -170,9 +170,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());


@@ -256,9 +253,9 @@


                    }


                    Long itemId = order.getProductId();


                    if (process.getOutputItemId() != null && !process.getOutputItemId().isBlank()) {


                        String[] output = process.getOutputItemId().split(",");


                        if (output.length != 1) throw new IllegalArgumentException("多产出工序请使用手工排产确认各产出数量");


                        itemId = Long.valueOf(output[0].trim());


                        List<Long> outputIds = MesOutputItemUtils.parseItemIds(process.getOutputItemId());


                        if (outputIds.size() != 1) throw new IllegalArgumentException("多产出工序请使用手工排产确认各产出数量");


                        itemId = outputIds.get(0);


                    }


                    var item = itemService.validateItemExists(itemId);


                    if (!Objects.equals(item.getStatus(), 0)) throw new IllegalArgumentException("工序产出产品已停用");