提交

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

@@ -1,7 +1,6 @@
 package com.baiyue.lastleg.dispatch.controller;
 
 import com.baiyue.common.core.api.ApiResponse;
-import com.baiyue.common.core.api.PageResult;
 import com.baiyue.common.security.AuthenticatedUser;
 import com.baiyue.lastleg.dispatch.dto.DispatchRequests;
 import com.baiyue.lastleg.dispatch.dto.DispatchResponse;
@@ -61,24 +60,6 @@ public class DispatchController {
         return ApiResponse.success(service.preArrange(scopedTenant, operatorId, request));
     }
 
-    @GetMapping
-    @Operation(summary = "Page dispatch orders")
-    public ApiResponse<PageResult<DispatchResponse>> page(
-        @AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam(required = false) String customerId,
-        @Valid DispatchRequests.Query query) {
-        return ApiResponse.success(service.page(scope(user, customerId), query));
-    }
-
-    @GetMapping("/{dispatchNo}")
-    @Operation(summary = "Get dispatch details and all pallet destinations")
-    public ApiResponse<DispatchResponse> detail(
-        @AuthenticationPrincipal AuthenticatedUser user,
-        @RequestParam(required = false) String customerId,
-        @PathVariable String dispatchNo) {
-        return ApiResponse.success(service.detail(scope(user, customerId), dispatchNo));
-    }
-
     @PutMapping("/{dispatchNo}")
     @Operation(summary = "Edit vehicle, driver, appointment, route and departure data")
     public ApiResponse<DispatchResponse> update(

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

@@ -0,0 +1,55 @@
+package com.baiyue.lastleg.dispatch.controller;
+
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.common.core.api.PageResult;
+import com.baiyue.common.security.AuthenticatedUser;
+import com.baiyue.lastleg.dispatch.dto.DispatchRequests;
+import com.baiyue.lastleg.dispatch.dto.DispatchResponse;
+import com.baiyue.lastleg.dispatch.service.DispatchService;
+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.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ResponseStatusException;
+
+@RestController
+@ConditionalOnProperty(name = "lastleg.dispatch-query-api.enabled", havingValue = "true")
+@RequestMapping("/api/platform/v1/last-leg/dispatches")
+@Tag(name = "Tail-leg vehicle dispatch query")
+public class DispatchQueryController {
+    @Resource private DispatchService service;
+
+    @GetMapping
+    @Operation(summary = "Page dispatch orders")
+    public ApiResponse<PageResult<DispatchResponse>> page(
+        @AuthenticationPrincipal AuthenticatedUser user,
+        @Valid DispatchRequests.Query query) {
+        requirePlatform(user);
+        return ApiResponse.success(service.page(null, query));
+    }
+
+    @GetMapping("/{dispatchNo}")
+    @Operation(summary = "Get dispatch details and all pallet destinations")
+    public ApiResponse<DispatchResponse> detail(
+        @AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String dispatchNo) {
+        requirePlatform(user);
+        return ApiResponse.success(service.detail(null, dispatchNo));
+    }
+
+    private void requirePlatform(AuthenticatedUser user) {
+        if (user == null || user.tenantId() == null) {
+            throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
+        }
+        if (!"PLATFORM".equals(user.appCode()) || user.tenantId() != 0L) {
+            throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Platform application required");
+        }
+    }
+}

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/mapper/DispatchOrderMapper.java

@@ -11,6 +11,9 @@ public interface DispatchOrderMapper extends BaseMapper<DispatchOrder> {
     @Select("SELECT * FROM ll_dispatch_order WHERE customer_id=#{customerId} AND dispatch_no=#{dispatchNo} LIMIT 1")
     DispatchOrder findByDispatchNo(@Param("customerId") String customerId, @Param("dispatchNo") String dispatchNo);
 
+    @Select("SELECT * FROM ll_dispatch_order WHERE dispatch_no=#{dispatchNo} LIMIT 1")
+    DispatchOrder findAnyByDispatchNo(@Param("dispatchNo") String dispatchNo);
+
     @Select("SELECT * FROM ll_dispatch_order WHERE customer_id=#{customerId} AND id=#{id} LIMIT 1 FOR UPDATE")
     DispatchOrder lockById(@Param("customerId") String customerId, @Param("id") Long id);
 }

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

@@ -112,11 +112,11 @@ public class DispatchPdaWorkflowService {
         long picked = picks.totalItem(customerId, task.getId(), itemId);
         if (picked + request.packages() > item.getPackageCount()) throw conflict("Picked packages exceed dispatch pallet packages");
         String keyBase = "DISPATCH:" + order.getDispatchNo() + ":" + itemId + ":" + request.idempotencyKey();
-        InventoryCommandRequests.Move move = new InventoryCommandRequests.Move(customerId, request.positionId(),
+        InventoryCommandRequests.Move move = new InventoryCommandRequests.Move(request.positionId(),
             request.packages(), order.getDispatchNo(), order.getDispatchNo(), null,
             keyBase + ":ALLOCATE", request.remark());
         inventory.allocate(customerId, operatorId, move);
-        inventory.pick(customerId, operatorId, new InventoryCommandRequests.Move(customerId, request.positionId(),
+        inventory.pick(customerId, operatorId, new InventoryCommandRequests.Move(request.positionId(),
             request.packages(), order.getDispatchNo(), order.getDispatchNo(), null,
             keyBase + ":PICK", request.remark()));
         DispatchPdaPick pick = new DispatchPdaPick();
@@ -200,7 +200,7 @@ public class DispatchPdaWorkflowService {
         long shipped = 0;
         for (DispatchPdaPick pick : dispatchPicks) {
             String key = "DISPATCH:" + order.getDispatchNo() + ":PICK:" + pick.getId() + ":SHIP";
-            inventory.ship(customerId, operatorId, new InventoryCommandRequests.Move(customerId,
+            inventory.ship(customerId, operatorId, new InventoryCommandRequests.Move(
                 pick.getInventoryPositionId(), n(pick.getPackages()),
                 outbound.getOutboundNo(), outbound.getOutboundNo(), null, key, request.remark()));
             shipped += n(pick.getPackages());

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/service/DispatchService.java

@@ -150,7 +150,7 @@ public class DispatchService {
 
     public PageResult<DispatchResponse> page(String customerId, DispatchRequests.Query query) {
         Page<DispatchOrder> page = orders.selectPage(new Page<>(query.page(), query.size()),
-            new LambdaQueryWrapper<DispatchOrder>().eq(DispatchOrder::getCustomerId, customerId)
+            new LambdaQueryWrapper<DispatchOrder>().eq(StringUtils.hasText(customerId), DispatchOrder::getCustomerId, customerId)
                 .like(StringUtils.hasText(query.dispatchNo()), DispatchOrder::getDispatchNo, query.dispatchNo())
                 .like(StringUtils.hasText(query.vehiclePlate()), DispatchOrder::getVehiclePlate, query.vehiclePlate())
                 .eq(StringUtils.hasText(query.status()), DispatchOrder::getStatus, query.status())
@@ -158,13 +158,13 @@ public class DispatchService {
                     query.fbaAppointmentNo())
                 .orderByDesc(DispatchOrder::getCreatedAt));
         List<DispatchResponse> records = page.getRecords().stream()
-            .map(order -> response(order, items.findByDispatchOrder(customerId, order.getId()))).toList();
+            .map(order -> response(order, items.findByDispatchOrder(order.getCustomerId(), order.getId()))).toList();
         return new PageResult<>(records, page.getCurrent(), page.getSize(), page.getTotal(), page.getPages());
     }
 
     public DispatchResponse detail(String customerId, String dispatchNo) {
         DispatchOrder dispatch = find(customerId, dispatchNo);
-        return response(dispatch, items.findByDispatchOrder(customerId, dispatch.getId()));
+        return response(dispatch, items.findByDispatchOrder(dispatch.getCustomerId(), dispatch.getId()));
     }
 
     @Transactional
@@ -216,7 +216,9 @@ public class DispatchService {
     }
 
     private DispatchOrder find(String customerId, String dispatchNo) {
-        DispatchOrder dispatch = orders.findByDispatchNo(customerId, dispatchNo);
+        DispatchOrder dispatch = StringUtils.hasText(customerId)
+            ? orders.findByDispatchNo(customerId, dispatchNo)
+            : orders.findAnyByDispatchNo(dispatchNo);
         if (dispatch == null) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Dispatch order not found");
         return dispatch;
     }