From 0dcc14943b6dcaecf56597ed149e61da997be8e5 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 20 三月 2026 09:29:54 +0800
Subject: [PATCH] fix: BOM的单位产出需要数量精度修改、返回单位取消产品表绑定
---
doc/宁夏-中盛建材.sql | 111 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 69 insertions(+), 42 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 d91f818..d9c5e24 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"
@@ -304,54 +304,36 @@
-- Table structure for process_route_item_param_instance
-- ----------------------------
DROP TABLE IF EXISTS `process_route_item_param_instance`;
+
CREATE TABLE `process_route_item_param_instance`
(
`id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭ID',
+ `order_id` bigint DEFAULT NULL COMMENT '鐢熶骇璁㈠崟ID',
`route_item_id` bigint NOT NULL COMMENT '鍏宠仈宸ヨ壓璺嚎鏄庣粏ID (process_route_item.id)',
- `param_id` bigint NOT NULL COMMENT '鍏宠仈鍩虹鍙傛暟瀹氫箟ID (base_param.id)',
- `process_param_id` bigint NULL DEFAULT NULL COMMENT '鏉ユ簮宸ュ簭鍙傛暟ID',
- `standard_value` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '姝よ矾绾胯妭鐐硅瀹氱殑鏍囧噯鍊�',
- `min_value` decimal(10, 2) NULL DEFAULT NULL COMMENT '姝よ矾绾胯妭鐐硅瀹氱殑鏍囧噯鏈�灏忓��',
- `max_value` decimal(10, 2) NULL DEFAULT NULL COMMENT '姝よ矾绾胯妭鐐硅瀹氱殑鏍囧噯鏈�澶у��',
- `is_required` tinyint NOT NULL DEFAULT 0 COMMENT '鏄惁蹇呭～',
- `sort` int NOT NULL DEFAULT 0 COMMENT '鎺掑簭',
- `tenant_id` bigint NULL DEFAULT NULL COMMENT '绉熸埛ID',
- `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP,
- `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `process_param_id` bigint DEFAULT NULL COMMENT '鏉ユ簮宸ュ簭鍙傛暟ID',
+ `param_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '鍙傛暟鍞竴鏍囪瘑',
+ `param_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '鍙傛暟鍚嶇О',
+ `param_type` tinyint NOT NULL COMMENT '鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)',
+ `param_format` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '鍙傛暟鏍煎紡',
+ `value_mode` tinyint DEFAULT '1' COMMENT '鍊兼ā寮�(1鍗曞�� 2鍖洪棿)',
+ `unit` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '鍗曚綅',
+ `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '澶囨敞',
+ `standard_value` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '鏍囧噯鍊�',
+ `min_value` decimal(10, 2) DEFAULT NULL COMMENT '姝よ矾绾胯妭鐐硅瀹氱殑鏍囧噯鏈�灏忓��',
+ `max_value` decimal(10, 2) DEFAULT NULL COMMENT '姝よ矾绾胯妭鐐硅瀹氱殑鏍囧噯鏈�澶у��',
+ `is_required` tinyint NOT NULL DEFAULT '0' COMMENT '鏄惁蹇呭～',
+ `sort` int NOT NULL DEFAULT '0' COMMENT '鎺掑簭',
+ `tenant_id` bigint DEFAULT NULL COMMENT '绉熸埛ID',
+ `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
PRIMARY KEY (`id`) USING BTREE,
- INDEX `idx_route_item_id` (`route_item_id` ASC) USING BTREE,
- INDEX `idx_param_id` (`param_id` ASC) USING BTREE
+ KEY `idx_route_item_id` (`route_item_id`) USING BTREE,
+ KEY `idx_param_key` (`param_key`)
) ENGINE = InnoDB
- AUTO_INCREMENT = 178
- CHARACTER SET = utf8mb4
- COLLATE = utf8mb4_0900_ai_ci COMMENT = '宸ヨ壓璺嚎宸ュ簭鍙傛暟-闄勮〃'
- ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for product_process_param_instance
--- ----------------------------
-DROP TABLE IF EXISTS `product_process_param_instance`;
-CREATE TABLE `product_process_param_instance`
-(
- `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭ID',
- `process_id` bigint NOT NULL COMMENT '鎵�灞炲伐搴廔D (product_process.id)',
- `param_id` bigint NOT NULL COMMENT '鍏宠仈鍩虹鍙傛暟ID (base_param.id)',
- `standard_value` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鍦ㄦ宸ュ簭璁惧畾鐨勬爣鍑嗗��(鍗曞�兼ā寮�)',
- `min_value` decimal(10, 2) NULL DEFAULT NULL COMMENT '鍦ㄦ宸ュ簭璁惧畾鐨勬爣鍑嗘渶灏忓��(鍖洪棿妯″紡)',
- `max_value` decimal(10, 2) NULL DEFAULT NULL COMMENT '鍦ㄦ宸ュ簭璁惧畾鐨勬爣鍑嗘渶澶у��(鍖洪棿妯″紡)',
- `is_required` tinyint NOT NULL DEFAULT 0 COMMENT '鍦ㄦ宸ュ簭涓槸鍚﹀繀濉�(0-鍚�, 1-鏄�)',
- `sort` int NOT NULL DEFAULT 0 COMMENT '鎺掑簭鍙�',
- `tenant_id` bigint NULL DEFAULT NULL COMMENT '绉熸埛ID',
- `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
- `update_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
- PRIMARY KEY (`id`) USING BTREE,
- INDEX `idx_process_id` (`process_id` ASC) USING BTREE,
- INDEX `idx_param_id` (`param_id` ASC) USING BTREE
-) ENGINE = InnoDB
- AUTO_INCREMENT = 61
- CHARACTER SET = utf8mb4
- COLLATE = utf8mb4_0900_ai_ci COMMENT = '宸ュ簭缁戝畾鍙傛暟-闄勮〃'
- ROW_FORMAT = Dynamic;
+ AUTO_INCREMENT = 1
+ DEFAULT CHARSET = utf8mb4
+ COLLATE = utf8mb4_0900_ai_ci
+ ROW_FORMAT = DYNAMIC COMMENT ='宸ヨ壓璺嚎宸ュ簭鍙傛暟瀹炰緥琛�';
-- ----------------------------
-- Table structure for product_structure_instance
@@ -375,6 +357,22 @@
ROW_FORMAT = Dynamic;
SET FOREIGN_KEY_CHECKS = 1;
+
+
+ALTER TABLE `process_route_item_instance`
+ ADD COLUMN `order_id` bigint NOT NULL COMMENT '鐢熶骇璁㈠崟id' AFTER `id`,
+ ADD INDEX `idx_order_id` (`order_id`);
+
+ALTER TABLE `process_route_item_param_instance`
+ ADD COLUMN `order_id` bigint NOT NULL COMMENT '鐢熶骇璁㈠崟id' AFTER `id`,
+ ADD INDEX `idx_order_id` (`order_id`);
+
+ALTER TABLE `product_structure_instance`
+ ADD COLUMN `order_id` bigint NOT NULL COMMENT '鐢熶骇璁㈠崟id' AFTER `id`,
+ ADD INDEX `idx_order_id` (`order_id`);
+
+ALTER TABLE `product-inventory-management-zsjc`.`product_order`
+ ADD COLUMN `strength` varchar(255) NULL COMMENT '浜у搧绫诲瀷' AFTER `plan_complete_time`;
CREATE TABLE `product-inventory-management-zsjc`.`sales_delivery` (
`id` int NOT NULL AUTO_INCREMENT,
@@ -401,3 +399,32 @@
`update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0),
PRIMARY KEY (`id`)
) COMMENT = '閿�鍞彂璐ф槑缁�(瀹滄惌)';
+
+
+ALTER TABLE product_process_param
+ DROP COLUMN param_id;
+
+ALTER TABLE product_process_param
+ ADD COLUMN `param_key` varchar(100) DEFAULT NULL COMMENT '鍙傛暟鍞竴鏍囪瘑',
+ ADD COLUMN `param_name` varchar(100) NOT NULL COMMENT '鍙傛暟鍚嶇О',
+ ADD COLUMN `param_type` tinyint NOT NULL COMMENT '鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)',
+ ADD COLUMN `param_format` varchar(255) DEFAULT NULL COMMENT '鍙傛暟鏍煎紡',
+ ADD COLUMN `value_mode` tinyint DEFAULT '1' COMMENT '鍊兼ā寮�(1鍗曞�� 2鍖洪棿)',
+ ADD COLUMN `unit` varchar(50) DEFAULT NULL COMMENT '鍗曚綅',
+ ADD COLUMN `remark` varchar(255) DEFAULT NULL COMMENT '澶囨敞';
+
+ALTER TABLE process_route_item_param
+ DROP COLUMN param_id;
+
+ALTER TABLE process_route_item_param
+ ADD COLUMN `param_key` varchar(100) DEFAULT NULL COMMENT '鍙傛暟鍞竴鏍囪瘑',
+ ADD COLUMN `param_name` varchar(100) NOT NULL COMMENT '鍙傛暟鍚嶇О',
+ ADD COLUMN `param_type` tinyint NOT NULL COMMENT '鍙傛暟绫诲瀷(1鏁板瓧 2鏂囨湰 3涓嬫媺閫夋嫨 4鏃堕棿)',
+ ADD COLUMN `param_format` varchar(255) DEFAULT NULL COMMENT '鍙傛暟鏍煎紡',
+ ADD COLUMN `value_mode` tinyint DEFAULT '1' COMMENT '鍊兼ā寮�(1鍗曞�� 2鍖洪棿)',
+ ADD COLUMN `unit` varchar(50) DEFAULT NULL COMMENT '鍗曚綅',
+ ADD COLUMN `remark` varchar(255) DEFAULT NULL COMMENT '澶囨敞';
+
+ALTER TABLE `product-inventory-management-zsjc`.`product_structure`
+ MODIFY COLUMN `unit_quantity` decimal(20, 15) NOT NULL COMMENT '鍗曚綅浜у嚭闇�瑕佹暟閲�' AFTER `process_id`,
+ MODIFY COLUMN `demanded_quantity` decimal(20, 15) NULL DEFAULT NULL COMMENT '闇�姹傛暟閲�' AFTER `unit_quantity`,
\ No newline at end of file
--
Gitblit v1.9.3