优化

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

@@ -1,5 +1,6 @@
 package com.baiyue.lastleg.procurement.dto;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import jakarta.validation.constraints.DecimalMin;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
@@ -41,23 +42,15 @@ public final class OverseasProcurementRequests {
         @NotNull @Min(0) Long version,
         @Size(max = 128) String purchaseCategory,
         @Size(max = 255) String productName,
-        @Size(max = 500) String productSpecification,
-        @Size(max = 2000) String productUrl,
+        JsonNode productSpecification,
+        JsonNode productUrl,
         @Min(0) Long inboundQuantity,
-        @Size(max = 128) String purchaseWarehouseId,
-        @Size(max = 255) String purchaseWarehouseName,
-        @Size(max = 128) String domesticCarrier,
-        @Size(max = 128) String domesticTrackingNo,
-        @Size(max = 128) String overseasCarrier,
-        @Size(max = 128) String overseasTrackingNo,
-        LocalDateTime estimatedArrivalAt,
-        @Size(max = 1000) String remark) {}
-
-    public record AddOutbound(
-        @NotNull @Positive Long quantity,
-        @NotBlank @Size(max = 128) String outboundNo,
-        @Size(max = 128) String carrier,
-        @Size(max = 128) String trackingNo,
-        LocalDateTime outboundAt,
-        @Size(max = 1000) String remark) {}
+        JsonNode purchaseWarehouseId,
+        JsonNode purchaseWarehouseName,
+        JsonNode domesticCarrier,
+        JsonNode domesticTrackingNo,
+        JsonNode overseasCarrier,
+        JsonNode overseasTrackingNo,
+        JsonNode estimatedArrivalAt,
+        JsonNode remark) {}
 }

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

@@ -12,15 +12,17 @@ public final class OverseasProcurementResponses {
         String purchaseCategory, String productName, String productSpecification,
         long purchaseQuantity, BigDecimal budgetUnitPrice, String currency,
         String purchaseWarehouseId, String purchaseWarehouseName,
-        long inboundQuantity, long outboundQuantity, long inventoryQuantity,
+        long inboundQuantity, long inventoryQuantity,
         String status, long version, LocalDateTime createdAt, LocalDateTime updatedAt) {}
 
-    public record Outbound(
-        Long id, long quantity, String outboundNo, String carrier, String trackingNo,
-        LocalDateTime outboundAt, String remark, String createdBy, LocalDateTime createdAt) {}
+    public record CustomerOption(String customerId, String customerName) {}
+
+    public record WarehouseOption(
+        String warehouseId, String warehouseCode, String warehouseName, String countryCode) {}
 
     public record History(
-        String fromStatus, String toStatus, String operatorId, String remark,
+        String operationType, String fromStatus, String toStatus, String operatorId,
+        String changeDetail, String remark,
         LocalDateTime createdAt) {}
 
     public record Detail(
@@ -30,5 +32,5 @@ public final class OverseasProcurementResponses {
         String overseasCarrier, String overseasTrackingNo,
         LocalDateTime estimatedArrivalAt, String remark,
         String createdBy, String reviewedBy, String reviewRemark, LocalDateTime reviewedAt,
-        List<Outbound> outbounds, List<History> histories) {}
+        List<History> histories) {}
 }