废弃，换标文件上传，排车托盘锁粒度

2026-09-14 16:49:00 +08:00
parent 60ebc2e376
commit 78bbd69a26
23 changed files with 443 additions and 21 deletions
@@ -0,0 +1,32 @@
+package com.baiyue.lastleg.discard.pda.controller;
+
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.common.security.AuthenticatedUser;
+import com.baiyue.lastleg.discard.pda.dto.PdaCargoDiscardDtos;
+import com.baiyue.lastleg.discard.pda.service.PdaCargoDiscardService;
+import com.baiyue.lastleg.pda.security.PdaWarehouseIdentity;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/pda/v1/last-leg/cargo-discards")
+@PreAuthorize("hasAuthority('lastleg:pda:operate') and hasAuthority('ROLE_OVERSEAS_WAREHOUSE_PDA_OPERATOR')")
+public class PdaCargoDiscardController {
+    @Resource private PdaCargoDiscardService service;
+    @GetMapping public ApiResponse<List<PdaCargoDiscardDtos.PalletTask>> tasks(@AuthenticationPrincipal AuthenticatedUser user) {
+        return ApiResponse.success(service.tasks(PdaWarehouseIdentity.require(user)));
+    }
+    @PostMapping("/resolve") public ApiResponse<PdaCargoDiscardDtos.PalletTask> resolve(@AuthenticationPrincipal AuthenticatedUser user,
+        @Valid @RequestBody PdaCargoDiscardDtos.Scan request) {
+        return ApiResponse.success(service.resolve(PdaWarehouseIdentity.require(user), request.palletNo()));
+    }
+    @PostMapping("/{discardNo}/pallets/{palletNo}/confirm")
+    public ApiResponse<PdaCargoDiscardDtos.PalletTask> confirm(@AuthenticationPrincipal AuthenticatedUser user,
+        @PathVariable String discardNo, @PathVariable String palletNo, @Valid @RequestBody PdaCargoDiscardDtos.Confirm request) {
+        return ApiResponse.success(service.confirm(PdaWarehouseIdentity.require(user), discardNo, palletNo, request));
+    }
+}
@@ -0,0 +1,20 @@
+package com.baiyue.lastleg.discard.pda.dto;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.PositiveOrZero;
+import jakarta.validation.constraints.Size;
+import java.util.List;
+
+public final class PdaCargoDiscardDtos {
+    private PdaCargoDiscardDtos() { }
+    public record Scan(@NotBlank @Size(max = 128) String palletNo) { }
+    public record ActualLine(@NotNull Long itemId, @PositiveOrZero int actualPackages) { }
+    public record Confirm(@NotEmpty List<@Valid ActualLine> lines) { }
+    public record Sku(Long itemId, String skuCode, String productName, int plannedPackages,
+                      Integer actualPackages, String status) { }
+    public record PalletTask(String discardNo, String customerId, String overseasWarehouseId,
+                             String palletNo, Long profileId, String status, List<Sku> skus) { }
+}
@@ -0,0 +1,99 @@
+package com.baiyue.lastleg.discard.pda.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baiyue.lastleg.discard.dto.CargoDiscardResponses;
+import com.baiyue.lastleg.discard.entity.*;
+import com.baiyue.lastleg.discard.mapper.*;
+import com.baiyue.lastleg.discard.pda.dto.PdaCargoDiscardDtos;
+import com.baiyue.lastleg.discard.service.CargoDiscardInventoryAdjustmentService;
+import com.baiyue.lastleg.discard.service.CargoDiscardService;
+import com.baiyue.lastleg.dropship.entity.DropshipOrderProfile;
+import com.baiyue.lastleg.dropship.mapper.DropshipOrderProfileMapper;
+import com.baiyue.lastleg.pda.security.PdaWarehouseIdentity;
+import jakarta.annotation.Resource;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.server.ResponseStatusException;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class PdaCargoDiscardService {
+    @Resource private CargoDiscardApplicationMapper applications;
+    @Resource private CargoDiscardItemMapper items;
+    @Resource private CargoDiscardCartonMapper cartons;
+    @Resource private DropshipOrderProfileMapper profiles;
+    @Resource private CargoDiscardInventoryAdjustmentService adjustments;
+    @Resource private CargoDiscardService discardService;
+
+    public List<PdaCargoDiscardDtos.PalletTask> tasks(PdaWarehouseIdentity identity) {
+        return applications.selectList(new LambdaQueryWrapper<CargoDiscardApplication>()
+                .eq(CargoDiscardApplication::getOverseasWarehouseId, String.valueOf(identity.overseasWarehouseId()))
+                .eq(CargoDiscardApplication::getStatus, CargoDiscardService.APPROVED)
+                .orderByAsc(CargoDiscardApplication::getCreatedAt))
+            .stream().flatMap(a -> palletTasks(a).stream()).toList();
+    }
+
+    public PdaCargoDiscardDtos.PalletTask resolve(PdaWarehouseIdentity identity, String palletNo) {
+        return tasks(identity).stream().filter(t -> t.palletNo().equals(palletNo.trim())).findFirst()
+            .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "该仓库没有此托盘的待废弃任务"));
+    }
+
+    @Transactional
+    public PdaCargoDiscardDtos.PalletTask confirm(PdaWarehouseIdentity identity, String discardNo,
+                                                   String palletNo, PdaCargoDiscardDtos.Confirm request) {
+        CargoDiscardApplication application = applications.findNoByWarehouse(discardNo,
+            String.valueOf(identity.overseasWarehouseId()));
+        if (application == null) throw new ResponseStatusException(HttpStatus.NOT_FOUND, "废弃任务不存在或不属于当前仓库");
+        if (!CargoDiscardService.APPROVED.equals(application.getStatus())) throw conflict("废弃任务当前不可进行 PDA 作业");
+        PdaCargoDiscardDtos.PalletTask task = palletTasks(application).stream().filter(t -> t.palletNo().equals(palletNo.trim()))
+            .findFirst().orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "托盘不属于该废弃单"));
+        Map<Long,Integer> actuals = request.lines().stream().collect(Collectors.toMap(PdaCargoDiscardDtos.ActualLine::itemId,
+            PdaCargoDiscardDtos.ActualLine::actualPackages, (a,b) -> { throw conflict("PDA 明细重复"); }));
+        if (!actuals.keySet().equals(task.skus().stream().map(PdaCargoDiscardDtos.Sku::itemId).collect(Collectors.toSet()))) {
+            throw conflict("必须提交该托盘全部 SKU 的实际废弃数量");
+        }
+        LocalDateTime now = LocalDateTime.now();
+        for (PdaCargoDiscardDtos.Sku line : task.skus()) {
+            CargoDiscardItem item = items.selectById(line.itemId());
+            if ("COMPLETED".equals(item.getPdaStatus())) {
+                if (!Objects.equals(item.getActualDiscardPackages(), actuals.get(item.getId()))) throw conflict("已完成托盘的实际数量不能修改");
+                continue;
+            }
+            List<CargoDiscardCarton> links = cartons.listApplication(application.getCustomerId(), application.getId()).stream()
+                .filter(c -> c.getItemId().equals(item.getId())).toList();
+            adjustments.discardPalletItem(application.getCustomerId(), application, item, links,
+                actuals.get(item.getId()), identity.operatorKey(), now);
+            item.setActualDiscardPackages(actuals.get(item.getId())); item.setPdaStatus("COMPLETED");
+            item.setPdaOperatorId(identity.operatorKey()); item.setPdaCompletedAt(now); items.updateById(item);
+        }
+        if (items.listApplication(application.getCustomerId(), application.getId()).stream()
+            .allMatch(i -> "COMPLETED".equals(i.getPdaStatus()))) {
+            int actualTotal = items.listApplication(application.getCustomerId(), application.getId()).stream()
+                .mapToInt(i -> i.getActualDiscardPackages() == null ? 0 : i.getActualDiscardPackages()).sum();
+            application.setTotalPackages(actualTotal);
+            application.setTotalFee(application.getFeePerPackage().multiply(java.math.BigDecimal.valueOf(actualTotal)));
+            discardService.updateLinkedStatus(application.getCustomerId(), application, CargoDiscardService.APPROVED,
+                CargoDiscardService.PDA_COMPLETED, identity.operatorKey(), "全部托盘 PDA 废弃作业完成，待仓库确认");
+        }
+        return task;
+    }
+
+    private List<PdaCargoDiscardDtos.PalletTask> palletTasks(CargoDiscardApplication application) {
+        return items.listApplication(application.getCustomerId(), application.getId()).stream()
+            .collect(Collectors.groupingBy(CargoDiscardItem::getProfileId, LinkedHashMap::new, Collectors.toList()))
+            .entrySet().stream().map(entry -> {
+                DropshipOrderProfile profile = profiles.selectById(entry.getKey());
+                if (profile == null || !application.getCustomerId().equals(profile.getCustomerId())) throw conflict("废弃明细关联托盘不存在");
+                List<PdaCargoDiscardDtos.Sku> skus = entry.getValue().stream().map(i -> new PdaCargoDiscardDtos.Sku(
+                    i.getId(), i.getSkuCode(), i.getProductName(), i.getDiscardPackages(), i.getActualDiscardPackages(),
+                    i.getPdaStatus() == null ? "PENDING" : i.getPdaStatus())).toList();
+                String status = skus.stream().allMatch(s -> "COMPLETED".equals(s.status())) ? "COMPLETED" : "PENDING";
+                return new PdaCargoDiscardDtos.PalletTask(application.getDiscardNo(), application.getCustomerId(),
+                    application.getOverseasWarehouseId(), profile.getPalletNo(), profile.getId(), status, skus);
+            }).toList();
+    }
+    private static ResponseStatusException conflict(String message) { return new ResponseStatusException(HttpStatus.CONFLICT, message); }
+}