设备巡检管理

src/main/java/com/glxp/api/controller/dev/DevicePlanDetailController.java

@@ -5,7 +5,9 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.dev.DevicePlanDetailEntity;
+import com.glxp.api.entity.dev.DevicePlanEntity;
 import com.glxp.api.req.dev.DevicePlanDetailGroupQuery;
 import com.glxp.api.req.dev.DevicePlanDetailParam;
 import com.glxp.api.req.dev.DevicePlanDetailQuery;
@@ -21,6 +23,10 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.List;
 
+/**
+ * 设备计划明细
+ * data: 2023/11/12
+ */
 @RestController
 @RequestMapping
 @RequiredArgsConstructor
@@ -77,10 +83,22 @@ public class DevicePlanDetailController extends BaseController {
     @AuthRuleAnnotation("")
     @PostMapping("/udi/device/plan/detail/add")
     public BaseResponse add(@RequestBody @Valid DevicePlanDetailParam param) {
+
+
+        DevicePlanEntity entity = null;
+        if (!param.valid(devicePlanService)) {
+            AuthAdmin user = super.getUser();
+            entity = param.getDevicePlanParam().getEntity(user);
+            devicePlanService.save(entity);
+            param.getDevicePlanParam().setPlanId(entity.getPlanId());
+            param.setPlanId(entity.getPlanId());
+        } else {
+            entity = devicePlanService.getById(param.getPlanId());
+        }
         param.valid(devicePlanService);
         List<DevicePlanDetailEntity> list = param.getEntity(deviceInfoService);
         devicePlanDetailService.replaceBatch(list);
-        return ResultVOUtils.successMsg("添加成功");
+        return ResultVOUtils.success(entity);
     }
 
 
@@ -101,7 +119,7 @@ public class DevicePlanDetailController extends BaseController {
     /**
      * 设备巡检计划明细删除
      *
-     * @param planId    计划id
+     * @param planId     计划id
      * @param deviceCode 设备编码
      */
     @AuthRuleAnnotation("")

src/main/java/com/glxp/api/controller/dev/DevicePlanDetailItemController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.dev;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
@@ -7,6 +8,7 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.dev.DeviceCheckItemDictEntity;
 import com.glxp.api.entity.dev.DevicePlanDetailItemEntity;
 import com.glxp.api.req.dev.DevicePlanDetailItemParam;
 import com.glxp.api.req.dev.DevicePlanDetailItemQuery;
@@ -14,13 +16,19 @@ import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.service.dev.DeviceCheckItemDictService;
 import com.glxp.api.service.dev.DevicePlanDetailItemService;
 import com.glxp.api.service.dev.DevicePlanDetailService;
+import com.glxp.api.vo.dev.DevicePlanDetailVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * 设备管理
+ * data: 2023/11/10
+ */
 @RestController
 @RequestMapping
 @RequiredArgsConstructor
@@ -32,6 +40,24 @@ public class DevicePlanDetailItemController extends BaseController {
     private final DeviceCheckItemDictService deviceCheckItemDictService;
 
 
+    /**
+     * 设备巡检计划明细项目分页
+     *
+     * @param query
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/detail/item/group/page")
+    public BaseResponse groupPage(@RequestBody @Valid DevicePlanDetailItemQuery query) {
+        List<DevicePlanDetailItemEntity> list = devicePlanDetailItemService.pageList(query);
+        PageInfo pageInfo = new PageInfo<>(list);
+        PageSimpleResponse page = new PageSimpleResponse();
+        page.setTotal(pageInfo.getTotal());
+        page.setList(pageInfo.getList());
+        return ResultVOUtils.success(page);
+    }
+
+
     /**
      * 设备巡检计划明细项目分页
      *
@@ -69,6 +95,42 @@ public class DevicePlanDetailItemController extends BaseController {
         return ResultVOUtils.successMsg("添加成功");
     }
 
+    /**
+     * 设备巡检计划明细项目批量新增
+     *
+     * @param param 参数
+     * @return 计划id
+     */
+    @AuthRuleAnnotation("")
+    @PostMapping("/udi/device/plan/detail/item/batch/add")
+    public BaseResponse batchAdd(@RequestBody @Valid DevicePlanDetailItemParam param) {
+        List<DevicePlanDetailVo> list = devicePlanDetailService.listByPlanId(param.getPlanId());
+        if (CollUtil.isNotEmpty(list)) {
+            for (DevicePlanDetailVo item : list) {
+                List<DeviceCheckItemDictEntity> itemDictEntities = deviceCheckItemDictService.listByIds(param.getItemCodes());
+                List<DevicePlanDetailItemEntity> entityList = new ArrayList<>();
+                itemDictEntities.forEach(i -> {
+                    DevicePlanDetailItemEntity build = DevicePlanDetailItemEntity.builder()
+                            .planId(param.getPlanId())
+                            .productId(item.getProductId())
+                            .deviceCode(StrUtil.blankToDefault(item.getDeviceCode(), ""))
+                            .itemCode(i.getCode())
+                            .name(i.getName())
+                            .content(i.getContent())
+                            .build();
+                    entityList.add(build);
+                });
+                if (StrUtil.isBlank(param.getDeviceCode())) {
+                    devicePlanDetailItemService.replaceBatch(entityList);
+                } else {
+                    devicePlanDetailItemService.insertIgnoreBatch(entityList);
+                }
+            }
+
+        }
+        return ResultVOUtils.successMsg("添加成功");
+    }
+
 
     /**
      * 设备巡检计划明细项目删除

src/main/java/com/glxp/api/controller/inout/IoCodeController.java

@@ -15,6 +15,11 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+/**
+ * UDI出入库单据-扫码模块
+ * author：苏荣彬
+ * data: 2023/11/18
+ */
 
 /**
  * 单据正式码表接口

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -1,33 +1,23 @@
 package com.glxp.api.controller.inout;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.glxp.api.annotation.CusRedissonAnnotation;
-import com.glxp.api.constant.*;
-import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
-import com.glxp.api.res.inv.InvPlaceDetailResponse;
-import com.glxp.api.service.inout.impl.IoCodeService;
-import com.glxp.api.service.inv.InvPreProductDetailService;
-import com.glxp.api.service.inv.InvPreinProductDetailService;
-import com.glxp.api.service.inv.impl.InvProductDetailService;
-import com.glxp.api.service.system.SystemParamConfigService;
-import org.springframework.beans.BeanUtils;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.annotation.CusRedissonAnnotation;
 import com.glxp.api.annotation.Log;
 import com.glxp.api.annotation.RepeatSubmit;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.*;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.auth.InvBusUserEntity;
 import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
-import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.entity.basic.EntrustReceEntity;
 import com.glxp.api.entity.inout.*;
 import com.glxp.api.http.sync.SpGetHttpClient;
@@ -44,14 +34,18 @@ import com.glxp.api.service.basic.BasicCorpService;
 import com.glxp.api.service.basic.EntrustReceService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.*;
+import com.glxp.api.service.inout.impl.IoCodeService;
 import com.glxp.api.service.inout.impl.IoOrderInvoiceService;
+import com.glxp.api.service.inv.InvPreProductDetailService;
+import com.glxp.api.service.inv.InvPreinProductDetailService;
+import com.glxp.api.service.inv.impl.InvProductDetailService;
+import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.util.CustomUtil;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.OrderNoTypeBean;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.lucene.queryparser.flexible.core.processors.NoChildOptimizationQueryNodeProcessor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
@@ -63,6 +57,10 @@ import java.util.stream.Collectors;
 
 import static com.glxp.api.constant.ConstantStatus.ORDER_STATUS_CHECK_PROCESS;
 
+/**
+ * UDI出入库单据-单据明细模块
+ * data: 2023/11/18
+ */
 
 @Slf4j
 @RestController

src/main/java/com/glxp/api/entity/dev/DevicePlanEntity.java

@@ -87,9 +87,16 @@ public class DevicePlanEntity {
     @TableField(value = "createUserName")
     private String createUserName;
 
+
+    /**
+     * 巡检计划状态
+     */
+    @TableField(value = "status")
+    private Integer status;
+
     /**
      * 创建时间
      */
     @TableField(value = "createTime")
     private LocalDateTime createTime;
-}
+}

src/main/java/com/glxp/api/req/dev/DevicePlanDetailItemParam.java

@@ -28,7 +28,6 @@ public class DevicePlanDetailItemParam {
     @NotNull(message = "计划标识不能为空")
     Long planId;
 
-    @NotNull(message = "产品id")
     Long productId;
 
     /**
@@ -72,7 +71,7 @@ public class DevicePlanDetailItemParam {
             DevicePlanDetailItemEntity build = DevicePlanDetailItemEntity.builder()
                     .planId(planId)
                     .productId(productId)
-                    .deviceCode(StrUtil.blankToDefault(deviceCode,""))
+                    .deviceCode(StrUtil.blankToDefault(deviceCode, ""))
                     .itemCode(i.getCode())
                     .name(i.getName())
                     .content(i.getContent())

src/main/java/com/glxp/api/req/dev/DevicePlanDetailItemQuery.java

@@ -6,7 +6,10 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotNull;
-
+/**
+ * 巡检设备计划
+ * data: 2023/11/15
+ */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -15,9 +18,8 @@ public class DevicePlanDetailItemQuery extends ListPageRequest {
     @NotNull(message = "计划标识不能为空")
     Long planId;
 
-    @NotNull(message = "产品标识不能为空")
     Long productId;
-
+    @NotNull(message = "设备标识不能为空")
     String deviceCode;
 
 }

src/main/java/com/glxp/api/req/dev/DevicePlanDetailParam.java

@@ -22,23 +22,25 @@ public class DevicePlanDetailParam {
     /**
      * 计划id
      */
-    @NotNull(message = "计划标识不能为空")
+//    @NotNull(message = "计划标识不能为空")
     Long planId;
 
     @NotEmpty(message = "请选择至少一个设备")
     Set<String> deviceCodes;
 
+    DevicePlanParam devicePlanParam;
 
-    public void valid(DevicePlanService devicePlanService) {
+    public boolean valid(DevicePlanService devicePlanService) {
         DevicePlanEntity entity = devicePlanService.getById(planId);
         if (entity == null) {
-            throw new JsonException("该计划不存在，无法操作");
+            return false;
         }
+        return true;
     }
 
     public List<DevicePlanDetailEntity> getEntity(DeviceInfoService deviceInfoService) {
         List<DeviceInfoEntity> deviceList = deviceInfoService.listByIds(deviceCodes);
-        if(CollectionUtil.isEmpty(deviceList)){
+        if (CollectionUtil.isEmpty(deviceList)) {
             throw new JsonException("未找到设备，疑似非法操作");
         }
         List<DevicePlanDetailEntity> list = deviceList.stream().map(d -> {

src/main/java/com/glxp/api/req/dev/DevicePlanDetailQuery.java

@@ -15,7 +15,6 @@ public class DevicePlanDetailQuery extends ListPageRequest {
     @NotNull(message = "计划标识不能为空")
     Long planId;
 
-    @NotNull(message = "产品标识不能为空")
     Long productId;
 
     /**

src/main/java/com/glxp/api/req/dev/DevicePlanParam.java

@@ -53,6 +53,11 @@ public class DevicePlanParam {
     @NotNull(message = "频率不能为空")
     private Integer frequency;
 
+    /**
+     * 计划单据状态
+     */
+    private Integer status;
+
     /**
      * 备注
      */
@@ -81,6 +86,7 @@ public class DevicePlanParam {
                 .startDate(startDate)
                 .endDate(endDate)
                 .frequency(frequency)
+                .status(status == null ? 1 : status)
                 .remark(remark)
                 .build();
         if (!isUpdate) {

src/main/java/com/glxp/api/service/dev/impl/DevicePlanDetailItemServiceImpl.java

@@ -13,6 +13,10 @@ import com.glxp.api.dao.dev.DevicePlanDetailItemMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+/**
+ * 巡检设备的项目
+ * data: 2023/11/10
+ */
 
 /**
  * 针对表【device_plan_detail_item(巡检设备的项目)】的数据库操作Service实现
@@ -34,11 +38,10 @@ public class DevicePlanDetailItemServiceImpl extends CustomServiceImpl<DevicePla
         if (query.getPage() != null) {
             PageHelper.startPage(query.getPage(), query.getLimit());
         }
+
         List<DevicePlanDetailItemEntity> list = super.list(Wrappers.lambdaQuery(DevicePlanDetailItemEntity.class)
                 .eq(DevicePlanDetailItemEntity::getPlanId, query.getPlanId())
-                .and(i -> i.eq(DevicePlanDetailItemEntity::getProductId, query.getProductId())
+                .eq(DevicePlanDetailItemEntity::getDeviceCode, query.getDeviceCode())
-                        .or(StrUtil.isNotBlank(query.getDeviceCode()))
-                        .eq(DevicePlanDetailItemEntity::getDeviceCode, StrUtil.blankToDefault(query.getDeviceCode(), "")))
                 .orderByDesc(DevicePlanDetailItemEntity::getDeviceCode, DevicePlanDetailItemEntity::getItemCode)
         );
         return list;

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.43:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:
@@ -16,6 +16,7 @@ spring:
   redis:
     database: 8
     host: 127.0.0.1
+    #    password: 123456
     port: 6379
     #    password: 123456
     timeout: 300

src/main/resources/mybatis/mapper/dev/DevicePlanDetailMapper.xml

@@ -3,49 +3,52 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.dev.DevicePlanDetailMapper">
-
     <resultMap id="notDeviceCode" type="com.glxp.api.vo.dev.DevicePlanDetailVo" autoMapping="true">
         <result column="cusDeviceCode" property="deviceCode"/>
     </resultMap>
 
     <select id="pageGroupVo" resultMap="notDeviceCode">
-        select dd.planId,count(dd.deviceCode) as count,concat(NULL) as cusDeviceCode,
+        select dd.planId,
-        info.*
+               count(dd.deviceCode) as count,
+               concat(NULL)         as cusDeviceCode,
+               info.*
         from device_plan_detail dd
-        left join device_info info on info.deviceCode = dd.deviceCode
+                     left join device_info info on info.deviceCode = dd.deviceCode
         <where>
             dd.planId = #{planId}
         </where>
-        group by dd.planId,dd.productId
+        group by dd.planId, dd.productId
         order by dd.productId
     </select>
 
     <select id="pageVo" resultType="com.glxp.api.vo.dev.DevicePlanDetailVo">
         select dd.planId,
-        info.*,
+               info.*,
-        dept.name as deptName
+               dept.name as deptName
         from device_plan_detail dd
-        left join device_info info on info.deviceCode = dd.deviceCode
+                     left join device_info info on info.deviceCode = dd.deviceCode
-        left join auth_dept dept on dept.code = info.deptCode
+                     left join auth_dept dept on dept.code = info.deptCode
         <where>
             dd.planId = #{planId}
-            and dd.productId = #{productId}
+            <if test="productId != null and productId != ''">
-            <if test="deviceCode!=null and deviceCode!=''">
+                and dd.productId = #{productId}
-                and dd.deviceCode like concat('%',#{deviceCode},'%')
+            </if>
+            <if test="deviceCode != null and deviceCode != ''">
+                and dd.deviceCode like concat('%', #{deviceCode}, '%')
             </if>
         </where>
-        order by info.deptCode,info.productId,info.deviceCode
+        order by info.deptCode, info.productId, info.deviceCode
     </select>
     <select id="listByPlanId" resultType="com.glxp.api.vo.dev.DevicePlanDetailVo">
         select dd.planId,
-        info.*,
+               info.*,
-        dept.name as deptName
+               dept.name as deptName
         from device_plan_detail dd
-        left join device_info info on info.deviceCode = dd.deviceCode
+                     left join device_info info on info.deviceCode = dd.deviceCode
-        left join auth_dept dept on dept.code = info.deptCode
+                     left join auth_dept dept on dept.code = info.deptCode
         <where>
             dd.planId = #{planId}
         </where>
-        order by info.deptCode,info.productId,info.deviceCode
+        order by info.deptCode, info.productId, info.deviceCode
     </select>
 </mapper>

src/main/resources/schemas/schema_v2.4.sql

@@ -1978,19 +1978,24 @@ CREATE TABLE IF NOT EXISTS dept_material_category
   ROW_FORMAT = DYNAMIC;
 
 
-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`,
+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 (1866, '科室出库', 1655, 888, 'inout/IoDepartmentOrder', 'inout/IoDepartmentOrder', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-06-14 15:00:11', NULL, NULL, NULL);
+VALUES (1866, '科室出库', 1655, 888, 'inout/IoDepartmentOrder', 'inout/IoDepartmentOrder', NULL, 1, 0, 'C', '0', '0', NULL,
+        NULL, '超级用户', '2023-06-14 15:00:11', NULL, NULL, NULL);
 
 
 CALL Pro_Temp_ColumnWork('basic_sk_sicker', 'sourceType',
                          ' int(0)  NULL DEFAULT NULL COMMENT ''来源类型 2：手动''',
                          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`,
+INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
-                      `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
+                             `is_frame`, `is_cache`, `menu_type`, `visible`,
-                      VALUES (2092, '科室医保分类', 1643, 8, 'basic/consume/materialCategory', 'basic/consume/materialCategory', NULL, 1, 0, 'C', '0', '0',
+                             `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`,
-                              NULL, NULL, '超级用户', '2024-04-08 16:08:55', NULL, NULL, NULL);
+                             `remark`)
+VALUES (2092, '科室医保分类', 1643, 8, 'basic/consume/materialCategory', 'basic/consume/materialCategory', NULL, 1, 0, 'C',
+        '0', '0',
+        NULL, NULL, '超级用户', '2024-04-08 16:08:55', NULL, NULL, NULL);
 
 
 CALL Pro_Temp_ColumnWork('thr_inv_order', 'sickerCode',
@@ -2014,7 +2019,8 @@ CALL Pro_Temp_ColumnWork('basic_products', 'destinyType',
                          1);
 
 
-CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailProductAttributes', 'tinyint    NULL DEFAULT NULL COMMENT ''校验产品采购类型 ：1：校验；2.无需校验''', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailProductAttributes',
+                         'tinyint    NULL DEFAULT NULL COMMENT ''校验产品采购类型 ：1：校验；2.无需校验''', 1);
 CALL Pro_Temp_ColumnWork('basic_sk_sicker', 'deptName',
                          ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL',
                          1);
@@ -2022,9 +2028,12 @@ CALL Pro_Temp_ColumnWork('basic_sk_sicker', 'deptCode',
                          ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL',
                          1);
 
-INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`,
+INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
-                      `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`)
+                             `is_frame`, `is_cache`, `menu_type`,
-                      VALUES (2093, '术式套包管理', 1643, 6, 'destiny/warlockBag', 'basic/destiny/warlockBag', NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-04-15 14:13:39', NULL, NULL, NULL);
+                             `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`,
+                             `update_time`, `remark`)
+VALUES (2093, '术式套包管理', 1643, 6, 'destiny/warlockBag', 'basic/destiny/warlockBag', NULL, 1, 0, 'C', '0', '0', NULL,
+        NULL, '超级用户', '2024-04-15 14:13:39', NULL, NULL, NULL);
 
 CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'destinyId',
                          ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''术式模板id''',
@@ -2048,15 +2057,25 @@ CALL Pro_Temp_ColumnWork('pur_receive_detail', 'destinyId',
 
 
 
-INSERT IGNORE INTO`thr_system_detail`(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) VALUES (100, '项目字典下载', 'sfProjectDictUrl', NULL, 1, '1', NULL, 'thirdId', 1, 3, 1440, NULL);
+INSERT IGNORE INTO `thr_system_detail`(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`,
+                                       `itrCache`, `fromType`, `time`, `dlLastTime`)
+VALUES (100, '项目字典下载', 'sfProjectDictUrl', NULL, 1, '1', NULL, 'thirdId', 1, 3, 1440, NULL);
 
-INSERT IGNORE INTO`thr_system_detail`(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) VALUES (101, '项目字典下载', 'sfProjectDictUrl', NULL, 1, '1', NULL, 'thirdId1', 1, 3, 1440, NULL);
+INSERT IGNORE INTO `thr_system_detail`(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`,
+                                       `itrCache`, `fromType`, `time`, `dlLastTime`)
+VALUES (101, '项目字典下载', 'sfProjectDictUrl', NULL, 1, '1', NULL, 'thirdId1', 1, 3, 1440, NULL);
 
-INSERT IGNORE INTO`thr_system_detail`(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) VALUES (102, '项目字典下载', 'sfProjectDictUrl', NULL, 1, '1', NULL, 'thirdId2', 1, 3, 1440, NULL);
+INSERT IGNORE INTO `thr_system_detail`(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`,
+                                       `itrCache`, `fromType`, `time`, `dlLastTime`)
+VALUES (102, '项目字典下载', 'sfProjectDictUrl', NULL, 1, '1', NULL, 'thirdId2', 1, 3, 1440, NULL);
 
-INSERT IGNORE INTO`thr_system_detail`(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) VALUES (103, '项目字典下载', 'sfProjectDictUrl', NULL, 1, '1', NULL, 'thirdId3', 1, 3, 1440, NULL);
+INSERT IGNORE INTO `thr_system_detail`(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`,
+                                       `itrCache`, `fromType`, `time`, `dlLastTime`)
+VALUES (103, '项目字典下载', 'sfProjectDictUrl', NULL, 1, '1', NULL, 'thirdId3', 1, 3, 1440, NULL);
 
-INSERT IGNORE INTO`thr_system_detail`(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`, `itrCache`, `fromType`, `time`, `dlLastTime`) VALUES (104, '项目字典下载', 'sfProjectDictUrl', NULL, 1, '1', NULL, 'thirdId4', 1, 3, 1440, NULL);
+INSERT IGNORE INTO `thr_system_detail`(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`,
+                                       `itrCache`, `fromType`, `time`, `dlLastTime`)
+VALUES (104, '项目字典下载', 'sfProjectDictUrl', NULL, 1, '1', NULL, 'thirdId4', 1, 3, 1440, NULL);
 
 
 CALL Pro_Temp_ColumnWork('device_info', 'assetType',
@@ -2100,8 +2119,8 @@ CALL Pro_Temp_ColumnWork('device_info', 'dayHour',
                          1);
 
 CALL Pro_Temp_ColumnWork('device_info', 'assetValue',
-                        'decimal(10, 2) ZEROFILL NULL COMMENT ''单个资产价值'' ',
+                         'decimal(10, 2) ZEROFILL NULL COMMENT ''单个资产价值'' ',
-                        1);
+                         1);
 
 CALL Pro_Temp_ColumnWork('device_info', 'ownFund',
                          'decimal(10, 2) ZEROFILL NULL COMMENT ''自有资金'' ',
@@ -2440,3 +2459,5 @@ CALL Pro_Temp_ColumnWork('device_info', 'ascriptionType',
 CALL Pro_Temp_ColumnWork('device_info', 'assetReserveType',
                          ' varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''资产备用类型''',
                          1);
+
+CALL Pro_Temp_ColumnWork('device_plan', 'status', 'tinyint    NULL DEFAULT NULL COMMENT ''设备巡检计划状态 ：1：草稿；2.已提交''', 1);