Skip to content

[FEAT] MRP 실행 시 최소 시작일 추가 및 생산 계획 목록 조회 상태 필터 추가 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
taemin3 merged 1 commit into from
Nov 9, 2025
Merged

[FEAT] MRP 실행 시 최소 시작일 추가 및 생산 계획 목록 조회 상태 필터 추가 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/com/sampoom/factory/api/part/controller/PartOrderController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ public ResponseEntity<ApiResponse<PageResponseDto<PartOrderResponseDto>>> getPar
@GetMapping("/orders/production-plans")
public ResponseEntity<ApiResponse<PageResponseDto<PartOrderResponseDto>>> getProductionPlans(
@PathVariable Long factoryId,
@RequestParam(required = false) List<PartOrderStatus> statuses,
@RequestParam(required = false) List<PartOrderPriority> priorities,
@RequestParam(required = false) String query,
@RequestParam(required = false) Long categoryId,
Expand All @@ -103,7 +104,7 @@ public ResponseEntity<ApiResponse<PageResponseDto<PartOrderResponseDto>>> getPro
@RequestParam(defaultValue = "10") int size,
@RequestParam(defaultValue = "7") int includeRecentDays
) {
PageResponseDto<PartOrderResponseDto> response = partOrderService.getProductionPlans(factoryId, priorities, query, categoryId, groupId, page, size, includeRecentDays);
PageResponseDto<PartOrderResponseDto> response = partOrderService.getProductionPlans(factoryId, statuses, priorities, query, categoryId, groupId, page, size, includeRecentDays);
return ApiResponse.success(SuccessStatus.OK, response);
}

Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/sampoom/factory/api/part/dto/PartOrderResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public class PartOrderResponseDto {
// 날짜 관련 필드들
private LocalDateTime requiredDate; // 고객이 요청한 필요일
private LocalDateTime scheduledDate; // 예정일
private LocalDateTime minimumStartDate; // 요구일에 맞추기 위한 최소 시작일
private Double progressRate; // 진행률 (0.0 ~ 1.0)
private String rejectionReason; // 반려 사유
private Integer dDay; // D-day
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/com/sampoom/factory/api/part/entity/PartOrder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ public class PartOrder extends BaseTimeEntity {
@Column(name = "scheduled_date")
private LocalDateTime scheduledDate; // MRP 실행 후 계산된 예정일

@Column(name = "minimum_start_date")
private LocalDateTime minimumStartDate; // 요구일에 맞추기 위한 최소 시작일

@Column(name = "progress_rate")
@Builder.Default
private Double progressRate = 0.0; // 진행률 (0.0 ~ 1.0)
Expand Down Expand Up @@ -88,6 +91,10 @@ public void updateScheduledDate(LocalDateTime scheduledDate) {
updateDDay();
}

public void updateMinimumStartDate(LocalDateTime minimumStartDate) {
this.minimumStartDate = minimumStartDate;
}

public void updateProgressRate(Double progressRate) {
this.progressRate = progressRate;
}
Expand Down
52 changes: 35 additions & 17 deletions src/main/java/com/sampoom/factory/api/part/service/PartOrderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,22 +221,36 @@ public void executeMRPLogic(PartOrder partOrder) {
LocalDateTime scheduledDate = LocalDateTime.now().plusDays(totalLeadTimeDays);
partOrder.updateScheduledDate(scheduledDate);

// 요구일에 맞추기 위한 최소 시작일 계산 (역산)
LocalDateTime minimumStartDate = partOrder.getRequiredDate().minusDays(totalLeadTimeDays);
partOrder.updateMinimumStartDate(minimumStartDate);

log.info("MRP 계산 완료 - 주문 ID: {}, 총 리드타임: {}일, 예정일: {}, 최소 시작일: {}",
partOrder.getId(), totalLeadTimeDays, scheduledDate, minimumStartDate);

// 자재가용성 설정
partOrder.updateMaterialAvailability(
materialResult.isMaterialShortage() ? MaterialAvailability.INSUFFICIENT : MaterialAvailability.SUFFICIENT
);

// 예정일과 요청일 비교하여 상태 결정
if (partOrder.getScheduledDate().isAfter(partOrder.getRequiredDate())) {
// 예정일이 요청일보다 늦으면 지연 상태
partOrder.markAsDelayed();
log.info("예정일이 요청일을 초과하여 지연 상태로 설정 - 주문 ID: {}, 요청일: {}, 예정일: {}",
partOrder.getId(), partOrder.getRequiredDate(), partOrder.getScheduledDate());
// 최소 시작일이 현재 날짜보다 이전인지 확인하여 상태 결정
LocalDateTime now = LocalDateTime.now();
if (minimumStartDate.isBefore(now)) {
// 최소 시작일이 이미 지났으면, 예정일과 요청일 비교하여 상태 결정
if (partOrder.getScheduledDate().isAfter(partOrder.getRequiredDate())) {
partOrder.markAsDelayed();
log.warn("지연 상태 - 주문 ID: {}, 요구일: {}, 예정일: {}, 최소 시작일(이미 경과): {}",
partOrder.getId(), partOrder.getRequiredDate(), partOrder.getScheduledDate(), minimumStartDate);
} else {
partOrder.confirmPlan();
log.info("계획 확정 - 주문 ID: {}, 요구일: {}, 예정일: {}, 최소 시작일(이미 경과): {}",
partOrder.getId(), partOrder.getRequiredDate(), partOrder.getScheduledDate(), minimumStartDate);
}
} else {
// 예정일이 요청일보다 빠르거나 같으면 계획확정
// 최소 시작일이 아직 오지 않았으면 계획 확정
partOrder.confirmPlan();
log.info("예정일이 요청일 이내로 계획확정 상태로 설정 - 주문 ID: {}, 요청일: {}, 예정일: {}",
partOrder.getId(), partOrder.getRequiredDate(), partOrder.getScheduledDate());
log.info("계획 확정 - 주문 ID: {}, 요구일: {}, 예정일: {}, 최소 시작일: {}",
partOrder.getId(), partOrder.getRequiredDate(), partOrder.getScheduledDate(), minimumStartDate);
}

if (materialResult.isMaterialShortage()) {
Expand Down Expand Up @@ -566,19 +580,21 @@ public PageResponseDto<PartOrderResponseDto> getPartOrders(Long factoryId, List<
}

/**
* 생산계획 목록 조회 (계획 상태 + 최근 IN_PROGRESS로 전환된 데이터 포함) - 컨트롤러 시그니처와 정확히 맞춤
* 생산계획 목록 조회 (계획 상태 + 최근 IN_PROGRESS로 전환된 데이터 포함) - 상태 필터 추가
*/
public PageResponseDto<PartOrderResponseDto> getProductionPlans(Long factoryId, List<PartOrderPriority> priorities,
public PageResponseDto<PartOrderResponseDto> getProductionPlans(Long factoryId, List<PartOrderStatus> statuses, List<PartOrderPriority> priorities,
String query, Long categoryId, Long groupId,
int page, int size, int includeRecentDays) {
Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "updatedAt"));

// 생산계획 상태: UNDER_REVIEW, PLAN_CONFIRMED, DELAYED
List<PartOrderStatus> planStatuses = Arrays.asList(
PartOrderStatus.UNDER_REVIEW,
PartOrderStatus.PLAN_CONFIRMED,
PartOrderStatus.DELAYED
);
// 상태가 지정되지 않은 경우 기본 생산계획 상태 사용
List<PartOrderStatus> planStatuses = (statuses != null && !statuses.isEmpty()) ?
statuses :
Arrays.asList(
PartOrderStatus.UNDER_REVIEW,
PartOrderStatus.PLAN_CONFIRMED,
PartOrderStatus.DELAYED
);

// includeRecentDays가 -1이면 모든 IN_PROGRESS 데이터 포함, 아니면 최근 며칠간만
LocalDateTime cutoffDate = includeRecentDays == -1 ?
Expand Down Expand Up @@ -642,6 +658,7 @@ private PartOrderResponseDto toResponseDto(PartOrder partOrder) {
.externalPartOrderId(partOrder.getExternalPartOrderId())
.requiredDate(partOrder.getRequiredDate())
.scheduledDate(partOrder.getScheduledDate())
.minimumStartDate(partOrder.getMinimumStartDate())
.progressRate(Math.round(partOrder.getProgressRate() * 100.0) / 100.0)
.rejectionReason(partOrder.getRejectionReason())
.dDay(partOrder.getDDay())
Expand Down Expand Up @@ -689,6 +706,7 @@ private PartOrderResponseDto toProductionPlanResponseDto(PartOrder partOrder) {
.externalPartOrderId(partOrder.getExternalPartOrderId())
.requiredDate(partOrder.getRequiredDate())
.scheduledDate(partOrder.getScheduledDate())
.minimumStartDate(partOrder.getMinimumStartDate())
.progressRate(Math.round(partOrder.getProgressRate() * 100.0) / 100.0)
.rejectionReason(partOrder.getRejectionReason())
.dDay(partOrder.getDDay())
Expand Down