From ec3375d0aa399f2f7aa97f61e2d782d1ad17c695 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 11 三月 2026 13:12:23 +0800
Subject: [PATCH] 修改生产订单列表查询
---
doc/宁夏-中盛建材.sql | 97 ++++++++++++++++++++++++++++++++----------------
1 files changed, 64 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 3407354..ab5e37f 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,37 +1,43 @@
-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 = '閿�鍞敓浜ч渶姹�';
+ 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,
@@ -63,3 +69,28 @@
`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 = '鑳芥簮绫诲瀷-鑳借�楁妱琛ㄦ槑缁哶闄勪欢';
+
+alter table product_order
+drop column sales_ledger_id,
+drop column sale_ledger_product_id,
+drop column product_model_id;
+
+alter table production_plan
+ add assigned_quantity DECIMAL(10, 4) default 0 not null COMMENT '涓嬪彂鏁伴噺';
+
+alter table product_order
+ add plan_complete_time datetime(0) NULL DEFAULT NULL COMMENT '璁″垝瀹屾垚鏃堕棿',
+ add combine_production_plan_ids varchar(500) default '' not null;
--
Gitblit v1.9.3