From 44840942aba889088a86d2b3d93856530bb2dc25 Mon Sep 17 00:00:00 2001 From: hsy <1029150275@qq.com> Date: 星期二, 25 八月 2026 16:51:29 +0800 Subject: [PATCH] Merge branch 'dev_business' into fix/hsy/20260811 --- docs/projectSql/ruoyi-vue-pro.sql | 119 +++++++++++++++++++++++++++++++---------------------------- 1 files changed, 63 insertions(+), 56 deletions(-) diff --git a/docs/projectSql/ruoyi-vue-pro.sql b/docs/projectSql/ruoyi-vue-pro.sql index baaafbc..1a34cf4 100644 --- a/docs/projectSql/ruoyi-vue-pro.sql +++ b/docs/projectSql/ruoyi-vue-pro.sql @@ -4903,7 +4903,9 @@ `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '缁撴瀯鍚嶇О', `base_salary` decimal(12, 2) NOT NULL COMMENT '鍩烘湰宸ヨ祫', `performance_ratio` decimal(4, 2) NULL DEFAULT 0.00 COMMENT '缁╂晥宸ヨ祫鍗犳瘮锛�%锛�', - `overtime_pay_ratio` decimal(4, 2) NULL DEFAULT 1.50 COMMENT '鍔犵彮宸ヨ祫鍊嶇巼', + `overtime_pay_ratio` decimal(4, 2) NULL DEFAULT 1.50 COMMENT '宸ヤ綔鏃ュ姞鐝伐璧勫�嶇巼', + `rest_day_overtime_pay_ratio` decimal(4, 2) NULL DEFAULT 2.00 COMMENT '浼戞伅鏃ュ姞鐝伐璧勫�嶇巼', + `legal_holiday_overtime_pay_ratio` decimal(4, 2) NULL DEFAULT 3.00 COMMENT '娉曞畾鑺傚亣鏃ュ姞鐝伐璧勫�嶇巼', `social_security_base` decimal(12, 2) NULL DEFAULT NULL COMMENT '绀句繚鍩烘暟', `housing_fund_base` decimal(12, 2) NULL DEFAULT NULL COMMENT '鍏Н閲戝熀鏁�', `status` tinyint NOT NULL DEFAULT 0 COMMENT '鐘舵�侊細0-鍚敤锛�1-绂佺敤', @@ -7931,40 +7933,41 @@ -- Table structure for mes_pro_feedback -- ---------------------------- DROP TABLE IF EXISTS `mes_pro_feedback`; -CREATE TABLE `mes_pro_feedback` ( +CREATE TABLE `mes_pro_feedback` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿', - `code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '鎶ュ伐鍗曠紪鍙�', - `type` int NULL DEFAULT NULL COMMENT '鎶ュ伐绫诲瀷', - `channel` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '鎶ュ伐閫斿緞', - `feedback_time` datetime NULL DEFAULT NULL COMMENT '鎶ュ伐鏃堕棿', - `workstation_id` bigint NULL DEFAULT NULL COMMENT '宸ヤ綔绔欑紪鍙�', - `route_id` bigint NULL DEFAULT NULL COMMENT '宸ヨ壓璺嚎缂栧彿', - `process_id` bigint NULL DEFAULT NULL COMMENT '宸ュ簭缂栧彿', - `work_order_id` bigint NULL DEFAULT NULL COMMENT '鐢熶骇宸ュ崟缂栧彿', - `task_id` bigint NULL DEFAULT NULL COMMENT '鐢熶骇浠诲姟缂栧彿', - `item_id` bigint NULL DEFAULT NULL COMMENT '浜у搧鐗╂枡缂栧彿', - `expire_date` datetime NULL DEFAULT NULL COMMENT '杩囨湡鏃ユ湡', - `lot_number` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '鐢熶骇鎵瑰彿', - `scheduled_quantity` decimal(24, 6) NULL DEFAULT NULL COMMENT '鎺掍骇鏁伴噺', - `feedback_quantity` decimal(24, 6) NULL DEFAULT NULL COMMENT '鏈鎶ュ伐鏁伴噺', - `qualified_quantity` decimal(24, 6) NULL DEFAULT NULL COMMENT '鍚堟牸鍝佹暟閲�', - `unqualified_quantity` decimal(24, 6) NULL DEFAULT NULL COMMENT '涓嶈壇鍝佹暟閲�', - `uncheck_quantity` decimal(24, 6) NULL DEFAULT NULL COMMENT '寰呮娴嬫暟閲�', - `labor_scrap_quantity` decimal(24, 6) NULL DEFAULT NULL COMMENT '宸ュ簾鏁伴噺', - `material_scrap_quantity` decimal(24, 6) NULL DEFAULT NULL COMMENT '鏂欏簾鏁伴噺', - `other_scrap_quantity` decimal(24, 6) NULL DEFAULT NULL COMMENT '鍏朵粬搴熷搧鏁伴噺', - `feedback_user_id` bigint NULL DEFAULT NULL COMMENT '鎶ュ伐鐢ㄦ埛缂栧彿', - `approve_user_id` bigint NULL DEFAULT NULL COMMENT '瀹℃牳鐢ㄦ埛缂栧彿', - `status` int NULL DEFAULT NULL COMMENT '鐘舵��', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '澶囨敞', - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '鍒涘缓鑰�', + `code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鎶ュ伐鍗曠紪鍙�', + `type` int DEFAULT NULL COMMENT '鎶ュ伐绫诲瀷', + `channel` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鎶ュ伐閫斿緞', + `feedback_time` datetime DEFAULT NULL COMMENT '鎶ュ伐鏃堕棿', + `workstation_id` bigint DEFAULT NULL COMMENT '宸ヤ綔绔欑紪鍙�', + `route_id` bigint DEFAULT NULL COMMENT '宸ヨ壓璺嚎缂栧彿', + `process_id` bigint DEFAULT NULL COMMENT '宸ュ簭缂栧彿', + `work_order_id` bigint DEFAULT NULL COMMENT '鐢熶骇宸ュ崟缂栧彿', + `task_id` bigint DEFAULT NULL COMMENT '鐢熶骇浠诲姟缂栧彿', + `item_id` bigint DEFAULT NULL COMMENT '浜у搧鐗╂枡缂栧彿', + `expire_date` datetime DEFAULT NULL COMMENT '杩囨湡鏃ユ湡', + `lot_number` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鐢熶骇鎵瑰彿', + `scheduled_quantity` decimal(24,6) DEFAULT NULL COMMENT '鎺掍骇鏁伴噺', + `feedback_quantity` decimal(24,6) DEFAULT NULL COMMENT '鏈鎶ュ伐鏁伴噺', + `qualified_quantity` decimal(24,6) DEFAULT NULL COMMENT '鍚堟牸鍝佹暟閲�', + `unqualified_quantity` decimal(24,6) DEFAULT NULL COMMENT '涓嶈壇鍝佹暟閲�', + `uncheck_quantity` decimal(24,6) DEFAULT NULL COMMENT '寰呮娴嬫暟閲�', + `labor_scrap_quantity` decimal(24,6) DEFAULT NULL COMMENT '宸ュ簾鏁伴噺', + `material_scrap_quantity` decimal(24,6) DEFAULT NULL COMMENT '鏂欏簾鏁伴噺', + `other_scrap_quantity` decimal(24,6) DEFAULT NULL COMMENT '鍏朵粬搴熷搧鏁伴噺', + `feedback_user_id` bigint DEFAULT NULL COMMENT '鎶ュ伐鐢ㄦ埛缂栧彿', + `approve_user_id` bigint DEFAULT NULL COMMENT '瀹℃牳鐢ㄦ埛缂栧彿', + `status` int DEFAULT NULL COMMENT '鐘舵��', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '澶囨敞', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�', `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿', - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '鏇存柊鑰�', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鏇存柊鑰�', `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿', `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'MES 鐢熶骇鎶ュ伐' ROW_FORMAT = Dynamic; - + `process_instance_id` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'BPM 娴佺▼瀹炰緥缂栧彿', + `process_definition_key` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'BPM 娴佺▼瀹氫箟 Key', + PRIMARY KEY (`id`) USING BTREE, +) ENGINE=InnoDB AUTO_INCREMENT=79 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='MES 鐢熶骇鎶ュ伐'; -- ---------------------------- -- Records of mes_pro_feedback -- ---------------------------- @@ -8218,36 +8221,40 @@ -- Table structure for mes_pro_work_order -- ---------------------------- DROP TABLE IF EXISTS `mes_pro_work_order`; -CREATE TABLE `mes_pro_work_order` ( +CREATE TABLE `mes_pro_work_order` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿', - `code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '宸ュ崟缂栫爜', - `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '宸ュ崟鍚嶇О', - `type` int NULL DEFAULT NULL COMMENT '宸ュ崟绫诲瀷', - `order_source_type` int NULL DEFAULT NULL COMMENT '鏉ユ簮绫诲瀷', - `order_source_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '鏉ユ簮鍗曟嵁缂栧彿', - `product_id` bigint NULL DEFAULT NULL COMMENT '浜у搧缂栧彿', - `quantity` decimal(24, 6) NULL DEFAULT NULL COMMENT '鐢熶骇鏁伴噺', - `quantity_produced` decimal(24, 6) NULL DEFAULT NULL COMMENT '宸茬敓浜ф暟閲�', - `quantity_changed` decimal(24, 6) NULL DEFAULT NULL COMMENT '璋冩暣鏁伴噺', - `quantity_scheduled` decimal(24, 6) NULL DEFAULT NULL COMMENT '宸叉帓浜ф暟閲�', - `client_id` bigint NULL DEFAULT NULL COMMENT '瀹㈡埛缂栧彿', - `vendor_id` bigint NULL DEFAULT NULL COMMENT '渚涘簲鍟嗙紪鍙�', - `batch_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '鎵规鍙�', - `request_date` datetime NULL DEFAULT NULL COMMENT '闇�姹傛棩鏈�', - `parent_id` bigint NULL DEFAULT NULL COMMENT '鐖跺伐鍗曠紪鍙�', - `finish_date` datetime NULL DEFAULT NULL COMMENT '瀹屾垚鏃堕棿', - `cancel_date` datetime NULL DEFAULT NULL COMMENT '鍙栨秷鏃堕棿', - `status` int NULL DEFAULT NULL COMMENT '宸ュ崟鐘舵��', - `process_instance_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'BPM 娴佺▼瀹炰緥缂栧彿', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '澶囨敞', - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '鍒涘缓鑰�', + `code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '宸ュ崟缂栫爜', + `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '宸ュ崟鍚嶇О', + `type` int DEFAULT NULL COMMENT '宸ュ崟绫诲瀷', + `order_source_type` int DEFAULT NULL COMMENT '鏉ユ簮绫诲瀷', + `order_source_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鏉ユ簮鍗曟嵁缂栧彿', + `product_id` bigint DEFAULT NULL COMMENT '浜у搧缂栧彿', + `quantity` decimal(24,6) DEFAULT NULL COMMENT '鐢熶骇鏁伴噺', + `quantity_produced` decimal(24,6) DEFAULT NULL COMMENT '宸茬敓浜ф暟閲�', + `quantity_changed` decimal(24,6) DEFAULT NULL COMMENT '璋冩暣鏁伴噺', + `quantity_scheduled` decimal(24,6) DEFAULT NULL COMMENT '宸叉帓浜ф暟閲�', + `client_id` bigint DEFAULT NULL COMMENT '瀹㈡埛缂栧彿', + `vendor_id` bigint DEFAULT NULL COMMENT '渚涘簲鍟嗙紪鍙�', + `batch_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鎵规鍙�', + `route_id` bigint DEFAULT NULL COMMENT '宸ヨ壓璺嚎缂栧彿', + `auto_finish_flag` tinyint(1) DEFAULT '1' COMMENT '鏄惁鑷姩瀹屾垚', + `request_date` datetime DEFAULT NULL COMMENT '闇�姹傛棩鏈�', + `parent_id` bigint DEFAULT NULL COMMENT '鐖跺伐鍗曠紪鍙�', + `finish_date` datetime DEFAULT NULL COMMENT '瀹屾垚鏃堕棿', + `cancel_date` datetime DEFAULT NULL COMMENT '鍙栨秷鏃堕棿', + `status` int DEFAULT NULL COMMENT '宸ュ崟鐘舵��', + `process_instance_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'BPM 娴佺▼瀹炰緥缂栧彿', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '澶囨敞', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鍒涘缓鑰�', `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿', - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '鏇存柊鑰�', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '鏇存柊鑰�', `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿', `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎', + `is_feedback_approve` tinyint(1) DEFAULT NULL COMMENT '鏄惁寮�鍚姤宸ュ鎵� (1: 寮�鍚�, 0/NULL: 鍏抽棴)', + `process_definition_key` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'BPM 娴佺▼瀹氫箟 Key', + `feedback_role` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '鎶ュ伐瑙掕壊 (澶氫釜瑙掕壊浠ラ�楀彿鍒嗛殧)', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'MES 鐢熶骇宸ュ崟' ROW_FORMAT = Dynamic; - +) ENGINE=InnoDB AUTO_INCREMENT=62 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='MES 鐢熶骇宸ュ崟'; -- ---------------------------- -- Records of mes_pro_work_order -- ---------------------------- -- Gitblit v1.9.3