From 14f2c4fce50c871d84f89d2dca2298e0892b4672 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期二, 05 五月 2026 08:25:26 +0800 Subject: [PATCH] Merge branch 'rcs_master_1.0' into rcs_master_all --- version/db/cv.sql | 85 ++++++++++++++++++++---------------------- 1 files changed, 41 insertions(+), 44 deletions(-) diff --git a/version/db/cv.sql b/version/db/cv.sql index 84923d4..7fbb1c8 100644 --- a/version/db/cv.sql +++ b/version/db/cv.sql @@ -3,15 +3,15 @@ Source Server : dockerMySql Source Server Type : MySQL - Source Server Version : 80045 + Source Server Version : 50744 Source Host : 127.0.0.1:3306 Source Schema : cv Target Server Type : MySQL - Target Server Version : 80045 + Target Server Version : 50744 File Encoding : 65001 - Date: 17/04/2026 10:22:39 + Date: 12/03/2026 16:50:09 */ SET NAMES utf8mb4; @@ -22,8 +22,8 @@ -- ---------------------------- DROP TABLE IF EXISTS `cv_devp`; CREATE TABLE `cv_devp` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', - `dev_no` int NULL DEFAULT NULL COMMENT '缂栧彿', + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', + `dev_no` int(11) NULL DEFAULT NULL COMMENT '缂栧彿', `dec_desc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '璁惧鎻忚堪', `in_enable` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '鍙叆', `out_enable` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '鍙嚭', @@ -31,19 +31,19 @@ `loading` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '鏈夌墿', `canining` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '鑳藉叆', `canouting` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '鑳藉嚭', - `wrk_no` int NULL DEFAULT NULL COMMENT '宸ヤ綔鍙�', + `wrk_no` int(11) NULL DEFAULT NULL COMMENT '宸ヤ綔鍙�', `barcode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '鏉″舰鐮�', - `loc_type` smallint NULL DEFAULT NULL COMMENT '搴撲綅绫诲瀷', - `status` int NULL DEFAULT NULL COMMENT '鐘舵�� 1:姝ｅ父 0:鍐荤粨', - `deleted` int NULL DEFAULT NULL COMMENT '鏄惁鍒犻櫎 1:鏄� 0:鍚�', - `tenant_id` bigint NULL DEFAULT NULL COMMENT '绉熸埛', - `create_by` bigint NULL DEFAULT NULL COMMENT '娣诲姞浜哄憳', + `loc_type` smallint(6) NULL DEFAULT NULL COMMENT '搴撲綅绫诲瀷', + `status` int(11) NULL DEFAULT NULL COMMENT '鐘舵�� 1:姝ｅ父 0:鍐荤粨', + `deleted` int(11) NULL DEFAULT NULL COMMENT '鏄惁鍒犻櫎 1:鏄� 0:鍚�', + `tenant_id` bigint(20) NULL DEFAULT NULL COMMENT '绉熸埛', + `create_by` bigint(20) NULL DEFAULT NULL COMMENT '娣诲姞浜哄憳', `create_time` datetime NULL DEFAULT NULL COMMENT '娣诲姞鏃堕棿', - `update_by` bigint NULL DEFAULT NULL COMMENT '淇敼浜哄憳', + `update_by` bigint(20) NULL DEFAULT NULL COMMENT '淇敼浜哄憳', `update_time` datetime NULL DEFAULT NULL COMMENT '淇敼鏃堕棿', `memo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '澶囨敞', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '璁惧琛�' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '璁惧琛�' ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of cv_devp @@ -54,28 +54,27 @@ -- ---------------------------- DROP TABLE IF EXISTS `cv_job`; CREATE TABLE `cv_job` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', `task_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浠诲姟鍙�', `barcode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '鏉″舰鐮�', `batch_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '鎵规鍙�', - `full` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '鏄惁婊℃澘', `sta_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '绔欑偣鍙�', `loc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '搴撲綅鍙�', - `job_no` int NULL DEFAULT NULL COMMENT '宸ヤ綔鍙�', - `job_sts` int NULL DEFAULT NULL COMMENT '宸ヤ綔鐘舵��', + `job_no` int(11) NULL DEFAULT NULL COMMENT '宸ヤ綔鍙�', + `job_sts` int(11) NULL DEFAULT NULL COMMENT '宸ヤ綔鐘舵��', `start_time` datetime NULL DEFAULT NULL COMMENT '寮�濮嬫椂闂�', `wms_time` datetime NULL DEFAULT NULL COMMENT '鍏ュ簱鏃堕棿', `rcs_time` datetime NULL DEFAULT NULL COMMENT '浠诲姟鍙戠敓鏃堕棿', - `status` int NULL DEFAULT NULL COMMENT '鐘舵�� 1:姝ｅ父 0:鍐荤粨', - `deleted` int NULL DEFAULT NULL COMMENT '鏄惁鍒犻櫎 1:鏄� 0:鍚�', - `tenant_id` bigint NULL DEFAULT NULL COMMENT '绉熸埛', - `create_by` bigint NULL DEFAULT NULL COMMENT '娣诲姞浜哄憳', + `status` int(11) NULL DEFAULT NULL COMMENT '鐘舵�� 1:姝ｅ父 0:鍐荤粨', + `deleted` int(11) NULL DEFAULT NULL COMMENT '鏄惁鍒犻櫎 1:鏄� 0:鍚�', + `tenant_id` bigint(20) NULL DEFAULT NULL COMMENT '绉熸埛', + `create_by` bigint(20) NULL DEFAULT NULL COMMENT '娣诲姞浜哄憳', `create_time` datetime NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '娣诲姞鏃堕棿', - `update_by` bigint NULL DEFAULT NULL COMMENT '淇敼浜哄憳', + `update_by` bigint(20) NULL DEFAULT NULL COMMENT '淇敼浜哄憳', `update_time` datetime NULL DEFAULT NULL COMMENT '淇敼鏃堕棿', `memo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '澶囨敞', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '浠诲姟琛�' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '浠诲姟琛�' ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of cv_job @@ -86,24 +85,23 @@ -- ---------------------------- DROP TABLE IF EXISTS `cv_job_log`; CREATE TABLE `cv_job_log` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', `task_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浠诲姟鍙�', `barcode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '鏉″舰鐮�', `batch_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '鎵规鍙�', - `full` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '鏄惁婊℃澘', `sta_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '绔欑偣鍙�', `loc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '搴撲綅鍙�', - `job_no` int NULL DEFAULT NULL COMMENT '宸ヤ綔鍙�', - `job_sts` int NULL DEFAULT NULL COMMENT '宸ヤ綔鐘舵��', + `job_no` int(11) NULL DEFAULT NULL COMMENT '宸ヤ綔鍙�', + `job_sts` int(11) NULL DEFAULT NULL COMMENT '宸ヤ綔鐘舵��', `start_time` datetime NULL DEFAULT NULL COMMENT '寮�濮嬫椂闂�', `wms_time` datetime NULL DEFAULT NULL COMMENT '鍏ュ簱鏃堕棿', `rcs_time` datetime NULL DEFAULT NULL COMMENT '浠诲姟鍙戠敓鏃堕棿', - `status` int NULL DEFAULT NULL COMMENT '鐘舵�� 1:姝ｅ父 0:鍐荤粨', - `deleted` int NULL DEFAULT NULL COMMENT '鏄惁鍒犻櫎 1:鏄� 0:鍚�', - `tenant_id` bigint NULL DEFAULT NULL COMMENT '绉熸埛', - `create_by` bigint NULL DEFAULT NULL COMMENT '娣诲姞浜哄憳', + `status` int(11) NULL DEFAULT NULL COMMENT '鐘舵�� 1:姝ｅ父 0:鍐荤粨', + `deleted` int(11) NULL DEFAULT NULL COMMENT '鏄惁鍒犻櫎 1:鏄� 0:鍚�', + `tenant_id` bigint(20) NULL DEFAULT NULL COMMENT '绉熸埛', + `create_by` bigint(20) NULL DEFAULT NULL COMMENT '娣诲姞浜哄憳', `create_time` datetime NULL DEFAULT NULL COMMENT '娣诲姞鏃堕棿', - `update_by` bigint NULL DEFAULT NULL COMMENT '淇敼浜哄憳', + `update_by` bigint(20) NULL DEFAULT NULL COMMENT '淇敼浜哄憳', `update_time` datetime NULL DEFAULT NULL COMMENT '淇敼鏃堕棿', `memo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '澶囨敞', PRIMARY KEY (`id`) USING BTREE @@ -118,17 +116,17 @@ -- ---------------------------- DROP TABLE IF EXISTS `cv_work_lastno`; CREATE TABLE `cv_work_lastno` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', - `type` int NULL DEFAULT NULL COMMENT '绫诲瀷', - `wrk_no` int NULL DEFAULT NULL COMMENT '褰撳墠宸ヤ綔鍙�', - `s_no` int NULL DEFAULT NULL COMMENT '璧峰ID', - `e_no` int NULL DEFAULT NULL COMMENT '缁堟ID', - `status` int NULL DEFAULT NULL COMMENT '鐘舵�� 1:姝ｅ父 0:鍐荤粨', - `deleted` int NULL DEFAULT NULL COMMENT '鏄惁鍒犻櫎 1:鏄� 0:鍚�', - `tenant_id` bigint NULL DEFAULT NULL COMMENT '绉熸埛', - `create_by` bigint NULL DEFAULT NULL COMMENT '娣诲姞浜哄憳', + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', + `type` int(11) NULL DEFAULT NULL COMMENT '绫诲瀷', + `wrk_no` int(11) NULL DEFAULT NULL COMMENT '褰撳墠宸ヤ綔鍙�', + `s_no` int(11) NULL DEFAULT NULL COMMENT '璧峰ID', + `e_no` int(11) NULL DEFAULT NULL COMMENT '缁堟ID', + `status` int(11) NULL DEFAULT NULL COMMENT '鐘舵�� 1:姝ｅ父 0:鍐荤粨', + `deleted` int(11) NULL DEFAULT NULL COMMENT '鏄惁鍒犻櫎 1:鏄� 0:鍚�', + `tenant_id` bigint(20) NULL DEFAULT NULL COMMENT '绉熸埛', + `create_by` bigint(20) NULL DEFAULT NULL COMMENT '娣诲姞浜哄憳', `create_time` datetime NULL DEFAULT NULL COMMENT '娣诲姞鏃堕棿', - `update_by` bigint NULL DEFAULT NULL COMMENT '淇敼浜哄憳', + `update_by` bigint(20) NULL DEFAULT NULL COMMENT '淇敼浜哄憳', `update_time` datetime NULL DEFAULT NULL COMMENT '淇敼鏃堕棿', `memo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '澶囨敞', PRIMARY KEY (`id`) USING BTREE @@ -137,7 +135,6 @@ -- ---------------------------- -- Records of cv_work_lastno -- ---------------------------- -INSERT INTO `cv_work_lastno` VALUES (1, 1, 1, 1, 15000, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `cv_work_lastno` VALUES (2, 2, 15001, 15001, 30000, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `cv_work_lastno` VALUES (1, 1, 1, 1, 8999, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL); SET FOREIGN_KEY_CHECKS = 1; -- Gitblit v1.9.1