From 770361cf5d70c7893ffea4f1dacac297628aea1d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 20 六月 2025 18:03:00 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/zd-after
---
main-business/src/main/resources/db/migration/postgresql/V20250604111200__create_table_official_inventory.sql | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/main-business/src/main/resources/db/migration/postgresql/V20250604111200__create_table_official_inventory.sql b/main-business/src/main/resources/db/migration/postgresql/V20250604111200__create_table_official_inventory.sql
index 94908ff..433afe9 100644
--- a/main-business/src/main/resources/db/migration/postgresql/V20250604111200__create_table_official_inventory.sql
+++ b/main-business/src/main/resources/db/migration/postgresql/V20250604111200__create_table_official_inventory.sql
@@ -5,15 +5,16 @@
supplier_name VARCHAR(255) NOT NULL, -- 渚涜揣鍟嗗悕绉�
coal VARCHAR(50) NOT NULL, -- 鐓ょ
unit VARCHAR(50) NOT NULL, -- 鍗曚綅
- inventory_quantity DECIMAL(10, 2) NOT NULL, -- 搴撳瓨鏁伴噺
+ inventory_quantity DECIMAL(10, 0), -- 搴撳瓨鏁伴噺
price_including_tax DECIMAL(10, 2) NOT NULL, -- 鍗曚环锛堝惈绋庯級
total_price_including_tax DECIMAL(10, 2) NOT NULL, -- 鎬讳环锛堝惈绋庯級
price_excluding_tax DECIMAL(10, 2) NOT NULL, -- 涓嶅惈绋庡崟浠�
total_price_excluding_tax DECIMAL(10, 2) NOT NULL, -- 涓嶅惈绋庢�讳环
- pending_replenishment DECIMAL(10, 2) NOT NULL, -- 寰呰ˉ搴�
+ pending_replenishment DECIMAL(10, 0), -- 寰呰ˉ搴�
registrant_id VARCHAR(50) NOT NULL, -- 鐧昏浜篿d
- type VARCHAR(50) NOT NULL, -- 鐧昏浜篿d
+ type VARCHAR(50), -- 绫诲瀷 1 閲囪喘/ 2 姝ｅ紡 鍏ュ簱
pending_id BIGINT, -- 寰呭叆搴搃d
+ merge_id VARCHAR(255), -- 鍚堝苟id
registration_date TIMESTAMP WITHOUT TIME ZONE,
deleted INT NOT NULL DEFAULT 0, -- 杞垹闄ゆ爣蹇楋細0=鏈垹闄わ紝1=宸插垹闄�
@@ -37,6 +38,7 @@
COMMENT ON COLUMN official_inventory.pending_replenishment IS '寰呰ˉ搴�';
COMMENT ON COLUMN official_inventory.registrant_id IS '鐧昏浜篿d';
COMMENT ON COLUMN official_inventory.registration_date IS '鐧昏鏃ユ湡';
+COMMENT ON COLUMN official_inventory.merge_id IS '鍚堝苟id';
COMMENT ON COLUMN official_inventory.deleted IS '杞垹闄ゆ爣蹇楋紝0=鏈垹闄わ紝1=宸插垹闄�';
COMMENT ON COLUMN official_inventory.create_by IS '鍒涘缓璇ヨ褰曠殑鐢ㄦ埛';
--
Gitblit v1.9.3