From b572e82dcafea0fd893d908c7bb0e048483a1dd3 Mon Sep 17 00:00:00 2001 From: gongchunyi <deslre0381@gmail.com> Date: 星期三, 01 四月 2026 13:38:54 +0800 Subject: [PATCH] fix: 生产计划下发时产品类型ID未保存 --- doc/宁夏-中盛建材.sql | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 115 insertions(+), 1 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 f91a888..67f4c6f 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" @@ -414,4 +414,118 @@ DROP TABLE IF EXISTS process_route_item_instance; DROP TABLE IF EXISTS process_route_item_param_instance; -DROP TABLE IF EXISTS product_structure_instance; \ No newline at end of file +DROP TABLE IF EXISTS product_structure_instance; + +ALTER TABLE `product-inventory-management-zsjc`.`production_product_route_item_param` + MODIFY COLUMN `order_item_param_id` bigint NULL DEFAULT NULL COMMENT '鐢熶骇璁㈠崟缁戝畾鐨勫伐鑹鸿矾绾垮伐搴�--鍙傛暟琛↖D' AFTER `production_product_route_item_id`; + +CREATE TABLE `production_product_input` +( + `id` bigint NOT NULL AUTO_INCREMENT, + `product_main_id` bigint NOT NULL COMMENT '鎶ュ伐鍗曚富琛↖D', + `route_item_id` bigint DEFAULT NULL COMMENT '鍏宠仈鍏蜂綋鐨勬姤宸ュ伐搴廔D (瀵瑰簲鍘熷弬鏁拌〃鐨勫叧鑱擨D)', + `product_id` bigint NOT NULL COMMENT '浜у搧/鐗╂枡ID', + `bom_id` bigint DEFAULT NULL COMMENT 'BOM ID', + `quantity` decimal(30, 15) NOT NULL COMMENT '鎶曞叆鏁伴噺 (瀵瑰簲鍘焢roduct_value)', + `unit` varchar(20) DEFAULT NULL COMMENT '鍗曚綅', + `create_user` bigint DEFAULT NULL COMMENT '褰曞叆浜�', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '褰曞叆鏃堕棿', + `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿', + `tenant_id` bigint NOT NULL COMMENT '绉熸埛ID', + PRIMARY KEY (`id`) USING BTREE, + KEY `idx_main_id` (`product_main_id`), + KEY `idx_product_id` (`product_id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_general_ci COMMENT ='鐢熶骇鎶ュ伐鐗╂枡鎶曞叆琛�'; + +ALTER TABLE `production_product_route_item_param` + DROP COLUMN `product_id`, + DROP COLUMN `bom_id`, + DROP COLUMN `product_value`, + DROP COLUMN `dict_code`; + +ALTER TABLE `product-inventory-management-zsjc`.`production_product_output` + ADD COLUMN `total_quantity` decimal(20, 15) NULL COMMENT '鎬绘暟閲�' AFTER `scrap_qty`; + +CREATE TABLE `production_order_route` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭ID', + `order_id` bigint NOT NULL COMMENT '鍏宠仈鐢熶骇璁㈠崟ID (production_order.id)', + `process_route_id` bigint DEFAULT NULL COMMENT '鍘熷宸ヨ壓璺嚎ID (process_route.id)', + `product_model_id` bigint DEFAULT '0' COMMENT '浜у搧id', + `process_route_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '宸ヨ壓璺嚎缂栫爜', + `bom_id` int DEFAULT NULL COMMENT '鍏宠仈bom鐨刬d', + `dict_code` bigint NOT NULL COMMENT '浜у搧绫诲瀷瀛楀吀缂栫爜', + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '鎻忚堪', + `tenant_id` bigint NOT NULL COMMENT '绉熸埛id', + `create_by` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�', + `create_time` datetime DEFAULT NULL COMMENT '褰曞叆鏃堕棿', + `update_by` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�', + `update_time` datetime DEFAULT NULL COMMENT '鏇存柊鏃堕棿', + `remark` varchar(500) DEFAULT NULL COMMENT '澶囨敞', + PRIMARY KEY (`id`) USING BTREE, + KEY `idx_order_id` (`order_id`) USING BTREE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci COMMENT ='鐢熶骇璁㈠崟缁戝畾鐨勫伐鑹鸿矾绾胯〃'; + +CREATE TABLE `production_settlement_batches` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭ID', + `period_time` date DEFAULT NULL COMMENT '鏍哥畻褰掑睘鏈堜唤', + `batch_name` varchar(255) DEFAULT NULL COMMENT '鎵规鍚嶇О', + `status` int DEFAULT '0' COMMENT '鐘舵�侊細0-浠呴绠楋紝1-缁撶畻璁＄畻涓紝2-宸插畬鎴愮粨绠楋紝3-宸查攣瀹�', + `create_user` varchar(255) DEFAULT NULL COMMENT '瀵煎叆鐢ㄦ埛', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃ユ湡', + `tenant_id` bigint DEFAULT NULL COMMENT '绉熸埛ID', + PRIMARY KEY (`id`), + KEY `idx_period` (`period_time`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='鐢熶骇鎴愭湰鏍哥畻鎵规涓昏〃'; + +CREATE TABLE `production_settlement_details` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭ID', + `batch_id` bigint NOT NULL COMMENT '鍏宠仈鏍哥畻鎵规琛↖D', + `product_id` bigint DEFAULT NULL COMMENT '浜у搧ID', + `product_type` varchar(100) DEFAULT NULL COMMENT '浜у搧绫诲瀷鍚嶇О', + `category` varchar(100) DEFAULT NULL COMMENT '璐圭敤绫诲埆', + `subject_name` varchar(100) DEFAULT NULL COMMENT '绉戠洰鍚嶇О', + + `budget_qty` decimal(20, 15) DEFAULT '0.000000000000000' COMMENT '棰勭畻鑰楅噺', + `budget_price` decimal(20, 15) DEFAULT '0.000000000000000' COMMENT '棰勭畻鍗曚环', + `budget_total` decimal(20, 15) DEFAULT '0.000000000000000' COMMENT '棰勭畻鎬绘垚鏈�', + + `actual_qty` decimal(20, 15) DEFAULT '0.000000000000000' COMMENT '瀹為檯鑰楅噺', + `actual_price` decimal(20, 15) DEFAULT '0.000000000000000' COMMENT '瀹為檯鍗曚环', + `actual_total` decimal(20, 15) DEFAULT '0.000000000000000' COMMENT '瀹為檯鎬绘垚鏈�', + + `diff_qty` decimal(20, 15) DEFAULT '0.000000000000000' COMMENT '鑰楅噺宸紓', + `diff_price` decimal(20, 15) DEFAULT '0.000000000000000' COMMENT '鍗曚环宸紓', + `diff_total` DECIMAL(20, 15) DEFAULT '0.000000000000000' COMMENT '鎬绘垚鏈樊寮�', + + `tenant_id` bigint DEFAULT NULL COMMENT '绉熸埛ID', + PRIMARY KEY (`id`), + KEY `idx_batch_id` (`batch_id`), + KEY `idx_product_id` (`product_id`) COMMENT '鏂逛究鎸変骇鍝佹煡璇㈠巻鍙叉垚鏈姣�' +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='鐢熶骇鎴愭湰鏍哥畻瀵规瘮鏄庣粏琛�'; + +ALTER TABLE `product-inventory-management-zsjc`.`production_settlement_batches` + DROP INDEX `idx_period`; + +ALTER TABLE `product-inventory-management-zsjc`.`production_settlement_batches` + DROP COLUMN `batch_name`, + DROP COLUMN `status`; + +ALTER TABLE `product-inventory-management-zsjc`.`production_settlement_details` + DROP COLUMN `actual_qty`, + DROP COLUMN `actual_price`, + DROP COLUMN `actual_total`, + DROP COLUMN `diff_qty`, + DROP COLUMN `diff_price`, + DROP COLUMN `diff_total`; + +ALTER TABLE `product-inventory-management-zsjc`.`production_settlement_batches` + MODIFY COLUMN `period_time` varchar(255) NULL DEFAULT NULL COMMENT '鏍哥畻褰掑睘骞存湀' AFTER `id`; \ No newline at end of file -- Gitblit v1.9.3