From 1967ffe95e9770e1f97abfee0ef72ea2983ecb64 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 12 三月 2026 16:48:14 +0800
Subject: [PATCH] 1
---
version/db/cv.sql | 140 ++++++++++++++++++++++++++++++++++++++++++++++
zy-acs-cv/src/main/java/com/zy/asrs/entity/Job.java | 2
zy-acs-cv/src/main/resources/mapper/JobMapper.xml | 4
zy-acs-gateway/pom.xml | 2
4 files changed, 144 insertions(+), 4 deletions(-)
diff --git a/version/db/cv.sql b/version/db/cv.sql
new file mode 100644
index 0000000..f7fd3b8
--- /dev/null
+++ b/version/db/cv.sql
@@ -0,0 +1,140 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server : dockerMySql
+ Source Server Type : MySQL
+ Source Server Version : 50744
+ Source Host : 127.0.0.1:3306
+ Source Schema : cv
+
+ Target Server Type : MySQL
+ Target Server Version : 50744
+ File Encoding : 65001
+
+ Date: 12/03/2026 16:47:49
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for cv_devp
+-- ----------------------------
+DROP TABLE IF EXISTS `cv_devp`;
+CREATE TABLE `cv_devp` (
+ `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 '鍙嚭',
+ `autoing` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '鑷姩',
+ `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(11) NULL DEFAULT NULL COMMENT '宸ヤ綔鍙�',
+ `barcode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci 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(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 = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '璁惧琛�' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of cv_devp
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for cv_job
+-- ----------------------------
+DROP TABLE IF EXISTS `cv_job`;
+CREATE TABLE `cv_job` (
+ `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 '鎵规鍙�',
+ `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(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(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(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;
+
+-- ----------------------------
+-- Records of cv_job
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for cv_job_log
+-- ----------------------------
+DROP TABLE IF EXISTS `cv_job_log`;
+CREATE TABLE `cv_job_log` (
+ `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 '鎵规鍙�',
+ `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(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(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(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;
+
+-- ----------------------------
+-- Records of cv_job_log
+-- ----------------------------
+
+-- ----------------------------
+-- Table structure for cv_work_lastno
+-- ----------------------------
+DROP TABLE IF EXISTS `cv_work_lastno`;
+CREATE TABLE `cv_work_lastno` (
+ `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(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;
+
+-- ----------------------------
+-- Records of cv_work_lastno
+-- ----------------------------
+INSERT INTO `cv_work_lastno` VALUES (1, 1, 1, 1, 8999, 1, 0, NULL, NULL, NULL, NULL, NULL, NULL);
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/entity/Job.java b/zy-acs-cv/src/main/java/com/zy/asrs/entity/Job.java
index 055f4ef..9c4e82d 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/entity/Job.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/entity/Job.java
@@ -107,7 +107,7 @@
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value = "娣诲姞鏃堕棿")
- private Date createTime;
+ private Date createTime = new Date();
/**
* 淇敼浜哄憳
diff --git a/zy-acs-cv/src/main/resources/mapper/JobMapper.xml b/zy-acs-cv/src/main/resources/mapper/JobMapper.xml
index 79235ed..4ba70b7 100644
--- a/zy-acs-cv/src/main/resources/mapper/JobMapper.xml
+++ b/zy-acs-cv/src/main/resources/mapper/JobMapper.xml
@@ -76,7 +76,7 @@
select *
from cv_job
where job_sts = #{jobSts}
- and DATEDIFF(NOW(), #{day}) > 1
+ and DATEDIFF(NOW(), create_time) > #{day}
</select>
@@ -84,6 +84,6 @@
select *
from cv_job
where job_sts = #{jobSts}
- and DATEDIFF(NOW(), #{day}) > 1
+ and DATEDIFF(NOW(),create_time ) > #{day}
</select>
</mapper>
diff --git a/zy-acs-gateway/pom.xml b/zy-acs-gateway/pom.xml
index 7400551..e522da8 100644
--- a/zy-acs-gateway/pom.xml
+++ b/zy-acs-gateway/pom.xml
@@ -5,7 +5,7 @@
<artifactId>acs-gateway</artifactId>
<version>1.0.0</version>
- <packaging>jar</packaging>
+ <packaging>war</packaging>
<name>gateway</name>
--
Gitblit v1.9.1