一件代发拣货

lastleg-service/src/main/java/com/baiyue/lastleg/customervisit/controller/CustomerVisitController.java

@@ -7,7 +7,6 @@ import com.baiyue.lastleg.customervisit.dto.CustomerVisitResponses;
 import com.baiyue.lastleg.customervisit.service.CustomerVisitService;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -25,7 +24,6 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.server.ResponseStatusException;
 
 @RestController
-@ConditionalOnProperty(name = "lastleg.future-outbound-api.enabled", havingValue = "true")
 @RequestMapping("/api/platform/v1/last-leg")
 public class CustomerVisitController {
     @Resource private CustomerVisitService service;

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

@@ -11,7 +11,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
 @RestController
-@ConditionalOnProperty(name = "lastleg.future-outbound-api.enabled", havingValue = "true")
 @RequestMapping("/api/platform/v1/last-leg")
 @Tag(name = "Outbound and delivery")
 public class DeliveryTransferController {

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

@@ -7,14 +7,12 @@ import com.baiyue.lastleg.delivery.dto.DeliveryResponses;
 import com.baiyue.lastleg.delivery.service.DeliveryTransferService;
 import jakarta.annotation.Resource;
 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.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
 @RestController
-@ConditionalOnProperty(name="lastleg.future-outbound-api.enabled", havingValue="true")
 @RequestMapping("/api/pda/v1/last-leg/outbound-tasks")
 public class OutboundPdaController {
     @Resource private DeliveryTransferService service;

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/controller/DispatchController.java

@@ -13,7 +13,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 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.web.bind.annotation.DeleteMapping;
@@ -27,7 +26,6 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ResponseStatusException;
 
 @RestController
-@ConditionalOnProperty(name = "lastleg.future-outbound-api.enabled", havingValue = "true")
 @RequestMapping("/api/platform/v1/last-leg/dispatches")
 @Tag(name = "Tail-leg vehicle dispatch")
 public class DispatchController {

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/pda/controller/DispatchPdaController.java

@@ -7,14 +7,12 @@ import com.baiyue.lastleg.dispatch.pda.dto.DispatchPdaResponses;
 import com.baiyue.lastleg.dispatch.pda.service.DispatchPdaWorkflowService;
 import jakarta.annotation.Resource;
 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.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 
 @RestController
-@ConditionalOnProperty(name = "lastleg.future-outbound-api.enabled", havingValue = "true")
 @RequestMapping("/api/pda/v1/last-leg/dispatches/{dispatchNo}")
 public class DispatchPdaController {
     public static final String OPERATE_PERMISSION = "lastleg:pda:operate";

lastleg-service/src/main/java/com/baiyue/lastleg/exceptionorder/controller/ExceptionOrderController.java

@@ -8,7 +8,6 @@ import com.baiyue.lastleg.exceptionorder.dto.ExceptionOrderResponses;
 import com.baiyue.lastleg.exceptionorder.service.ExceptionOrderService;
 import jakarta.annotation.Resource;
 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.web.bind.annotation.*;
@@ -17,7 +16,6 @@ import org.springframework.web.server.ResponseStatusException;
 import java.util.List;
 
 @RestController
-@ConditionalOnProperty(name = "lastleg.future-outbound-api.enabled", havingValue = "true")
 @RequestMapping("/api/platform/v1/last-leg")
 public class ExceptionOrderController {
     @Resource private ExceptionOrderService service;

lastleg-service/src/main/resources/application.yml

@@ -39,8 +39,6 @@ lastleg:
     enabled: ${LASTLEG_DISPATCH_QUERY_API_ENABLED:true}
   smart-dispatch-api:
     enabled: ${LASTLEG_SMART_DISPATCH_API_ENABLED:true}
-  future-outbound-api:
-    enabled: ${LASTLEG_FUTURE_OUTBOUND_API_ENABLED:true}
 
 baiyue:
   http:

lastleg-service/src/test/java/com/baiyue/lastleg/controller/Phase4BrowserApiBoundaryTest.java

@@ -1,10 +1,13 @@
 package com.baiyue.lastleg.controller;
 
 import com.baiyue.lastleg.delivery.controller.DeliveryTransferController;
+import com.baiyue.lastleg.delivery.controller.OutboundPdaController;
 import com.baiyue.lastleg.dispatch.controller.DispatchController;
 import com.baiyue.lastleg.dispatch.controller.DispatchQueryController;
 import com.baiyue.lastleg.dispatch.controller.SmartDispatchController;
 import com.baiyue.lastleg.dispatch.pda.controller.DispatchPdaController;
+import com.baiyue.lastleg.customervisit.controller.CustomerVisitController;
+import com.baiyue.lastleg.exceptionorder.controller.ExceptionOrderController;
 import com.baiyue.lastleg.inboundplan.pda.controller.ReceivingContainerController;
 import com.baiyue.lastleg.inventory.command.controller.InventoryCommandController;
 import org.junit.jupiter.api.Test;
@@ -39,14 +42,12 @@ class Phase4BrowserApiBoundaryTest {
     }
 
     @Test
-    void excludedOutboundControllersAreDisabledUnlessExplicitlyEnabledLater() {
+    void outboundControllersAreNotPropertyGated() {
         for (Class<?> type : new Class<?>[] {
-            DispatchController.class, DeliveryTransferController.class, DispatchPdaController.class
+            DispatchController.class, DeliveryTransferController.class, DispatchPdaController.class,
+            OutboundPdaController.class, CustomerVisitController.class, ExceptionOrderController.class
         }) {
-            ConditionalOnProperty condition = type.getAnnotation(ConditionalOnProperty.class);
-            assertTrue(condition != null, type.getSimpleName());
-            assertTrue(Arrays.asList(condition.name()).contains("lastleg.future-outbound-api.enabled"));
-            assertFalse(condition.matchIfMissing());
+            assertFalse(type.isAnnotationPresent(ConditionalOnProperty.class), type.getSimpleName());
         }
     }
 
@@ -65,11 +66,10 @@ class Phase4BrowserApiBoundaryTest {
     }
 
     @Test
-    void dispatchQueryIsEnabledByDefaultWithoutEnablingOutboundCommands() throws Exception {
+    void dispatchQueryAndSmartDispatchAreEnabledByDefault() throws Exception {
         String yaml = Files.readString(Path.of("src/main/resources/application.yml"));
         assertTrue(yaml.contains("enabled: ${LASTLEG_DISPATCH_QUERY_API_ENABLED:true}"));
         assertTrue(yaml.contains("enabled: ${LASTLEG_SMART_DISPATCH_API_ENABLED:true}"));
-        assertFalse(yaml.contains("future-outbound-api:"));
     }
 
     @Test