优化

warehouse/src/main/resources/db/phase2-pallet-location-schema-migration.sql

@@ -9,6 +9,7 @@ SET @sql = IF((SELECT COUNT(*) FROM information_schema.columns
   'ALTER TABLE wh_pallet ADD COLUMN weight_kg DECIMAL(18,3) NOT NULL DEFAULT 0 COMMENT ''托盘重量kg'' AFTER capacity_cbm',
   'SELECT 1');
 PREPARE statement FROM @sql; EXECUTE statement; DEALLOCATE PREPARE statement;
+
 SET @sql = IF((SELECT COUNT(*) FROM information_schema.columns
                 WHERE table_schema = DATABASE() AND table_name = 'wh_pallet' AND column_name = 'color') = 0,
   'ALTER TABLE wh_pallet ADD COLUMN color VARCHAR(32) NOT NULL DEFAULT '''' COMMENT ''托盘颜色'' AFTER weight_kg',
@@ -53,6 +54,35 @@ UPDATE wh_location SET tenant_id = 0 WHERE tenant_id <> 0;
 UPDATE wh_location_reservation SET tenant_id = 0 WHERE tenant_id <> 0;
 UPDATE wh_location_occupancy SET tenant_id = 0 WHERE tenant_id <> 0;
 
+-- 托盘编码在平台公共作用域全局唯一，避免不同仓库并发生成重复编码。
+DROP PROCEDURE IF EXISTS assert_pallet_code_globally_unique;
+DELIMITER $$
+CREATE PROCEDURE assert_pallet_code_globally_unique()
+BEGIN
+  IF EXISTS (
+    SELECT 1 FROM wh_pallet
+    GROUP BY tenant_id, pallet_code
+    HAVING COUNT(*) > 1
+  ) THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = '托盘编码迁移失败：不同仓库存在重复编码，请先清理';
+  END IF;
+END$$
+DELIMITER ;
+CALL assert_pallet_code_globally_unique();
+DROP PROCEDURE IF EXISTS assert_pallet_code_globally_unique;
+
+SET @sql = IF((SELECT COUNT(*) FROM information_schema.statistics
+                WHERE table_schema = DATABASE() AND table_name = 'wh_pallet'
+                  AND index_name = 'uk_pallet_tenant_warehouse_code') > 0,
+  'ALTER TABLE wh_pallet DROP INDEX uk_pallet_tenant_warehouse_code', 'SELECT 1');
+PREPARE statement FROM @sql; EXECUTE statement; DEALLOCATE PREPARE statement;
+SET @sql = IF((SELECT COUNT(*) FROM information_schema.statistics
+                WHERE table_schema = DATABASE() AND table_name = 'wh_pallet'
+                  AND index_name = 'uk_pallet_tenant_code') = 0,
+  'ALTER TABLE wh_pallet ADD UNIQUE KEY uk_pallet_tenant_code (tenant_id, pallet_code)', 'SELECT 1');
+PREPARE statement FROM @sql; EXECUTE statement; DEALLOCATE PREPARE statement;
+
 SET @sql = IF((SELECT COUNT(*) FROM information_schema.statistics
                 WHERE table_schema = @schema_name
                   AND table_name = 'wh_location_reservation'

warehouse/src/main/resources/db/phase2-pallet-location-schema.sql

@@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS wh_pallet (
   deleted TINYINT(1) NOT NULL DEFAULT 0 COMMENT '逻辑删除标记',
   version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号',
   PRIMARY KEY (id),
-  UNIQUE KEY uk_pallet_tenant_warehouse_code (tenant_id, warehouse_id, pallet_code),
+  UNIQUE KEY uk_pallet_tenant_code (tenant_id, pallet_code),
   KEY idx_pallet_available (tenant_id, warehouse_id, status, deleted),
   KEY idx_pallet_type (tenant_id, warehouse_id, pallet_type, status, deleted),
   CONSTRAINT fk_pallet_warehouse FOREIGN KEY (warehouse_id) REFERENCES wh_warehouse (id),

warehouse/src/main/resources/db/phase2-pallet-seed.sql

@@ -0,0 +1,17 @@
+-- 二期托盘初始化数据。执行顺序：warehouse-seed.sql、phase2-pallet-location-schema.sql、增量迁移、本文件。
+SET NAMES utf8mb4;
+USE baiyue_warehouse;
+
+-- 编码由平台维护接口自动生成；种子固定为 TP-001、TP-002。
+INSERT INTO wh_pallet(id,tenant_id,warehouse_id,pallet_code,pallet_type,capacity_cbm,weight_kg,color,status,remark,created_by,updated_by)
+VALUES
+ (190000000000000101,0,190000000000000001,'TP-001','木托盘',1.200000,8.000,'黄色','AVAILABLE',NULL,0,0),
+ (190000000000000102,0,190000000000000001,'TP-002','胶托盘',2.400000,12.000,'黑色','AVAILABLE',NULL,0,0)
+ON DUPLICATE KEY UPDATE
+ tenant_id=0,
+ warehouse_id=VALUES(warehouse_id),
+ pallet_type=VALUES(pallet_type),
+ capacity_cbm=VALUES(capacity_cbm),
+ weight_kg=VALUES(weight_kg),
+ color=VALUES(color),
+ remark=VALUES(remark);

warehouse/src/main/resources/db/warehouse-seed.sql

@@ -11,13 +11,6 @@ INSERT INTO wh_service_capability(id,tenant_id,warehouse_id,capability_code,capa
 VALUES(190000000000000021,0,190000000000000001,'RECEIVING','头程收货',1,'16:00:00','工作日16点前预约可当日收货')
 ON DUPLICATE KEY UPDATE tenant_id=0,enabled=1,cutoff_time=VALUES(cutoff_time);
 
--- 二期托盘初始化数据。编码由平台维护接口自动生成，种子固定为 TP-001、TP-002。
-INSERT INTO wh_pallet(id,tenant_id,warehouse_id,pallet_code,pallet_type,capacity_cbm,weight_kg,color,status,remark,created_by,updated_by)
-VALUES
- (190000000000000101,0,190000000000000001,'TP-001','木托盘',1.200000,8.000,'黄色','AVAILABLE','无备注',0,0),
- (190000000000000102,0,190000000000000001,'TP-002','胶托盘',2.400000,12.000,'黑色','AVAILABLE','无备注',0,0)
-ON DUPLICATE KEY UPDATE tenant_id=0,warehouse_id=VALUES(warehouse_id),pallet_type=VALUES(pallet_type),capacity_cbm=VALUES(capacity_cbm),weight_kg=VALUES(weight_kg),color=VALUES(color),remark=VALUES(remark);
-
 -- 一期联调快递公司主数据，供平台维护和订单履约回显验证。
 INSERT INTO wh_express_company(id,tenant_id,company_code,company_name,service_phone,website,tracking_url_template,status,remark)
 VALUES(192000000000000001,0,'SF','顺丰速运','95338','https://www.sf-express.com','https://www.sf-express.com/chn/sc/dynamic_function/waybill/#search/bill-number/{trackingNo}','ACTIVE','平台公共快递公司样本')