装柜

firstleg/src/main/resources/db/phase3-inbound-parent-child-schema.sql

@@ -79,8 +79,8 @@ CALL phase3_inbound_add_index(
   'fl_inbound_order', 'uk_inbound_master_order',
   'UNIQUE KEY `uk_inbound_master_order` (`tenant_id`, `master_order_id`)');
 CALL phase3_inbound_add_index(
-  'fl_inbound_order', 'uk_inbound_parent_sequence',
-  'UNIQUE KEY `uk_inbound_parent_sequence` (`tenant_id`, `parent_inbound_id`, `split_sequence`)');
+  'fl_inbound_order', 'uk_inbound_one_child',
+  'UNIQUE KEY `uk_inbound_one_child` (`tenant_id`, `parent_inbound_id`)');
 CALL phase3_inbound_add_index(
   'fl_inbound_order', 'idx_inbound_root_role',
   'KEY `idx_inbound_root_role` (`tenant_id`, `root_inbound_id`, `inbound_role`, `created_at`, `id`)');
@@ -97,6 +97,14 @@ BEGIN
   ) THEN
     ALTER TABLE fl_inbound_order DROP INDEX uk_inbound_tenant_order;
   END IF;
+  IF EXISTS (
+    SELECT 1 FROM information_schema.statistics
+     WHERE table_schema = DATABASE()
+       AND table_name = 'fl_inbound_order'
+       AND index_name = 'uk_inbound_parent_sequence'
+  ) THEN
+    ALTER TABLE fl_inbound_order DROP INDEX uk_inbound_parent_sequence;
+  END IF;
 END$$
 DELIMITER ;
 CALL phase3_inbound_drop_legacy_index();
@@ -133,14 +141,15 @@ CREATE TABLE IF NOT EXISTS fl_inbound_split_item (
   split_batch_id BIGINT UNSIGNED NOT NULL COMMENT '拆分批次ID',
   parent_inbound_id BIGINT UNSIGNED NOT NULL COMMENT '主入仓单ID',
   child_inbound_id BIGINT UNSIGNED NOT NULL COMMENT '子入仓单ID',
+  line_no INT UNSIGNED NOT NULL COMMENT '同一拆分批次内的行号',
   source_inbound_detail_id BIGINT UNSIGNED NULL COMMENT '订单货物明细逻辑ID',
   source_measurement_id BIGINT UNSIGNED NULL COMMENT '来源测量批次ID',
   source_measurement_item_id BIGINT UNSIGNED NULL COMMENT '来源测量箱规明细ID',
   package_count INT UNSIGNED NOT NULL COMMENT '分配给子单的箱数',
   created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
   PRIMARY KEY (id),
-  UNIQUE KEY uk_inbound_split_child (tenant_id, child_inbound_id),
-  UNIQUE KEY uk_inbound_split_batch_child (tenant_id, split_batch_id, child_inbound_id),
+  UNIQUE KEY uk_inbound_split_batch_line (tenant_id, split_batch_id, line_no),
+  UNIQUE KEY uk_inbound_split_batch_source_item (tenant_id, split_batch_id, source_measurement_item_id),
   KEY idx_inbound_split_detail (tenant_id, source_inbound_detail_id, created_at),
   CONSTRAINT chk_inbound_split_item_package CHECK (package_count > 0),
   CONSTRAINT fk_inbound_split_item_batch FOREIGN KEY (split_batch_id) REFERENCES fl_inbound_split_batch (id),
@@ -203,6 +212,9 @@ CALL phase3_inbound_add_column(
 CALL phase3_inbound_add_column(
   'fl_inbound_measurement_item', 'source_measurement_item_id',
   "BIGINT UNSIGNED NULL COMMENT '被拆分继承的来源测量箱规明细ID' AFTER split_item_id");
+CALL phase3_inbound_add_column(
+  'fl_inbound_split_item', 'line_no',
+  "INT UNSIGNED NOT NULL DEFAULT 1 COMMENT '同一拆分批次内的行号' AFTER child_inbound_id");
 DROP PROCEDURE IF EXISTS phase3_inbound_add_column;
 
 DROP PROCEDURE IF EXISTS phase3_inbound_add_relation;
@@ -274,8 +286,31 @@ CALL phase3_inbound_add_index(
 CALL phase3_inbound_add_index(
   'fl_inbound_measurement_item', 'idx_measure_item_split_source',
   'KEY `idx_measure_item_split_source` (`tenant_id`, `split_item_id`, `source_measurement_item_id`)');
+CALL phase3_inbound_add_index(
+  'fl_inbound_split_item', 'uk_inbound_split_batch_line',
+  'UNIQUE KEY `uk_inbound_split_batch_line` (`tenant_id`, `split_batch_id`, `line_no`)');
+CALL phase3_inbound_add_index(
+  'fl_inbound_split_item', 'uk_inbound_split_batch_source_item',
+  'UNIQUE KEY `uk_inbound_split_batch_source_item` (`tenant_id`, `split_batch_id`, `source_measurement_item_id`)');
 DROP PROCEDURE IF EXISTS phase3_inbound_add_index;
 
+DROP PROCEDURE IF EXISTS phase3_inbound_drop_split_legacy_index;
+DELIMITER $$
+CREATE PROCEDURE phase3_inbound_drop_split_legacy_index()
+BEGIN
+  IF EXISTS (SELECT 1 FROM information_schema.statistics WHERE table_schema = DATABASE()
+      AND table_name = 'fl_inbound_split_item' AND index_name = 'uk_inbound_split_child') THEN
+    ALTER TABLE fl_inbound_split_item DROP INDEX uk_inbound_split_child;
+  END IF;
+  IF EXISTS (SELECT 1 FROM information_schema.statistics WHERE table_schema = DATABASE()
+      AND table_name = 'fl_inbound_split_item' AND index_name = 'uk_inbound_split_batch_child') THEN
+    ALTER TABLE fl_inbound_split_item DROP INDEX uk_inbound_split_batch_child;
+  END IF;
+END$$
+DELIMITER ;
+CALL phase3_inbound_drop_split_legacy_index();
+DROP PROCEDURE IF EXISTS phase3_inbound_drop_split_legacy_index;
+
 DROP TRIGGER IF EXISTS trg_inbound_order_parent_before_insert;
 DROP TRIGGER IF EXISTS trg_inbound_order_parent_before_update;
 DROP TRIGGER IF EXISTS trg_inbound_split_item_before_insert;
@@ -368,7 +403,7 @@ BEGIN
        AND child_order.tenant_id = NEW.tenant_id
        AND child_order.inbound_role = 'CHILD'
        AND child_order.parent_inbound_id = NEW.parent_inbound_id
-       AND child_order.package_count = NEW.package_count
+       AND child_order.package_count >= NEW.package_count
        AND child_order.deleted = 0
        AND (NEW.source_measurement_item_id IS NULL OR EXISTS (
          SELECT 1
@@ -416,15 +451,26 @@ BEGIN
           WHERE parent_order.id = NEW.parent_inbound_id
             AND parent_order.tenant_id = NEW.tenant_id
             AND parent_order.inbound_role = 'MASTER'
-            AND parent_order.package_count = 0
-            AND parent_order.split_status = 'FULLY_SPLIT'
+            AND parent_order.package_count > 0
+            AND parent_order.split_status = 'PARTIALLY_SPLIT'
             AND parent_order.version > NEW.expected_parent_version
        ) OR
        (SELECT COALESCE(SUM(item.package_count), 0)
           FROM fl_inbound_split_item item
          WHERE item.tenant_id = NEW.tenant_id
-           AND item.split_batch_id = NEW.id) <> NEW.package_count THEN
-      SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '主单可用箱数未归零或子单箱数合计不一致';
+           AND item.split_batch_id = NEW.id) <> NEW.package_count OR
+       (SELECT COUNT(DISTINCT item.child_inbound_id)
+          FROM fl_inbound_split_item item
+         WHERE item.tenant_id = NEW.tenant_id
+           AND item.split_batch_id = NEW.id) <> 1 OR
+       EXISTS (SELECT 1
+                 FROM fl_inbound_split_item item
+                 JOIN fl_inbound_order child_order ON child_order.id = item.child_inbound_id
+                WHERE item.tenant_id = NEW.tenant_id
+                  AND item.split_batch_id = NEW.id
+                GROUP BY child_order.id, child_order.package_count
+               HAVING child_order.package_count <> SUM(item.package_count)) THEN
+      SIGNAL SQLSTATE '45000' SET MESSAGE_TEXT = '二级子入仓单或拆分明细箱数合计不一致';
     END IF;
     IF EXISTS (
       SELECT 1