优化

lastleg-service/src/main/java/com/baiyue/lastleg/looseboard/service/LocalLooseboardService.java

@@ -1,5 +1,7 @@
 package com.baiyue.lastleg.looseboard.service;
 
+import com.baiyue.common.core.container.ContainerSpecificationCatalog;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -203,7 +205,9 @@ public class LocalLooseboardService {
         order.setOriginAddress(trim(originAddress));
         order.setDestination(destination.trim());
         order.setDestinationAddress(trim(destinationAddress));
-        order.setContainerType(trim(containerType));
+        order.setContainerType(StringUtils.hasText(containerType)
+            ? ContainerSpecificationCatalog.require(containerType).containerType()
+            : ContainerSpecificationCatalog.DEFAULT_CONTAINER_TYPE);
         order.setPackageCount(packageCount);
         order.setTotalWeightKg(totalWeightKg);
         order.setTotalVolumeCbm(totalVolumeCbm);

lastleg-service/src/main/java/com/baiyue/lastleg/trucking/service/UsTruckOrderService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baiyue.common.core.api.PageResult;
+import com.baiyue.common.core.container.ContainerSpecificationCatalog;
 import com.baiyue.lastleg.trucking.dto.UsTruckOrderRequests;
 import com.baiyue.lastleg.trucking.dto.UsTruckOrderResponses;
 import com.baiyue.lastleg.trucking.entity.UsTruckOrder;
@@ -84,7 +85,9 @@ public class UsTruckOrderService {
         order.setTransportType(StringUtils.hasText(request.transportType()) ? norm(request.transportType()) : null);
         order.setOrigin(trim(request.origin())); order.setOriginAddress(trim(request.originAddress()));
         order.setDestination(trim(request.destination())); order.setDestinationAddress(trim(request.destinationAddress()));
-        order.setContainerType(StringUtils.hasText(request.containerType()) ? norm(request.containerType()) : null);
+        order.setContainerType(StringUtils.hasText(request.containerType())
+            ? ContainerSpecificationCatalog.require(request.containerType()).containerType()
+            : ContainerSpecificationCatalog.DEFAULT_CONTAINER_TYPE);
         order.setPalletCount(request.palletCount()); order.setPackageCount(value(request.packageCount()));
         order.setReceivedPalletCount(0); order.setAllocatedPalletCount(0);
         order.setTotalWeightKg(request.totalWeightKg()); order.setTotalVolumeCbm(request.totalVolumeCbm());
@@ -138,7 +141,8 @@ public class UsTruckOrderService {
         if (request.transportType() != null) { validateTransport(request.transportType()); order.setTransportType(norm(request.transportType())); }
         setText(request.origin(), order::setOrigin); setPresent(request.originAddress(), order::setOriginAddress);
         setText(request.destination(), order::setDestination); setPresent(request.destinationAddress(), order::setDestinationAddress);
-        setText(request.containerType(), v -> order.setContainerType(norm(v)));
+        setText(request.containerType(), v -> order.setContainerType(
+            ContainerSpecificationCatalog.require(v).containerType()));
         if (request.palletCount() != null) order.setPalletCount(request.palletCount());
         if (request.packageCount() != null) order.setPackageCount(request.packageCount());
         if (request.totalWeightKg() != null) order.setTotalWeightKg(request.totalWeightKg()); if (request.totalVolumeCbm() != null) order.setTotalVolumeCbm(request.totalVolumeCbm());

lastleg-service/src/main/resources/db/lastleg.sql

@@ -2005,7 +2005,7 @@ CREATE TABLE IF NOT EXISTS ll_us_truck_order (
   origin_address VARCHAR(500) NULL COMMENT '起运地址',
   destination VARCHAR(255) NOT NULL COMMENT '目的地',
   destination_address VARCHAR(500) NULL COMMENT '目的地址',
-  container_type VARCHAR(32) NULL COMMENT '历史兼容设备类型，零担托盘业务不采集',
+  container_type VARCHAR(32) NOT NULL DEFAULT '40HQ' COMMENT '平台统一柜型：40GP、40HQ、45HQ',
   pallet_count INT NOT NULL DEFAULT 1 COMMENT '客户申报托盘数',
   package_count INT NULL COMMENT '可选箱数，零或空值均有效',
   received_pallet_count INT NOT NULL DEFAULT 0 COMMENT 'PDA实收托盘数',
@@ -2083,7 +2083,7 @@ CREATE TABLE IF NOT EXISTS ll_local_looseboard_order (
   pallet_required VARCHAR(8) NOT NULL COMMENT '是否需要打盘：YES或NO', transport_type VARCHAR(32) NOT NULL COMMENT '运输类型',
   origin VARCHAR(255) NOT NULL COMMENT '起运地', origin_address VARCHAR(500) NULL COMMENT '起运详细地址',
   destination VARCHAR(255) NOT NULL COMMENT '目的地', destination_address VARCHAR(500) NULL COMMENT '目的详细地址、码头或仓号',
-  container_type VARCHAR(32) NULL COMMENT '柜型', package_count INT NOT NULL DEFAULT 0 COMMENT '货物件数',
+  container_type VARCHAR(32) NOT NULL DEFAULT '40HQ' COMMENT '平台统一柜型：40GP、40HQ、45HQ', package_count INT NOT NULL DEFAULT 0 COMMENT '货物件数',
   total_weight_kg DECIMAL(18,3) NOT NULL DEFAULT 0 COMMENT '总重量（千克）',
   total_volume_cbm DECIMAL(18,6) NOT NULL DEFAULT 0 COMMENT '总体积（立方米）',
   budget_amount DECIMAL(18,2) NULL COMMENT '预算总价', currency CHAR(3) NOT NULL DEFAULT 'USD' COMMENT '预算币种',

lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml

@@ -2704,7 +2704,7 @@ components:
         transportType: { type: string, nullable: true }
         origin: { type: string }
         destination: { type: string }
-        containerType: { type: string, nullable: true }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], description: 平台统一柜型 }
         palletCount: { type: integer }
         packageCount: { type: integer }
         receivedPalletCount: { type: integer }
@@ -2760,7 +2760,7 @@ components:
         transportType: { type: string }
         origin: { type: string }
         destination: { type: string }
-        containerType: { type: string, nullable: true }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], description: 平台统一柜型 }
         packageCount: { type: integer }
         totalWeightKg: { type: number }
         totalVolumeCbm: { type: number }
@@ -3101,7 +3101,7 @@ components:
         originAddress: { type: string, nullable: true, maxLength: 500 }
         destination: { type: string, maxLength: 255 }
         destinationAddress: { type: string, nullable: true, maxLength: 500 }
-        containerType: { type: string, nullable: true, maxLength: 32 }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], default: 40HQ, maxLength: 32 }
         palletCount: { type: integer, minimum: 1 }
         packageCount: { type: integer, nullable: true, minimum: 0 }
         totalWeightKg: { type: number, minimum: 0 }
@@ -3123,7 +3123,7 @@ components:
         originAddress: { type: string, nullable: true, maxLength: 500 }
         destination: { type: string, maxLength: 255 }
         destinationAddress: { type: string, nullable: true, maxLength: 500 }
-        containerType: { type: string, nullable: true, maxLength: 32 }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], maxLength: 32 }
         palletCount: { type: integer, minimum: 1 }
         packageCount: { type: integer, minimum: 0 }
         totalWeightKg: { type: number, minimum: 0 }
@@ -3154,7 +3154,7 @@ components:
         originAddress: { type: string, nullable: true, maxLength: 500 }
         destination: { type: string, maxLength: 255 }
         destinationAddress: { type: string, nullable: true, maxLength: 500 }
-        containerType: { type: string, nullable: true, maxLength: 32 }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], default: 40HQ, maxLength: 32 }
         packageCount: { type: integer, minimum: 0 }
         totalWeightKg: { type: number, minimum: 0 }
         totalVolumeCbm: { type: number, minimum: 0 }
@@ -3177,7 +3177,7 @@ components:
         originAddress: { type: string, nullable: true, maxLength: 500 }
         destination: { type: string, maxLength: 255 }
         destinationAddress: { type: string, nullable: true, maxLength: 500 }
-        containerType: { type: string, nullable: true, maxLength: 32 }
+        containerType: { type: string, enum: [40GP, 40HQ, 45HQ], maxLength: 32 }
         packageCount: { type: integer, minimum: 0 }
         totalWeightKg: { type: number, minimum: 0 }
         totalVolumeCbm: { type: number, minimum: 0 }