Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public enum SuccessMessage {
UPDATE_RECEIPT_SUCCESS("입고 수정 성공"),
DELETE_RECEIPT_SUCCESS("입고 삭제 성공"),
GET_RECEIPT_ITEM_SUCCESS("입고 아이템 조회 성공"),
UPDATE_RECEIPT_ITEM_SUCCESS("입고 아이템 수정 성공"),
;

private final String message;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.almang.inventory.global.api.SuccessMessage;
import com.almang.inventory.global.security.principal.CustomUserPrincipal;
import com.almang.inventory.receipt.domain.ReceiptStatus;
import com.almang.inventory.receipt.dto.request.UpdateReceiptItemRequest;
import com.almang.inventory.receipt.dto.request.UpdateReceiptRequest;
import com.almang.inventory.receipt.dto.response.DeleteReceiptResponse;
import com.almang.inventory.receipt.dto.response.ReceiptItemResponse;
Expand Down Expand Up @@ -149,4 +150,20 @@ public ResponseEntity<ApiResponse<ReceiptItemResponse>> getReceiptItem(
ApiResponse.success(SuccessMessage.GET_RECEIPT_ITEM_SUCCESS.getMessage(), response)
);
}

@PatchMapping("/receipt/{receiptItemId}")
@Operation(summary = "입고 아이템 수정", description = "입고 아이템을 수정합니다.")
public ResponseEntity<ApiResponse<ReceiptItemResponse>> updateReceiptItem(
@PathVariable Long receiptItemId,
@Valid @RequestBody UpdateReceiptItemRequest request,
@AuthenticationPrincipal CustomUserPrincipal userPrincipal
) {
Long userId = userPrincipal.getId();
log.info("[ReceiptController] 입고 아이템 수정 요청 - userId: {}, receiptItemId: {}", userId, receiptItemId);
ReceiptItemResponse response = receiptService.updateReceiptItem(receiptItemId, request, userId);

return ResponseEntity.ok(
ApiResponse.success(SuccessMessage.UPDATE_RECEIPT_ITEM_SUCCESS.getMessage(), response)
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public record ReceiptItemResponse(
BigDecimal measuredWeight,
BigDecimal expectedQuantity,
Integer actualQuantity,
Integer unitPrice,
Integer amount,
BigDecimal errorRate,
String note
Expand All @@ -24,6 +25,7 @@ public static ReceiptItemResponse from(ReceiptItem receiptItem) {
receiptItem.getMeasuredWeight(),
receiptItem.getExpectedQuantity(),
receiptItem.getActualQuantity(),
receiptItem.getUnitPrice(),
receiptItem.getAmount(),
receiptItem.getErrorRate(),
receiptItem.getNote()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,26 @@ public ReceiptItemResponse getReceiptItem(Long receiptItemId, Long userId) {
return ReceiptItemResponse.from(receiptItem);
}

@Transactional
public ReceiptItemResponse updateReceiptItem(Long receiptItemId, UpdateReceiptItemRequest request, Long userId) {
User user = findUserById(userId);
Store store = user.getStore();

log.info("[ReceiptService] 입고 아이템 수정 요청 - userId: {}, storeId: {}", userId, store.getId());
Receipt receipt = findReceiptByIdAndValidateAccess(request.receiptId(), store);
ReceiptItem receiptItem = findReceiptItemByIdAndValidateAccess(receiptItemId, receipt);

receiptItem.update(
request.boxCount(), request.measuredWeight(),
request.expectedQuantity(), request.actualQuantity(),
request.unitPrice(), request.note()
);
receipt.updateTotalBoxCount(calculateTotalBoxCount(receipt.getItems()));

log.info("[ReceiptService] 입고 아이템 수정 성공 - receiptItemId: {}", receiptItem.getId());
return ReceiptItemResponse.from(receiptItem);
}

private List<ReceiptItem> createReceiptItemsFromOrder(Order order) {
List<ReceiptItem> items = new ArrayList<>();

Expand Down
Loading