From 0b257f3087f97662c4ec1628bf7bb0eceb263ef1 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 16 May 2024 17:33:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=91=E7=A5=A8=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoOrderController.java | 5 +- .../glxp/api/entity/inout/IoOrderEntity.java | 2 + .../glxp/api/res/inout/IoOrderResponse.java | 1 + .../inout/impl/IoOrderServiceImpl.java | 4 - src/main/resources/schemas/schema_v2.4.sql | 204 ++++++++++-------- 5 files changed, 124 insertions(+), 92 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 82732b7a8..b9e57927d 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -1007,13 +1007,16 @@ public class IoOrderController extends BaseController { ioOrderEntity.setUpdateTime(new Date()); ioOrderEntity.setUpdateUser(getUserId() + ""); ioOrderEntity.setConfirmUser(getUserId() + ""); - orderService.updateByBillNo(ioOrderEntity); if (IntUtil.value(ioOrderEntity.getCheckStatus()) != 0) { + ioOrderEntity.setConfirmTime(new Date()); + orderService.updateByBillNo(ioOrderEntity); IoOrderEntity orderEntity = new IoOrderEntity(); orderEntity.setBillNo(ioOrderEntity.getBillNo()); orderEntity.setCheckStatus(1); spGetHttpClient.updateCheckStatus(orderEntity, getUserId() + ""); + } else { + orderService.updateByBillNo(ioOrderEntity); } return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index 2df941b8b..9b417b8d6 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java @@ -201,6 +201,8 @@ public class IoOrderEntity { @TableField(value = "confirmUser") private String confirmUser; + @TableField(value = "confirmTime") + private Date confirmTime; /** diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index b5fd04147..9f7d9a2d8 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -230,6 +230,7 @@ public class IoOrderResponse { private Date checkTime; private String checkUserName; private String confirmUser; + private Date confirmTime; //总金额 private BigDecimal allAmount; private Integer confirmStatus; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 11710f709..224b40ba8 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -80,10 +80,6 @@ public class IoOrderServiceImpl implements IoOrderService { @Resource IBasicBussinessTypeService basicBussinessTypeService; @Resource - InvPreinOrderService preinOrderService; - @Resource - InvPreinDetailService preinDetailService; - @Resource InvProductDetailService invProductDetailService; @Resource InvProductService invProductService; diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 558e47660..db898d4fe 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -3144,11 +3144,20 @@ CALL Pro_Temp_ColumnWork('pur_contract', 'pageType', 1); -CALL Pro_Temp_ColumnWork('device_info', 'purApplyBillNo','varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT''申购订单单据号''', 1); -CALL Pro_Temp_ColumnWork('device_info', 'purOrderBillNo','varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT''采购订单单据号''', 1); -CALL Pro_Temp_ColumnWork('device_info', 'purContractBillNo','varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT''采购合同单据号''', 1); -CALL Pro_Temp_ColumnWork('device_info', 'purPlanBillNo','varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT''采购计划单据号''', 1); -CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'devInType',' int NOT NULL DEFAULT b''0'' COMMENT ''是否设备入库 ：0：未启用；2.启用''', 1); +CALL Pro_Temp_ColumnWork('device_info', 'purApplyBillNo', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT''申购订单单据号''', + 1); +CALL Pro_Temp_ColumnWork('device_info', 'purOrderBillNo', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT''采购订单单据号''', + 1); +CALL Pro_Temp_ColumnWork('device_info', 'purContractBillNo', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT''采购合同单据号''', + 1); +CALL Pro_Temp_ColumnWork('device_info', 'purPlanBillNo', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs NOT NULL COMMENT''采购计划单据号''', + 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'devInType', + ' int NOT NULL DEFAULT b''0'' COMMENT ''是否设备入库 ：0：未启用；2.启用''', 1); CALL Pro_Temp_ColumnWork('io_order', 'purOrderId', ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''采购订单单号''', @@ -3224,8 +3233,6 @@ CALL Pro_Temp_ColumnWork('sync_data_set', 'deviceRepair', - - CALL Pro_Temp_ColumnWork('device_repair', 'repairDescription', ' varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修内容''', 1); @@ -3238,83 +3245,95 @@ CALL Pro_Temp_ColumnWork('sync_data_set', 'produceBusiness', -- ---------------------------- -- Table structure for device_upkeep -- ---------------------------- -CREATE TABLE IF NOT EXISTS `device_upkeep` ( - `taskId` bigint(0) NOT NULL COMMENT '保养任务id', - `planId` bigint(0) NULL DEFAULT NULL COMMENT '计划id', - `planName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '计划名称', - `chargeDeptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '负责部门编码', - `upkeepUserId` bigint(0) NULL DEFAULT NULL COMMENT '保养人id', - `upkeepUserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '保养人姓名', - `upkeepUserPhone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '保养人电话', - `deviceCount` int(0) NOT NULL COMMENT '设备数量', - `finishCount` int(0) NOT NULL DEFAULT 0 COMMENT '完成设备数量', - `exceptionCount` int(0) NOT NULL DEFAULT 0 COMMENT '异常数量', - `finishTime` datetime(0) NULL DEFAULT NULL COMMENT '完成时间', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '任务名称', - `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '任务备注', - `sysFlag` bit(1) NOT NULL COMMENT '是否系统创建 1/true 是 0/false 否', - `finishFlag` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否已完成', - `createTime` datetime(0) NOT NULL COMMENT '创建时间', - `createUserId` bigint(0) NULL DEFAULT NULL COMMENT '创建人id', - `createUserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人姓名', - `updateTime` datetime(0) NULL DEFAULT NULL, - PRIMARY KEY (`taskId`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '保养任务表' ROW_FORMAT = Dynamic; +CREATE TABLE IF NOT EXISTS `device_upkeep` +( + `taskId` bigint(0) NOT NULL COMMENT '保养任务id', + `planId` bigint(0) NULL DEFAULT NULL COMMENT '计划id', + `planName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '计划名称', + `chargeDeptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '负责部门编码', + `upkeepUserId` bigint(0) NULL DEFAULT NULL COMMENT '保养人id', + `upkeepUserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '保养人姓名', + `upkeepUserPhone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '保养人电话', + `deviceCount` int(0) NOT NULL COMMENT '设备数量', + `finishCount` int(0) NOT NULL DEFAULT 0 COMMENT '完成设备数量', + `exceptionCount` int(0) NOT NULL DEFAULT 0 COMMENT '异常数量', + `finishTime` datetime(0) NULL DEFAULT NULL COMMENT '完成时间', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '任务名称', + `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '任务备注', + `sysFlag` bit(1) NOT NULL COMMENT '是否系统创建 1/true 是 0/false 否', + `finishFlag` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否已完成', + `createTime` datetime(0) NOT NULL COMMENT '创建时间', + `createUserId` bigint(0) NULL DEFAULT NULL COMMENT '创建人id', + `createUserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人姓名', + `updateTime` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`taskId`) USING BTREE +) ENGINE = InnoDB + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci COMMENT = '保养任务表' + ROW_FORMAT = Dynamic; -- ---------------------------- -- Table structure for device_upkeep_detail -- ---------------------------- -CREATE TABLE IF NOT EXISTS `device_upkeep_detail` ( - `taskId` bigint(0) NOT NULL COMMENT '任务id', - `deviceCode` varbinary(255) NOT NULL COMMENT '设备编码', - `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '部门编码', - `deptName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '部门名称', - `finishFlag` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否已完成 1/true 0/false', - `productId` bigint(0) NOT NULL COMMENT '产品id', - `udi` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'UDI码', - `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'DI码', - `productName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品名称', - `ggxh` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '规格型号', - `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', - `serialNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号', - `productionDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', - `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', - `manufactory` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产厂家', - `measname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '计量单位', - `zczbhhzbapzbh` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '注册/备案凭证号', - `supId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商ID', - `supName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商名称', - `itemCount` int(0) NOT NULL DEFAULT 0 COMMENT '项目数量', - `exceptionCount` int(0) NOT NULL DEFAULT 0 COMMENT '异常数量', - `finishCount` int(0) NOT NULL DEFAULT 0 COMMENT '完成项目数量', - `finishTime` datetime(0) NULL DEFAULT NULL COMMENT '完成时间', - `normalFlag` tinyint(0) NULL DEFAULT NULL COMMENT '保养状态 ：0：异常；1.正常', - `livePath` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '现场照片', - `suggestion` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '保养建议', - `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更改时间', - PRIMARY KEY (`taskId`, `deviceCode`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '保养任务明细' ROW_FORMAT = Dynamic; +CREATE TABLE IF NOT EXISTS `device_upkeep_detail` +( + `taskId` bigint(0) NOT NULL COMMENT '任务id', + `deviceCode` varbinary(255) NOT NULL COMMENT '设备编码', + `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '部门编码', + `deptName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '部门名称', + `finishFlag` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否已完成 1/true 0/false', + `productId` bigint(0) NOT NULL COMMENT '产品id', + `udi` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'UDI码', + `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'DI码', + `productName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品名称', + `ggxh` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '规格型号', + `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', + `serialNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '序列号', + `productionDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', + `expireDate` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', + `manufactory` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产厂家', + `measname` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '计量单位', + `zczbhhzbapzbh` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '注册/备案凭证号', + `supId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商ID', + `supName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商名称', + `itemCount` int(0) NOT NULL DEFAULT 0 COMMENT '项目数量', + `exceptionCount` int(0) NOT NULL DEFAULT 0 COMMENT '异常数量', + `finishCount` int(0) NOT NULL DEFAULT 0 COMMENT '完成项目数量', + `finishTime` datetime(0) NULL DEFAULT NULL COMMENT '完成时间', + `normalFlag` tinyint(0) NULL DEFAULT NULL COMMENT '保养状态 ：0：异常；1.正常', + `livePath` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '现场照片', + `suggestion` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '保养建议', + `updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更改时间', + PRIMARY KEY (`taskId`, `deviceCode`) USING BTREE +) ENGINE = InnoDB + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci COMMENT = '保养任务明细' + ROW_FORMAT = Dynamic; -- ---------------------------- -- Table structure for device_upkeep_detail_item -- ---------------------------- -CREATE TABLE IF NOT EXISTS `device_upkeep_detail_item` ( - `taskId` bigint(0) NOT NULL COMMENT '任务id', - `deviceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '设备编码', - `itemCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '项目编码', - `itemName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '项目名称', - `itemContent` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '项目内容', - `normalFlag` bit(1) NULL DEFAULT NULL COMMENT '正常标识', - `finishFlag` bit(1) NOT NULL DEFAULT b'0' COMMENT '完成标识', - `finishTime` datetime(0) NULL DEFAULT NULL COMMENT '完成时间', - `suggestion` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '保养建议', - `upkeepUserId` bigint(0) NULL DEFAULT NULL COMMENT '保养人id', - `upkeepUserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '保养人姓名', - `upkeepDeptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '保养部门', - `upkeepDeptName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '保养部门名称', - `updateTime` datetime(0) NULL DEFAULT NULL, - PRIMARY KEY (`taskId`, `deviceCode`, `itemCode`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备保养项目' ROW_FORMAT = Dynamic; +CREATE TABLE IF NOT EXISTS `device_upkeep_detail_item` +( + `taskId` bigint(0) NOT NULL COMMENT '任务id', + `deviceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '设备编码', + `itemCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '项目编码', + `itemName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '项目名称', + `itemContent` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '项目内容', + `normalFlag` bit(1) NULL DEFAULT NULL COMMENT '正常标识', + `finishFlag` bit(1) NOT NULL DEFAULT b'0' COMMENT '完成标识', + `finishTime` datetime(0) NULL DEFAULT NULL COMMENT '完成时间', + `suggestion` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '保养建议', + `upkeepUserId` bigint(0) NULL DEFAULT NULL COMMENT '保养人id', + `upkeepUserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '保养人姓名', + `upkeepDeptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '保养部门', + `upkeepDeptName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '保养部门名称', + `updateTime` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`taskId`, `deviceCode`, `itemCode`) USING BTREE +) ENGINE = InnoDB + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备保养项目' + ROW_FORMAT = Dynamic; CALL Pro_Temp_ColumnWork('device_check_item_dict', 'type', @@ -3328,17 +3347,28 @@ CALL Pro_Temp_ColumnWork('device_plan_detail_item', 'type', ' tinyint NULL DEFAULT NULL COMMENT ''项目类型''', 1); -INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, - `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, - `update_time`, `remark`) VALUES (2095, '保养任务单', 1703, 15, '/dev/deviceUpkeep', 'dev/deviceUpkeep', - NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2024-05-12 15:52:51', NULL, NULL, NULL); -INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, - `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, - `update_time`, `remark`) VALUES (2096, '设备保养计划', 1703, 15, '/dev/deviceUpkeepPlan', 'dev/deviceUpkeepPlan', - NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-05-12 17:35:06', NULL, NULL, NULL); -INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, - `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, - `update_time`, `remark`) VALUES (2097, '保养项目字典', 1703, 15, '/dev/deviceUpkeepItemDict', 'dev/deviceUpkeepItemDict', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-05-14 15:02:50', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, + `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, + `update_time`, `remark`) +VALUES (2095, '保养任务单', 1703, 15, '/dev/deviceUpkeep', 'dev/deviceUpkeep', + NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2024-05-12 15:52:51', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, + `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, + `update_time`, `remark`) +VALUES (2096, '设备保养计划', 1703, 15, '/dev/deviceUpkeepPlan', 'dev/deviceUpkeepPlan', + NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-05-12 17:35:06', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, + `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, + `update_time`, `remark`) +VALUES (2097, '保养项目字典', 1703, 15, '/dev/deviceUpkeepItemDict', 'dev/deviceUpkeepItemDict', NULL, 1, 0, 'C', '0', '0', + NULL, NULL, '超级用户', '2024-05-14 15:02:50', NULL, NULL, NULL); +CALL Pro_Temp_ColumnWork('io_order', 'confirmTime', 'datetime(0) NULL DEFAULT NULL COMMENT ''发票确认时间''', 1); CALL Pro_Temp_ColumnWork('device_repair_apply_detail', 'livePath', 'varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修现场照片''',