提交

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/InboundFbaAppointmentService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baiyue.lastleg.inboundplan.dto.BatchFbaAppointmentRequest;
 import com.baiyue.lastleg.inboundplan.dto.FbaAppointmentResponse;
+import com.baiyue.lastleg.inboundplan.dto.UpdateFbaAppointmentRequest;
 import com.baiyue.lastleg.inboundplan.entity.InboundFbaAppointment;
 import com.baiyue.lastleg.inboundplan.entity.InboundFbaAppointmentItem;
 import com.baiyue.lastleg.inboundplan.mapper.InboundFbaAppointmentItemMapper;
@@ -44,7 +45,7 @@ public class InboundFbaAppointmentService {
 
         InboundFbaAppointment existing = find(customerId, appointmentNo);
         if (existing != null) {
-            return verifyReplay(existing, lineIds, request.appointmentAt(), status, remark);
+            return verifyReplay(existing, lineIds, request.appointmentAt(), request.expectedLoadingAt(), status, remark);
         }
 
         List<FbaAppointmentLineSnapshot> lines = queryMapper.lockLines(customerId, lineIds);
@@ -57,7 +58,7 @@ public class InboundFbaAppointmentService {
         // The row locks serialize concurrent submissions selecting the same inbound lines.
         existing = find(customerId, appointmentNo);
         if (existing != null) {
-            return verifyReplay(existing, lineIds, request.appointmentAt(), status, remark);
+            return verifyReplay(existing, lineIds, request.appointmentAt(), request.expectedLoadingAt(), status, remark);
         }
 
         LocalDateTime now = LocalDateTime.now();
@@ -66,6 +67,7 @@ public class InboundFbaAppointmentService {
         appointment.setCustomerId(customerId);
         appointment.setAppointmentNo(appointmentNo);
         appointment.setAppointmentAt(request.appointmentAt());
+        appointment.setExpectedLoadingAt(request.expectedLoadingAt());
         appointment.setAppointmentStatus(status);
         appointment.setAppointmentRemark(remark);
         appointment.setFbaWarehouseCode(fbaWarehouseCode);
@@ -78,7 +80,7 @@ public class InboundFbaAppointmentService {
         } catch (DuplicateKeyException exception) {
             InboundFbaAppointment concurrent = find(customerId, appointmentNo);
             if (concurrent != null) {
-                return verifyReplay(concurrent, lineIds, request.appointmentAt(), status, remark);
+                return verifyReplay(concurrent, lineIds, request.appointmentAt(), request.expectedLoadingAt(), status, remark);
             }
             throw exception;
         }
@@ -108,12 +110,31 @@ public class InboundFbaAppointmentService {
         return response(appointment, items(appointment.getId()));
     }
 
+    @Transactional
+    public FbaAppointmentResponse update(String customerId, String appointmentNo,
+                                         UpdateFbaAppointmentRequest request) {
+        InboundFbaAppointment appointment = find(customerId,
+            requiredTrimmed(appointmentNo, "Appointment number is required"));
+        if (appointment == null) {
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "FBA appointment not found");
+        }
+        appointment.setAppointmentAt(request.appointmentAt());
+        appointment.setExpectedLoadingAt(request.expectedLoadingAt());
+        appointment.setAppointmentStatus(normalizeStatus(request.appointmentStatus()));
+        appointment.setAppointmentRemark(trimToNull(request.appointmentRemark()));
+        appointment.setUpdatedAt(LocalDateTime.now());
+        appointmentMapper.updateById(appointment);
+        return response(appointment, items(appointment.getId()));
+    }
+
     private FbaAppointmentResponse verifyReplay(InboundFbaAppointment existing, List<Long> requestedLineIds,
-                                                LocalDateTime appointmentAt, String status, String remark) {
+                                                LocalDateTime appointmentAt, LocalDateTime expectedLoadingAt,
+                                                String status, String remark) {
         List<InboundFbaAppointmentItem> existingItems = items(existing.getId());
         Set<Long> existingLineIds = existingItems.stream()
             .map(InboundFbaAppointmentItem::getLineId).collect(java.util.stream.Collectors.toSet());
         if (!Objects.equals(existing.getAppointmentAt(), appointmentAt)
+            || !Objects.equals(existing.getExpectedLoadingAt(), expectedLoadingAt)
             || !Objects.equals(existing.getAppointmentStatus(), status)
             || !Objects.equals(existing.getAppointmentRemark(), remark)
             || existingLineIds.size() != requestedLineIds.size()
@@ -149,7 +170,8 @@ public class InboundFbaAppointmentService {
     private FbaAppointmentResponse response(InboundFbaAppointment appointment,
                                             List<InboundFbaAppointmentItem> items) {
         return new FbaAppointmentResponse(appointment.getId(), appointment.getCustomerId(),
-            appointment.getAppointmentNo(), appointment.getAppointmentAt(), appointment.getAppointmentStatus(),
+            appointment.getAppointmentNo(), appointment.getAppointmentAt(), appointment.getExpectedLoadingAt(),
+            appointment.getAppointmentStatus(),
             appointment.getAppointmentRemark(), appointment.getFbaWarehouseCode(), appointment.getSelectedCount(),
             appointment.getCreatedBy(), appointment.getCreatedAt(), appointment.getUpdatedAt(),
             items.stream().map(item -> new FbaAppointmentResponse.Item(item.getId(), item.getPlanId(),

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/service/InboundPlanService.java

@@ -2,6 +2,9 @@ package com.baiyue.lastleg.inboundplan.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baiyue.common.core.api.PageResult;
+import com.baiyue.lastleg.inboundplan.dto.InboundPlanListResponse;
+import com.baiyue.lastleg.inboundplan.dto.InboundPlanRequests;
 import com.baiyue.lastleg.inboundplan.dto.InboundPlanResponse;
 import com.baiyue.lastleg.inboundplan.dto.SupplementPalletRequest;
 import com.baiyue.lastleg.inboundplan.entity.InboundPlan;
@@ -13,6 +16,7 @@ import com.baiyue.lastleg.inboundplan.mapper.InboundPlanMapper;
 import com.baiyue.lastleg.inboundplan.mapper.InboundPlanOrderMapper;
 import com.baiyue.lastleg.inboundplan.mapper.InboundPlanPalletAllocationMapper;
 import com.baiyue.lastleg.inboundplan.mapper.InboundPlanPalletMapper;
+import com.baiyue.lastleg.inboundplan.mapper.InboundPlanQueryMapper;
 import com.baiyue.lastleg.inboundplan.model.SourceOrderSnapshot;
 import jakarta.annotation.Resource;
 import org.springframework.http.HttpStatus;
@@ -35,6 +39,16 @@ public class InboundPlanService {
     @Resource private InboundPlanPalletMapper palletMapper;
     @Resource private InboundPlanPalletAllocationMapper allocationMapper;
     @Resource private InboundPlanOrderMapper orderMapper;
+    @Resource private InboundPlanQueryMapper queryMapper;
+
+    @Transactional(readOnly = true)
+    public PageResult<InboundPlanListResponse> page(String customerId, InboundPlanRequests.Query query) {
+        long total = queryMapper.count(customerId, query);
+        List<InboundPlanListResponse> records = total == 0 ? List.of() : queryMapper.rows(
+            customerId, query, (query.page() - 1) * query.size(), query.size());
+        long pages = total == 0 ? 0 : (total + query.size() - 1) / query.size();
+        return new PageResult<>(records, query.page(), query.size(), total, pages);
+    }
 
     @Transactional
     public InboundPlanResponse convert(String customerId, Long selectedOrderId) {