暂扣 标记合托功能

lastleg-service/src/main/java/com/baiyue/lastleg/procurement/dto/OverseasProcurementRequests.java

@@ -56,5 +56,15 @@ public final class OverseasProcurementRequests {
         JsonNode overseasCarrier,
         JsonNode overseasTrackingNo,
         JsonNode estimatedArrivalAt,
-        JsonNode remark) {}
+        JsonNode remark,
+        JsonNode outboundDetails) {
+        public Update(Long version, String purchaseCategory, String productName, JsonNode productSpecification,
+                      JsonNode productUrl, Long inboundQuantity, JsonNode purchaseWarehouseId, JsonNode purchaseWarehouseName,
+                      JsonNode domesticCarrier, JsonNode domesticTrackingNo, JsonNode overseasCarrier, JsonNode overseasTrackingNo,
+                      JsonNode estimatedArrivalAt, JsonNode remark) {
+            this(version, purchaseCategory, productName, productSpecification, productUrl, inboundQuantity,
+                purchaseWarehouseId, purchaseWarehouseName, domesticCarrier, domesticTrackingNo, overseasCarrier,
+                overseasTrackingNo, estimatedArrivalAt, remark, null);
+        }
+    }
 }

lastleg-service/src/main/java/com/baiyue/lastleg/procurement/dto/OverseasProcurementResponses.java

@@ -7,6 +7,8 @@ import java.util.List;
 public final class OverseasProcurementResponses {
     private OverseasProcurementResponses() {}
 
+    public record OutboundDetail(String id, long quantity, String carrier, String trackingNo, LocalDateTime shippedAt, String remark) {}
+
     public record Summary(
         Long id, String orderNo, String customerId, String customerName,
         String purchaseCategory, String productName, String productSpecification,
@@ -32,5 +34,5 @@ public final class OverseasProcurementResponses {
         String overseasCarrier, String overseasTrackingNo,
         LocalDateTime estimatedArrivalAt, String remark,
         String createdBy, String reviewedBy, String reviewRemark, LocalDateTime reviewedAt,
-        List<History> histories) {}
+        List<History> histories, List<OutboundDetail> outboundDetails) {}
 }

lastleg-service/src/main/java/com/baiyue/lastleg/procurement/entity/OverseasProcurementOrder.java

@@ -30,6 +30,7 @@ public class OverseasProcurementOrder {
     @TableField(updateStrategy = FieldStrategy.ALWAYS) private String purchaseWarehouseId;
     @TableField(updateStrategy = FieldStrategy.ALWAYS) private String purchaseWarehouseName;
     private Long inboundQuantity;
+    @TableField(updateStrategy = FieldStrategy.ALWAYS) private String outboundDetails;
     @TableField(updateStrategy = FieldStrategy.ALWAYS) private String domesticCarrier;
     @TableField(updateStrategy = FieldStrategy.ALWAYS) private String domesticTrackingNo;
     @TableField(updateStrategy = FieldStrategy.ALWAYS) private String overseasCarrier;

lastleg-service/src/main/java/com/baiyue/lastleg/procurement/service/OverseasProcurementService.java

@@ -148,7 +148,7 @@ public class OverseasProcurementService {
                 new OverseasProcurementResponses.History(value.getOperationType(), value.getFromStatus(),
                     value.getToStatus(), value.getOperatorId(), value.getIdempotencyKey(),
                     value.getChangeDetail(), value.getRemark(),
-                    value.getCreatedAt())).toList());
+                    value.getCreatedAt())).toList(), outboundDetails(order));
     }
 
     @Transactional
@@ -205,6 +205,7 @@ public class OverseasProcurementService {
         patchText(request.overseasTrackingNo(), 128, "overseasTrackingNo", order::setOverseasTrackingNo);
         patchDateTime(request.estimatedArrivalAt(), order::setEstimatedArrivalAt);
         patchText(request.remark(), 1000, "remark", order::setRemark);
+        if (request.outboundDetails() != null) order.setOutboundDetails(normalizeOutbound(request.outboundDetails(), order.getInboundQuantity()));
         Map<String, Object> after = editableSnapshot(order);
         if (before.equals(after)) return detail(customerId, orderNo);
         LocalDateTime now = LocalDateTime.now();
@@ -230,10 +231,11 @@ public class OverseasProcurementService {
 
     private OverseasProcurementResponses.Summary summary(OverseasProcurementOrder order) {
         long inbound = value(order.getInboundQuantity());
+        long outbound = outboundDetails(order).stream().mapToLong(OverseasProcurementResponses.OutboundDetail::quantity).sum();
         return new OverseasProcurementResponses.Summary(order.getId(), order.getOrderNo(), order.getCustomerId(),
             order.getCustomerName(), order.getPurchaseCategory(), order.getProductName(),
             order.getProductSpecification(), value(order.getPurchaseQuantity()), order.getBudgetUnitPrice(),
-            order.getCurrency(), order.getPurchaseWarehouseId(), order.getPurchaseWarehouseName(), inbound, inbound,
+            order.getCurrency(), order.getPurchaseWarehouseId(), order.getPurchaseWarehouseName(), inbound, Math.max(0, inbound - outbound),
             order.getStatus(), value(order.getVersion()), order.getCreatedAt(), order.getUpdatedAt());
     }
 
@@ -336,9 +338,26 @@ public class OverseasProcurementService {
         result.put("overseasTrackingNo", order.getOverseasTrackingNo());
         result.put("estimatedArrivalAt", order.getEstimatedArrivalAt());
         result.put("remark", order.getRemark());
+        result.put("outboundDetails", order.getOutboundDetails());
         return result;
     }
 
+    private List<OverseasProcurementResponses.OutboundDetail> outboundDetails(OverseasProcurementOrder order) {
+        if (!StringUtils.hasText(order.getOutboundDetails())) return List.of();
+        try { return objectMapper.readValue(order.getOutboundDetails(), objectMapper.getTypeFactory().constructCollectionType(List.class, OverseasProcurementResponses.OutboundDetail.class)); }
+        catch (JsonProcessingException e) { return List.of(); }
+    }
+    private String normalizeOutbound(JsonNode node, Long inbound) {
+        if (!node.isArray()) throw badRequest("outboundDetails must be an array");
+        long total = 0;
+        for (JsonNode item : node) {
+            if (!item.isObject() || item.path("quantity").asLong(-1) < 0) throw badRequest("outboundDetails quantity must be non-negative");
+            total += item.path("quantity").asLong();
+        }
+        if (total > value(inbound)) throw badRequest("outbound quantity cannot exceed inbound quantity");
+        try { return objectMapper.writeValueAsString(node); } catch (JsonProcessingException e) { throw badRequest("Invalid outboundDetails"); }
+    }
+
     private String changeDetail(Map<String, Object> before, Map<String, Object> after) {
         Map<String, Object> changes = new LinkedHashMap<>();
         before.forEach((field, oldValue) -> {