优化

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/dto/DispatchRequests.java

@@ -23,10 +23,15 @@ public final class DispatchRequests {
                              @Size(max = 255) String route, @Size(max = 64) String fbaAppointmentNo,
                              @Size(max = 32) String fbaAppointmentStatus,
                              @Size(max = 32) String vehicleAppointmentStatus,
-                             @Size(max = 64) String draftToken) {
+                             @Size(max = 64) String draftToken,
+                             @Size(max = 64) String relabelNo) {
         public PreArrange(List<Long> planPalletIds, String route, String fbaAppointmentNo,
                           String fbaAppointmentStatus, String vehicleAppointmentStatus) {
-            this(planPalletIds, route, fbaAppointmentNo, fbaAppointmentStatus, vehicleAppointmentStatus, null);
+            this(planPalletIds, route, fbaAppointmentNo, fbaAppointmentStatus, vehicleAppointmentStatus, null, null);
+        }
+        public PreArrange(List<Long> planPalletIds, String route, String fbaAppointmentNo,
+                          String fbaAppointmentStatus, String vehicleAppointmentStatus, String draftToken) {
+            this(planPalletIds, route, fbaAppointmentNo, fbaAppointmentStatus, vehicleAppointmentStatus, draftToken, null);
         }
     }
 

lastleg-service/src/main/java/com/baiyue/lastleg/dispatch/entity/DispatchItem.java

@@ -34,5 +34,8 @@ public class DispatchItem {
     private BigDecimal volumeCbm;
     /** PLAN for planned pallets; RECEIVED for warehouse/entity pallets. */
     private String sourceStage;
+    private String cartonMarks;
+    private String sourceBusinessType;
+    private String sourceBusinessNo;
     private LocalDateTime createdAt;
 }

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

@@ -143,4 +143,32 @@ public interface DispatchCandidateMapper {
         "</script>")
     List<DispatchPalletCandidate> lockSelected(@Param("customerId") String customerId,
                                                 @Param("planPalletIds") List<Long> planPalletIds);
+
+    @Select("<script>" +
+        "SELECT NULL AS planId,NULL AS planPalletId,pos.pallet_id AS warehousePalletId,a.lastleg_order_id AS orderId," +
+        "a.customer_id AS customerId,NULL AS customerName,NULL AS planNo,'RELABEL_APPLICATION' AS orderType,NULL AS volumeWeightKg,NULL AS containerNo," +
+        "NULL AS appointmentAt,NULL AS expectedLoadingAt,a.overseas_warehouse_id AS overseasWarehouseId,MIN(ri.source_warehouse_name) AS overseasWarehouseName," +
+        "MIN(a.relabel_no) AS orderNo,a.relabel_no AS orderRefs,MIN(ri.source_inbound_code) AS inboundCode,pos.pallet_no AS palletNo,NULL AS destinationWarehouseId," +
+        "GROUP_CONCAT(DISTINCT ri.destination_fba_warehouse_code ORDER BY ri.destination_fba_warehouse_code SEPARATOR ',') AS destinationWarehouseCode," +
+        "GROUP_CONCAT(DISTINCT ri.destination_fba_warehouse_code ORDER BY ri.destination_fba_warehouse_code SEPARATOR ',') AS destinationWarehouseName," +
+        "GROUP_CONCAT(DISTINCT ri.destination_fba_warehouse_code ORDER BY ri.destination_fba_warehouse_code SEPARATOR ',') AS fbaWarehouseCode," +
+        "SUM(ri.notified_package_count) AS packageCount,NULL AS volumeCbm,'RELABEL' AS sourceStage," +
+        "GROUP_CONCAT(DISTINCT CONCAT(ri.carton_mark,'->',ri.fba_carton_mark) ORDER BY ri.carton_mark SEPARATOR ',') AS cartonMarks " +
+        "FROM ll_relabel_application a JOIN ll_relabel_item ri ON ri.application_id=a.id AND ri.customer_id=a.customer_id " +
+        "JOIN ll_inventory_position pos ON pos.id=ri.source_inventory_position_id AND pos.customer_id=a.customer_id " +
+        "WHERE a.delivery_method='TRUCK' AND a.status='READY_FOR_OUTBOUND' AND a.fulfillment_status='WAIT_PRE_DISPATCH' " +
+        "<if test='customerId != null and customerId != \"\"'>AND a.customer_id=#{customerId} </if>" +
+        "<if test='relabelNo != null and relabelNo != \"\"'>AND a.relabel_no=#{relabelNo} </if>" +
+        "<if test='orderNo != null and orderNo != \"\"'>AND a.relabel_no LIKE CONCAT('%',#{orderNo},'%') </if>" +
+        "AND pos.available_packages &gt; 0 " +
+        "AND NOT EXISTS (SELECT 1 FROM ll_dispatch_item di WHERE di.customer_id=a.customer_id AND di.source_stage='RELABEL' AND di.order_refs=a.relabel_no) " +
+        "GROUP BY a.id,a.lastleg_order_id,a.customer_id,a.overseas_warehouse_id,a.relabel_no,pos.pallet_id,pos.pallet_no" +
+        "</script>")
+    List<DispatchPalletCandidate> relabelAvailable(@Param("customerId") String customerId,
+                                                    @Param("orderNo") String orderNo,
+                                                    @Param("relabelNo") String relabelNo);
+
+    @org.apache.ibatis.annotations.Update("UPDATE ll_relabel_application SET fulfillment_status='PRE_DISPATCH_CREATED',updated_at=CURRENT_TIMESTAMP(3) " +
+        "WHERE customer_id=#{customerId} AND relabel_no=#{relabelNo} AND fulfillment_status='WAIT_PRE_DISPATCH'")
+    int markRelabelPreDispatched(@Param("customerId") String customerId, @Param("relabelNo") String relabelNo);
 }

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

@@ -84,8 +84,15 @@ public class DispatchService {
     public List<DispatchPalletCandidate> platformCandidates(String orderNo, String fbaWarehouseCode,
                                                              String sourceStage, String draftToken) {
         validateSourceStage(sourceStage);
-        return candidates.available(null, null, trimToNull(orderNo), trimToNull(fbaWarehouseCode),
+        List<DispatchPalletCandidate> result = candidates.available(null, null, trimToNull(orderNo), trimToNull(fbaWarehouseCode),
             trimToNull(sourceStage), trimToNull(draftToken));
+        if (!StringUtils.hasText(sourceStage) || "RECEIVED".equals(sourceStage)) {
+            List<DispatchPalletCandidate> relabel = candidates.relabelAvailable(null, trimToNull(orderNo), null);
+            if (relabel != null && !relabel.isEmpty()) {
+                result = java.util.stream.Stream.concat(result.stream(), relabel.stream()).toList();
+            }
+        }
+        return result;
     }
     public List<DispatchPalletCandidate> platformCandidates(String orderNo, String fbaWarehouseCode, String sourceStage) {
         return platformCandidates(orderNo, fbaWarehouseCode, sourceStage, null);
@@ -212,6 +219,9 @@ public class DispatchService {
 
     @Transactional
     public DispatchResponse preArrange(String customerId, String operatorId, DispatchRequests.PreArrange request) {
+        if (StringUtils.hasText(request.relabelNo())) {
+            return preArrangeRelabel(customerId, operatorId, request);
+        }
         if (!StringUtils.hasText(customerId)) {
             throw new ResponseStatusException(HttpStatus.CONFLICT,
                 "No customer business data is available for dispatch");
@@ -355,6 +365,24 @@ public class DispatchService {
         return response(dispatch, items.findByDispatchOrder(customerId, dispatch.getId()));
     }
 
+    @Transactional
+    private DispatchResponse preArrangeRelabel(String customerId, String operatorId, DispatchRequests.PreArrange request) {
+        List<DispatchPalletCandidate> selected = candidates.relabelAvailable(customerId, null, request.relabelNo());
+        Set<Long> requested = request.planPalletIds().stream().map(Long::valueOf).collect(Collectors.toSet());
+        selected = selected.stream().filter(c -> requested.contains(c.warehousePalletId())).toList();
+        if (selected.isEmpty() || selected.size() != requested.size()) throw new ResponseStatusException(HttpStatus.CONFLICT, "换标订单托盘候选已变化，请刷新后重试");
+        String warehouse = selected.get(0).overseasWarehouseId();
+        if (selected.stream().anyMatch(c -> !Objects.equals(warehouse, c.overseasWarehouseId()))) throw new ResponseStatusException(HttpStatus.CONFLICT, "换标订单只能选择同一海外仓");
+        LocalDateTime now = LocalDateTime.now();
+        DispatchOrder dispatch = new DispatchOrder(); dispatch.setId(IdWorker.getId()); dispatch.setCustomerId(customerId);
+        dispatch.setDispatchNo(orderNoGenerator.next("DISPATCH", warehouse, dispatch.getId())); dispatch.setOverseasWarehouseId(warehouse); dispatch.setOverseasWarehouseName(selected.get(0).overseasWarehouseName());
+        dispatch.setRoute(StringUtils.hasText(request.route()) ? request.route().trim() : route(selected)); dispatch.setFbaAppointmentNo(trimToNull(request.fbaAppointmentNo())); dispatch.setFbaAppointmentStatus(defaultStatus(request.fbaAppointmentStatus())); dispatch.setVehicleAppointmentStatus(defaultStatus(request.vehicleAppointmentStatus())); dispatch.setStatus(PENDING_DEPARTURE); dispatch.setItemCount(selected.size()); dispatch.setPalletCount(selected.size()); dispatch.setPackageCount(selected.stream().map(DispatchPalletCandidate::packageCount).filter(Objects::nonNull).mapToInt(Integer::intValue).sum()); dispatch.setPickedPackageCount(0); dispatch.setShippedPackageCount(0); dispatch.setCreatedBy(trimToNull(operatorId)); dispatch.setCreatedAt(now); dispatch.setUpdatedAt(now); orders.insert(dispatch);
+        for (DispatchPalletCandidate candidate : selected) { DispatchItem item = new DispatchItem(); item.setId(IdWorker.getId()); item.setDispatchOrderId(dispatch.getId()); item.setCustomerId(customerId); item.setWarehousePalletId(candidate.warehousePalletId()); item.setOrderId(candidate.orderId()); item.setOverseasWarehouseId(candidate.overseasWarehouseId()); item.setOverseasWarehouseName(candidate.overseasWarehouseName()); item.setOrderNo(candidate.orderNo()); item.setOrderRefs(candidate.orderRefs()); item.setInboundCode(candidate.inboundCode()); item.setPalletNo(candidate.palletNo()); item.setDestinationWarehouseCode(candidate.destinationWarehouseCode()); item.setDestinationWarehouseName(candidate.destinationWarehouseName()); item.setFbaWarehouseCode(candidate.fbaWarehouseCode()); item.setPackageCount(Objects.requireNonNullElse(candidate.packageCount(), 0)); item.setVolumeCbm(BigDecimal.ZERO); item.setSourceStage("RELABEL"); item.setCartonMarks(candidate.cartonMarks()); item.setSourceBusinessType("RELABEL_ORDER"); item.setSourceBusinessNo(request.relabelNo()); item.setCreatedAt(now); items.insert(item); }
+        DispatchPdaTask task = new DispatchPdaTask(); task.setId(IdWorker.getId()); task.setCustomerId(customerId); task.setDispatchOrderId(dispatch.getId()); task.setTaskNo("DPDA" + task.getId()); task.setStatus("PDA_PENDING"); task.setWarehouseId(warehouse); task.setPushedAt(now); task.setCreatedAt(now); task.setUpdatedAt(now); pdaTasks.insert(task);
+        if (candidates.markRelabelPreDispatched(customerId, request.relabelNo()) != 1) throw new ResponseStatusException(HttpStatus.CONFLICT, "换标订单已被其他排车占用");
+        return response(dispatch, items.findByDispatchOrder(customerId, dispatch.getId()));
+    }
+
     private void assertNoDetainedOrders(String customerId, List<DispatchPalletCandidate> selected) {
         List<Long> orderIds = selected.stream().map(DispatchPalletCandidate::orderId)
             .filter(Objects::nonNull).distinct().sorted().toList();