提交

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/controller/InboundPlanController.java

@@ -11,6 +11,7 @@ import com.baiyue.lastleg.inboundplan.dto.InboundPlanListResponse;
 import com.baiyue.lastleg.inboundplan.dto.InboundPlanRequests;
 import com.baiyue.lastleg.inboundplan.dto.SupplementPalletRequest;
 import com.baiyue.lastleg.inboundplan.dto.UpdateFbaAppointmentRequest;
+import com.baiyue.lastleg.inboundplan.dto.UpdateInboundPlanRequest;
 import com.baiyue.lastleg.inboundplan.service.InboundFbaAppointmentService;
 import com.baiyue.lastleg.inboundplan.service.InboundPlanService;
 import com.baiyue.lastleg.security.OverseasPermissions;
@@ -62,6 +63,15 @@ public class InboundPlanController {
         return ApiResponse.success(service.detailByPlanNo(scope(user, customerId), planNo));
     }
 
+    @PutMapping("/{planNo}")
+    @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_EDIT + "')")
+    @Operation(summary = "编辑入仓计划")
+    public ApiResponse<InboundPlanResponse> update(@AuthenticationPrincipal AuthenticatedUser user,
+                                                   @PathVariable String planNo,
+                                                   @Valid @RequestBody UpdateInboundPlanRequest request) {
+        return ApiResponse.success(service.update(scope(user, request.customerId()), planNo, request));
+    }
+
     @PostMapping("/{planNo}/pallets/supplement")
     @PreAuthorize("hasAuthority('" + OverseasPermissions.INBOUND_ORDER_EDIT + "')")
     /** 为计划目标仓新增一个可打印的补充托盘。 */

lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/dto/UpdateInboundPlanRequest.java

@@ -0,0 +1,12 @@
+package com.baiyue.lastleg.inboundplan.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+public record UpdateInboundPlanRequest(
+    @NotBlank String customerId,
+    @NotNull Long overseasWarehouseId,
+    String warehouseCode,
+    String warehouseName,
+    @NotNull Integer version
+) {}

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

@@ -7,6 +7,7 @@ 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.dto.UpdateInboundPlanRequest;
 import com.baiyue.lastleg.inboundplan.entity.InboundPlan;
 import com.baiyue.lastleg.inboundplan.entity.InboundPlanLine;
 import com.baiyue.lastleg.inboundplan.entity.InboundPlanPallet;
@@ -219,6 +220,19 @@ public class InboundPlanService {
         return detail(customerId, plan);
     }
 
+    @Transactional
+    public InboundPlanResponse update(String customerId, String planNo, UpdateInboundPlanRequest request) {
+        InboundPlan plan = planMapper.selectOne(new LambdaQueryWrapper<InboundPlan>()
+            .eq(InboundPlan::getPlanNo, planNo).eq(customerId != null, InboundPlan::getCustomerId, customerId).last("FOR UPDATE"));
+        if (plan == null) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Inbound plan not found");
+        if (!java.util.Set.of("PENDING_ASSIGNMENT", "ASSIGNED").contains(plan.getStatus()))
+            throw new ResponseStatusException(HttpStatus.CONFLICT, "Inbound plan has started and cannot be edited");
+        plan.setOverseasWarehouseId(request.overseasWarehouseId());
+        plan.setUpdatedAt(LocalDateTime.now());
+        planMapper.updateById(plan);
+        return detail(customerId, plan);
+    }
+
     @Transactional
     public InboundPlanResponse.Pallet supplementPallet(String customerId, String planNo, SupplementPalletRequest request) {
         InboundPlan plan = planMapper.selectOne(new LambdaQueryWrapper<InboundPlan>()