From cf7bc2d68e7d86e7d4b896acf1400f534d594daa Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 10 三月 2026 17:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

---
 doc/宁夏-中盛建材.sql |  116 +++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 83 insertions(+), 33 deletions(-)

diff --git "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql" "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
index ee0341f..ba7e338 100644
--- "a/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
+++ "b/doc/\345\256\201\345\244\217-\344\270\255\347\233\233\345\273\272\346\235\220.sql"
@@ -1,34 +1,84 @@
-CREATE TABLE `production_plan`
+DROP TABLE IF EXISTS `production_plan`;
+
+CREATE TABLE production_plan
 (
-    `id`                  BIGINT      NOT NULL AUTO_INCREMENT COMMENT '鑷涓婚敭',
-    `form_instance_id`    VARCHAR(64) NOT NULL COMMENT '琛ㄥ崟瀹炰緥ID',
-    `serial_no`           VARCHAR(64)    DEFAULT NULL COMMENT '鍗曟嵁娴佹按鍙�',
-    `title`               VARCHAR(128)   DEFAULT NULL COMMENT '鍗曟嵁鏍囬',
-    `originator_user_id`  VARCHAR(64)    DEFAULT NULL COMMENT '鍙戣捣浜篒D',
-    `originator_name`     VARCHAR(64)    DEFAULT NULL COMMENT '鍙戣捣浜哄鍚�',
-    `biz_create_time`     DATETIME       DEFAULT NULL COMMENT '鍗曟嵁鍒涘缓鏃堕棿',
-    `project_name`        VARCHAR(128)   DEFAULT NULL COMMENT '椤圭洰鍚嶇О',
-    `batch_no`            VARCHAR(128)   DEFAULT NULL COMMENT '鎵规鍙�',
-    `contact_person`      VARCHAR(128)   DEFAULT NULL COMMENT '鑱旂郴浜�',
-    `ext_text1`           VARCHAR(128)   DEFAULT NULL COMMENT '棰勭暀1',
-    `ext_text2`           VARCHAR(128)   DEFAULT NULL COMMENT '棰勭暀2',
-    `material_code`       VARCHAR(64)    DEFAULT NULL COMMENT '鐗╂枡缂栫爜',
-    `material_category`   VARCHAR(64)    DEFAULT NULL COMMENT '鐗╂枡鍒嗙被',
-    `spec_desc`           VARCHAR(128)   DEFAULT NULL COMMENT '瑙勬牸鎻忚堪',
-    `grade_type`          VARCHAR(32)    DEFAULT NULL COMMENT '绛夌骇',
-    `length`              DECIMAL(10, 2) DEFAULT NULL COMMENT '闀垮害',
-    `width`               DECIMAL(10, 2) DEFAULT NULL COMMENT '瀹藉害',
-    `thickness`           DECIMAL(10, 2) DEFAULT NULL COMMENT '鍘氬害',
-    `quantity`            INT            DEFAULT NULL COMMENT '鏁伴噺',
-    `volume`              DECIMAL(10, 4) DEFAULT NULL COMMENT '鎬讳綋绉�',
-    `date_start`          DATETIME       DEFAULT NULL COMMENT '寮�濮嬫椂闂�',
-    `date_end`            DATETIME       DEFAULT NULL COMMENT '缁撴潫鏃堕棿',
-    `association_receipt` TEXT COMMENT '鍏宠仈鍗曟嵁',
-    `data_sync_type`      TINYINT        DEFAULT 1 COMMENT '鏁版嵁鏂瑰紡: 1=鎵嬪姩 2=瀹氭椂',
-    `data_source_type`    TINYINT        DEFAULT 1 COMMENT '鏁版嵁鏉ユ簮: 1=閿�鍞鍗� 2=鐢熶骇棰勬祴',
-    `create_time`         DATETIME       DEFAULT CURRENT_TIMESTAMP,
-    `update_time`         DATETIME       DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-    PRIMARY KEY (`id`),
-    KEY `idx_form_instance_id` (`form_instance_id`)
-) ENGINE = INNODB
-  DEFAULT CHARSET = utf8mb4 COMMENT = '閿�鍞敓浜ч渶姹�';
\ No newline at end of file
+    id                 BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '涓婚敭',
+    form_instance_id   VARCHAR(64) COMMENT '琛ㄥ崟瀹炰緥ID',
+    serial_no          VARCHAR(50) COMMENT '娴佹按鍙�',
+    apply_no           VARCHAR(100) COMMENT '鐢宠鍗曠紪鍙�',
+    customer_name      VARCHAR(200) COMMENT '瀹㈡埛鍚嶇О',
+    material_code      VARCHAR(100) COMMENT '鐗╂枡缂栫爜',
+    product_name       VARCHAR(200) COMMENT '浜у搧鍚嶇О',
+    product_spec       VARCHAR(200) COMMENT '浜у搧瑙勬牸',
+    length             INT COMMENT '闀�',
+    width              INT COMMENT '瀹�',
+    height             INT COMMENT '楂�',
+    quantity           INT COMMENT '鍧楁暟',
+    total_count        INT COMMENT '姝ゆ缁熻鏁伴噺',
+    volume             DECIMAL(10, 4) COMMENT '鏂规暟',
+    strength           VARCHAR(50) COMMENT '寮哄害',
+    start_date         DATETIME COMMENT '寮�濮嬫棩鏈�',
+    end_date           DATETIME COMMENT '缁撴潫鏃ユ湡',
+    submitter          VARCHAR(100) COMMENT '鎻愪氦浜�',
+    submit_org         VARCHAR(200) COMMENT '鎻愪氦浜虹粍缁�',
+    remark_one         TEXT COMMENT '澶囨敞1',
+    remark_two         TEXT COMMENT '澶囨敞2',
+    creator_name       VARCHAR(100) COMMENT '鍒涘缓浜�',
+    modifier_name      VARCHAR(100) COMMENT '淇敼浜�',
+    form_created_time  DATETIME COMMENT '琛ㄥ崟鍒涘缓鏃堕棿',
+    form_modified_time DATETIME COMMENT '琛ㄥ崟淇敼鏃堕棿',
+    data_sync_type     TINYINT  DEFAULT 1 COMMENT '鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟',
+    data_source_type   TINYINT  DEFAULT 1 COMMENT '鏁版嵁鏉ユ簮绫诲瀷锛�1=閿�鍞鍗� 2=閿�鍞娴�',
+    create_time        DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '鏁版嵁搴撳垱寤烘椂闂�',
+    update_time        DATETIME COMMENT '鏁版嵁搴撴洿鏂版椂闂�',
+
+    INDEX idx_apply_no (apply_no),
+    INDEX idx_serial_no (serial_no),
+    INDEX idx_form_instance_id (form_instance_id),
+    INDEX idx_material_code (material_code)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='閿�鍞敓浜ц鍒�';
+
+CREATE TABLE `product-inventory-management-zsjc`.`energy`  (
+    `id` int NOT NULL AUTO_INCREMENT,
+    `energy_tyep` varchar(255) NULL COMMENT '鑳芥簮绫诲瀷',
+    `energy_name` varchar(255) NULL COMMENT '鑳芥簮鍚嶇О',
+    `unit` varchar(255) NULL COMMENT '鍗曚綅',
+    `unit_price` decimal(10, 2) NULL COMMENT '鍗曚环',
+    `remark` varchar(255) NULL COMMENT '澶囨敞',
+    `create_time` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
+    `update_time` datetime(0) NULL DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
+    `create_user` bigint NULL DEFAULT NULL COMMENT '鍒涘缓鑰�',
+    `update_user` bigint NULL DEFAULT NULL COMMENT '鏇存柊鑰�',
+    PRIMARY KEY (`id`)
+    ) COMMENT = '鑳芥簮绫诲瀷';
+
+CREATE TABLE `product-inventory-management-zsjc`.`energy_consumption_detail`  (
+    `id` int NOT NULL AUTO_INCREMENT,
+    `energy_id` int NULL COMMENT '澶栨鍏宠仈鑳芥簮绫诲瀷id',
+    `type` varchar(255) NULL COMMENT '鍔炲叕/鐢熶骇',
+    `meter_reading_location` varchar(255) NULL COMMENT '鎶勮〃浣嶇疆',
+    `meter_reading_date` date NULL COMMENT '鎶勮〃鏃ユ湡',
+    `start_code` decimal(10, 2) NULL COMMENT '璧风爜',
+    `stop_code` decimal(10, 2) NULL COMMENT '姝㈢爜',
+    `dosage` decimal(10, 2) NULL COMMENT '鐢ㄩ噺',
+    `remark` varchar(255) NULL COMMENT '澶囨敞',
+    `create_time` datetime(0) NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿',
+    `update_time` datetime(0) NULL DEFAULT NULL COMMENT '鏇存柊鏃堕棿',
+    `create_user` bigint NULL DEFAULT NULL COMMENT '鍒涘缓鑰�',
+    `update_user` bigint NULL DEFAULT NULL COMMENT '鏇存柊鑰�',
+    PRIMARY KEY (`id`)
+    ) COMMENT = '鑳芥簮绫诲瀷-鑳借�楁妱琛ㄦ槑缁�';
+
+CREATE TABLE `product-inventory-management-zsjc`.`energy_consumption_detail_file`  (
+    `id` int NOT NULL AUTO_INCREMENT,
+    `energy_consumption_detail_id` int NULL COMMENT '鍏宠仈澶栭敭鑳借�楁妱琛╥d',
+    `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+    `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+    `file_size` double NULL DEFAULT NULL,
+    `create_time` timestamp(0) NULL DEFAULT NULL,
+    `create_user` int NULL DEFAULT NULL,
+    `update_time` timestamp(0) NULL DEFAULT NULL,
+    `update_user` int NULL DEFAULT NULL,
+    PRIMARY KEY (`id`)
+    ) COMMENT = '鑳芥簮绫诲瀷-鑳借�楁妱琛ㄦ槑缁哶闄勪欢';

--
Gitblit v1.9.3