From ef1052e7bf9bf1765d61776bc49ce69a23c6cdee Mon Sep 17 00:00:00 2001 From: yuan <123@> Date: 星期二, 20 十月 2026 00:25:29 +0800 Subject: [PATCH] feat: 添加加班时长和加班工资字段到员工工资明细 --- sql/product-inventory-management-new-pro.sql | 33 ++++++++++++++++++++------------- 1 files changed, 20 insertions(+), 13 deletions(-) diff --git a/sql/product-inventory-management-new-pro.sql b/sql/product-inventory-management-new-pro.sql index 35c0008..8dc9b70 100644 --- a/sql/product-inventory-management-new-pro.sql +++ b/sql/product-inventory-management-new-pro.sql @@ -2705,7 +2705,7 @@ `product_model_id` bigint NOT NULL COMMENT '浜у搧瑙勬牸id', `technology_operation_id` bigint NULL DEFAULT NULL COMMENT '宸ュ簭id', `production_order_bom_id` bigint NULL DEFAULT NULL COMMENT '鐢熶骇璁㈠崟BOMid', - `unit_quantity` decimal(16, 4) NOT NULL COMMENT '鍗曚綅浜у嚭闇�瑕佹暟閲�', + `unit_quantity` decimal(20, 8) NOT NULL COMMENT '鍗曚綅浜у嚭闇�瑕佹暟閲�', `demanded_quantity` decimal(16, 4) NULL DEFAULT NULL COMMENT '闇�姹傛暟閲�', `unit` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鍗曚綅', `create_user` bigint NULL DEFAULT NULL COMMENT '鍒涘缓浜篒D', @@ -2815,7 +2815,7 @@ CREATE TABLE `production_order_pick` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭id', `product_model_id` int NULL DEFAULT NULL COMMENT '浜у搧瑙勬牸id', - `quantity` decimal(16, 2) NULL DEFAULT NULL COMMENT '鏁伴噺', + `quantity` decimal(20, 8) NULL DEFAULT NULL COMMENT '鏁伴噺', `batch_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鎵瑰彿', `create_time` timestamp NULL DEFAULT NULL, `update_time` timestamp NULL DEFAULT NULL COMMENT '鏇存柊鏃堕棿', @@ -2845,9 +2845,9 @@ `production_operation_task_id` bigint NULL DEFAULT 0 COMMENT '鐢熶骇宸ュ崟id', `product_model_id` int NULL DEFAULT NULL COMMENT '浜у搧瑙勬牸id', `batch_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鎵瑰彿', - `pick_quantity` decimal(16, 4) NULL DEFAULT NULL COMMENT '棰嗘枡鏁伴噺', - `before_quantity` decimal(16, 4) NULL DEFAULT NULL COMMENT '棰嗘枡鍓嶆暟閲�', - `after_quantity` decimal(16, 4) NULL DEFAULT NULL COMMENT '棰嗘枡鍚庡墿浣欐暟閲�', + `pick_quantity` decimal(20, 8) NULL DEFAULT NULL COMMENT '棰嗘枡鏁伴噺', + `before_quantity` decimal(20, 8) NULL DEFAULT NULL COMMENT '棰嗘枡鍓嶆暟閲�', + `after_quantity` decimal(20, 8) NULL DEFAULT NULL COMMENT '棰嗘枡鍚庡墿浣欐暟閲�', `pick_type` tinyint NULL DEFAULT 1 COMMENT '棰嗘枡绫诲瀷锛�1姝ｅ父棰嗘枡 2琛ユ枡', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '澶囨敞', `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿', @@ -4666,15 +4666,22 @@ `basic_salary` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '鍩烘湰宸ヨ祫', `piece_salary` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '璁′欢宸ヨ祫', `hourly_salary` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '璁℃椂宸ヨ祫', + `overtime_hours` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '鍔犵彮鏃堕暱锛堝皬鏃讹級', + `overtime_pay` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '鍔犵彮宸ヨ祫锛堟墜鍔ㄥ～鍐欙級', `other_income` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '鍏朵粬鏀跺叆', `social_personal` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '绀句繚涓汉', `fund_personal` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '鍏Н閲戜釜浜�', `other_deduct` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '鍏朵粬鏀嚭', `salary_tax` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '宸ヨ祫涓◣', `gross_salary` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '搴斿彂宸ヨ祫', - `deduct_salary` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '搴旀墸宸ヨ祫', + `deduct_salary` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '搴旀墸绀句繚', + `leave_count` int NULL DEFAULT 0 COMMENT '璇峰亣娆℃暟', + `absence_count` int NULL DEFAULT 0 COMMENT '缂哄嫟娆℃暟', + `late_count` int NULL DEFAULT 0 COMMENT '杩熷埌娆℃暟', + `early_count` int NULL DEFAULT 0 COMMENT '鏃╅��娆℃暟', + `manual_deduct` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '搴旀墸宸ヨ祫锛堟墜鍔ㄥ～鍐欙級', `net_salary` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '瀹炲彂宸ヨ祫', - `remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '澶囨敞', + `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '澶囨敞', `create_time` datetime NULL DEFAULT NULL COMMENT '鍒涘缓鏃堕棿', `create_user` bigint NULL DEFAULT NULL COMMENT '鍒涘缓鐢ㄦ埛', `update_time` datetime NULL DEFAULT NULL COMMENT '淇敼鏃堕棿', @@ -4763,7 +4770,7 @@ `id` int NOT NULL AUTO_INCREMENT, `inbound_batches` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鍏ュ簱鎵规', `batch_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鎵瑰彿', - `stock_in_num` decimal(16, 4) NULL DEFAULT NULL COMMENT '鍏ュ簱鏁伴噺', + `stock_in_num` decimal(20, 8) NULL DEFAULT NULL COMMENT '鍏ュ簱鏁伴噺', `record_id` int NULL DEFAULT NULL COMMENT '鍏ュ簱鏉ユ簮id', `record_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鍏ュ簱绫诲瀷', `product_model_id` int NULL DEFAULT NULL COMMENT '浜у搧瑙勬牸id', @@ -4788,11 +4795,11 @@ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭id', `product_model_id` int NULL DEFAULT NULL COMMENT '瑙勬牸id', `batch_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鎵瑰彿', - `qualitity` decimal(16, 4) NULL DEFAULT NULL COMMENT '鏁伴噺', + `qualitity` decimal(20, 8) NULL DEFAULT NULL COMMENT '鏁伴噺', `create_time` timestamp NULL DEFAULT NULL, `update_time` timestamp NULL DEFAULT NULL COMMENT '鏇存柊鏃堕棿', `version` int NULL DEFAULT NULL COMMENT '鐗堟湰鍙�', - `locked_quantity` decimal(16, 4) NULL DEFAULT 0.0000 COMMENT '琚鍗曢攣瀹氭暟閲�', + `locked_quantity` decimal(20, 8) NULL DEFAULT 0.00000000 COMMENT '琚鍗曢攣瀹氭暟閲�', `warn_num` decimal(16, 4) NULL DEFAULT NULL COMMENT '棰勮鏁伴噺', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '澶囨敞', `create_user` bigint NULL DEFAULT NULL COMMENT '鍒涘缓浜篒D', @@ -4808,7 +4815,7 @@ `id` int NOT NULL AUTO_INCREMENT, `outbound_batches` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鍏ュ簱鎵规', `batch_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鎵瑰彿', - `stock_out_num` decimal(16, 4) NULL DEFAULT NULL COMMENT '鍏ュ簱鏁伴噺', + `stock_out_num` decimal(20, 8) NULL DEFAULT NULL COMMENT '鍏ュ簱鏁伴噺', `record_id` int NULL DEFAULT NULL COMMENT '鍏ュ簱鏉ユ簮id', `record_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鍏ュ簱绫诲瀷', `product_model_id` int NULL DEFAULT NULL COMMENT '浜у搧瑙勬牸id', @@ -4831,7 +4838,7 @@ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '涓婚敭id', `product_model_id` int NULL DEFAULT NULL COMMENT '瑙勬牸id', `batch_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鎵瑰彿', - `qualitity` decimal(16, 4) NULL DEFAULT NULL COMMENT '鏁伴噺', + `qualitity` decimal(20, 8) NULL DEFAULT NULL COMMENT '鏁伴噺', `create_time` timestamp NULL DEFAULT NULL, `update_time` timestamp NULL DEFAULT NULL COMMENT '鏇存柊鏃堕棿', `version` int NULL DEFAULT NULL COMMENT '鐗堟湰鍙�', @@ -5302,7 +5309,7 @@ `parent_id` bigint NULL DEFAULT NULL COMMENT '鐖惰妭鐐笽D', `product_model_id` bigint NOT NULL COMMENT '浜у搧id', `operation_id` bigint NULL DEFAULT NULL COMMENT '宸ュ簭id', - `unit_quantity` decimal(16, 4) NOT NULL COMMENT '鍗曚綅浜у嚭闇�瑕佹暟閲�', + `unit_quantity` decimal(20, 8) NOT NULL COMMENT '鍗曚綅浜у嚭闇�瑕佹暟閲�', `demanded_quantity` decimal(16, 4) NULL DEFAULT NULL COMMENT '闇�姹傛暟閲�', `unit` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '鍗曚綅', `bom_id` bigint NOT NULL COMMENT 'bom鐨刬d', -- Gitblit v1.9.3