From 3ef1cf899c2bf558b934fd2c5dfdf0a970df8c43 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 八月 2025 15:22:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

---
 main-business/src/main/resources/db/migration/postgresql/V20250604104500__create_table_pending_inventory.sql |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/main-business/src/main/resources/db/migration/postgresql/V20250604104500__create_table_pending_inventory.sql b/main-business/src/main/resources/db/migration/postgresql/V20250604104500__create_table_pending_inventory.sql
index 6a82005..39b4e0d 100644
--- a/main-business/src/main/resources/db/migration/postgresql/V20250604104500__create_table_pending_inventory.sql
+++ b/main-business/src/main/resources/db/migration/postgresql/V20250604104500__create_table_pending_inventory.sql
@@ -11,6 +11,7 @@
     registration_time         TIMESTAMP(6) DEFAULT CURRENT_TIMESTAMP, -- 鐧昏鏃堕棿
     price_excluding_tax       VARCHAR(255),                           -- 鍗曚环锛堜笉鍚◣锛�
     total_price_excluding_tax VARCHAR(255),                           -- 鎬讳环锛堜笉鍚◣锛�
+    code VARCHAR(255),                           -- 缂栧彿
     registrant_id             BIGINT,                                 -- 鐧昏浜篒D
     registration_date         DATE,                                   -- 鐧昏鏃ユ湡
     supplier_id               BIGINT,                                 -- 渚涜揣鍟咺D
@@ -18,6 +19,7 @@
     master_id                 BIGINT,                                 -- 鐢熶骇鍔犲伐id
     purchase_id               BIGINT,                                 -- 閲囪喘id
     coal_plan_id               BIGINT,                                 -- 鐓よ川鏂规id
+    type               BIGINT,                                 -- 鐓ゆ枡绫诲瀷 1-鎴愬搧 2-鍘熸枡
 
     deleted                   INTEGER      DEFAULT 0,                 -- 杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�
     create_by                 VARCHAR(255),                           -- 鍒涘缓璇ヨ褰曠殑鐢ㄦ埛
@@ -37,6 +39,8 @@
 COMMENT ON COLUMN pending_inventory.price_including_tax IS '鍗曚环锛堝惈绋庯級';
 COMMENT ON COLUMN pending_inventory.total_price_including_tax IS '鎬讳环锛堝惈绋庯級';
 COMMENT ON COLUMN pending_inventory.registrant IS '鐧昏浜�';
+COMMENT ON COLUMN pending_inventory.code IS '缂栧彿';
+COMMENT ON COLUMN pending_inventory.type IS '鐓ゆ枡绫诲瀷 1-鎴愬搧 2-鍘熸枡';
 COMMENT ON COLUMN pending_inventory.registration_time IS '鐧昏鏃堕棿';
 COMMENT ON COLUMN pending_inventory.price_excluding_tax IS '鍗曚环锛堜笉鍚◣锛�';
 COMMENT ON COLUMN pending_inventory.total_price_excluding_tax IS '鎬讳环锛堜笉鍚◣锛�';

--
Gitblit v1.9.3