提交

lastleg-service/src/main/java/com/baiyue/lastleg/delivery/controller/DeliveryTransferController.java

@@ -6,6 +6,7 @@ import com.baiyue.common.security.AuthenticatedUser;
 import com.baiyue.lastleg.delivery.dto.DeliveryRequests;
 import com.baiyue.lastleg.delivery.dto.DeliveryResponses;
 import com.baiyue.lastleg.delivery.service.DeliveryTransferService;
+import com.baiyue.lastleg.security.OverseasPermissions;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
@@ -13,6 +14,7 @@ import jakarta.validation.Valid;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
@@ -65,6 +67,7 @@ public class DeliveryTransferController {
     }
 
     @GetMapping("/delivery-orders")
+    @PreAuthorize("hasAuthority('" + OverseasPermissions.DELIVERY_LIST + "')")
     public ApiResponse<PageResult<DeliveryResponses.DeliveryRow>> deliveryPage(
         @AuthenticationPrincipal AuthenticatedUser user, @RequestParam(required = false) String customerId,
         @Valid DeliveryRequests.Query query) {
@@ -72,6 +75,7 @@ public class DeliveryTransferController {
     }
 
     @GetMapping("/delivery-orders/{deliveryNo}")
+    @PreAuthorize("hasAuthority('" + OverseasPermissions.DELIVERY_LIST + "')")
     public ApiResponse<DeliveryResponses.DeliveryDetail> deliveryDetail(
         @AuthenticationPrincipal AuthenticatedUser user, @RequestParam(required = false) String customerId,
         @PathVariable String deliveryNo, @Valid DeliveryRequests.PalletQuery query) {

lastleg-service/src/main/java/com/baiyue/lastleg/procurement/dto/OverseasProcurementResponses.java

@@ -14,7 +14,7 @@ public final class OverseasProcurementResponses {
         String purchaseCategory, String productName, String productSpecification,
         long purchaseQuantity, BigDecimal budgetUnitPrice, String currency,
         String purchaseWarehouseId, String purchaseWarehouseName,
-        long inboundQuantity, long inventoryQuantity,
+        long inboundQuantity, long outboundQuantity, long inventoryQuantity,
         String status, long version, LocalDateTime createdAt, LocalDateTime updatedAt) {}
 
     public record CustomerOption(String customerId, String customerName) {}

lastleg-service/src/main/java/com/baiyue/lastleg/procurement/service/OverseasProcurementService.java

@@ -232,11 +232,15 @@ public class OverseasProcurementService {
     private OverseasProcurementResponses.Summary summary(OverseasProcurementOrder order) {
         long inbound = value(order.getInboundQuantity());
         long outbound = outboundDetails(order).stream().mapToLong(OverseasProcurementResponses.OutboundDetail::quantity).sum();
+        String displayStatus = order.getStatus();
+        if (APPROVED.equals(order.getStatus()) && inbound > 0) {
+            displayStatus = outbound == 0 ? "PENDING_OUTBOUND" : outbound < inbound ? "PARTIALLY_OUTBOUND" : "OUTBOUNDED";
+        }
         return new OverseasProcurementResponses.Summary(order.getId(), order.getOrderNo(), order.getCustomerId(),
             order.getCustomerName(), order.getPurchaseCategory(), order.getProductName(),
             order.getProductSpecification(), value(order.getPurchaseQuantity()), order.getBudgetUnitPrice(),
-            order.getCurrency(), order.getPurchaseWarehouseId(), order.getPurchaseWarehouseName(), inbound, Math.max(0, inbound - outbound),
-            order.getStatus(), value(order.getVersion()), order.getCreatedAt(), order.getUpdatedAt());
+            order.getCurrency(), order.getPurchaseWarehouseId(), order.getPurchaseWarehouseName(), inbound, outbound, Math.max(0, inbound - outbound),
+            displayStatus, value(order.getVersion()), order.getCreatedAt(), order.getUpdatedAt());
     }
 
     private void history(OverseasProcurementOrder order, String operationType, String from, String to,

lastleg-service/src/main/java/com/baiyue/lastleg/security/OverseasPermissions.java

@@ -19,6 +19,7 @@ public final class OverseasPermissions {
     public static final String INVENTORY_EXPORT = "platform:overseas-warehouse:inventory:export";
     public static final String INVENTORY_EDIT = "platform:overseas-warehouse:inventory:edit";
     public static final String INVENTORY_ADJUST = "platform:overseas-warehouse:inventory:adjust";
+    public static final String DELIVERY_LIST = "platform:overseas-warehouse:delivery:list";
     public static final String PURCHASE_LIST = "platform:overseas-business:purchase:list";
     public static final String PURCHASE_EDIT = "platform:overseas-business:purchase:edit";
     public static final String PURCHASE_REVIEW = "platform:overseas-business:purchase:review";