From fd5b500f15e9e8b15c90bfbd711c5f52aab90d97 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 31 Dec 2024 09:23:34 +0800
Subject: [PATCH] =?UTF-8?q?12/31=20=E7=81=AF=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectLedGroupController.java  |  81 ++++++
 .../dao/collect/IoCollectLedGroupMapper.java  |  21 ++
 .../api/entity/collect/IoCollectLedGroup.java | 124 ++++++++
 .../api/enums/led/LedColorStatusEnum.java     |  29 ++
 .../req/collect/CollectLedGroupRequest.java   |  20 ++
 .../res/basic/SysWorkplaceQueueResponse.java  |   6 +
 .../collect/IoCollectLedGroupResponse.java    |  92 ++++++
 .../com/glxp/api/res/collect/LedResponse.java |  25 ++
 .../service/collect/IoCollectCodeService.java |   3 +-
 .../collect/IoCollectLedGroupService.java     |  87 ++++++
 .../api/service/inout/IoSplitCodeService.java |   5 +
 .../mapper/basic/SysWorkplaceQueueMapper.xml  |   4 +-
 .../collect/IoCollectLedGroupMapper.xml       |  14 +
 src/main/resources/schemas/schema_v2.4.sql    | 274 ++++++++++++------
 14 files changed, 700 insertions(+), 85 deletions(-)
 create mode 100644 src/main/java/com/glxp/api/controller/collect/IoCollectLedGroupController.java
 create mode 100644 src/main/java/com/glxp/api/dao/collect/IoCollectLedGroupMapper.java
 create mode 100644 src/main/java/com/glxp/api/entity/collect/IoCollectLedGroup.java
 create mode 100644 src/main/java/com/glxp/api/enums/led/LedColorStatusEnum.java
 create mode 100644 src/main/java/com/glxp/api/req/collect/CollectLedGroupRequest.java
 create mode 100644 src/main/java/com/glxp/api/res/collect/IoCollectLedGroupResponse.java
 create mode 100644 src/main/java/com/glxp/api/res/collect/LedResponse.java
 create mode 100644 src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java
 create mode 100644 src/main/resources/mybatis/mapper/collect/IoCollectLedGroupMapper.xml

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectLedGroupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectLedGroupController.java
new file mode 100644
index 000000000..188799ba5
--- /dev/null
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectLedGroupController.java
@@ -0,0 +1,81 @@
+package com.glxp.api.controller.collect;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.github.pagehelper.PageInfo;
+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.collect.IoCollectLedGroup;
+import com.glxp.api.entity.collect.IoCollectOrderBiz;
+import com.glxp.api.req.basic.BasicCollectUserRequest;
+import com.glxp.api.req.collect.CollectLedGroupRequest;
+import com.glxp.api.req.collect.CollectOrderRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.basic.UserWorkResponse;
+import com.glxp.api.res.collect.IoCollectLedGroupResponse;
+import com.glxp.api.res.collect.IoCollectOrderResponse;
+import com.glxp.api.res.collect.LedResponse;
+import com.glxp.api.service.collect.IoCollectCodeService;
+import com.glxp.api.service.collect.IoCollectLedGroupService;
+import com.glxp.api.service.inout.IoSplitCodeService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author : zhuzhu
+ * @date : 2024/12/30 10:27
+ * @modyified By :
+ */
+
+@Slf4j
+@RestController
+public class IoCollectLedGroupController extends BaseController {
+
+    @Resource
+    IoCollectLedGroupService ioCollectLedGroupService;
+
+    @Resource
+    IoSplitCodeService splitCodeService;
+
+
+    @PostMapping("/udiwms/basic/collect/ledGroup/filter")
+    public BaseResponse filterOrder(@RequestBody CollectLedGroupRequest collectLedGroupRequest) {
+        List<IoCollectLedGroupResponse> collectLedGroupResponseList = ioCollectLedGroupService.filterList(collectLedGroupRequest);
+        PageInfo<IoCollectLedGroupResponse> pageInfo = new PageInfo<>(collectLedGroupResponseList);
+        PageSimpleResponse<IoCollectLedGroupResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(collectLedGroupResponseList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @PostMapping("/udiwms/basic/collect/ledGroup/binding")
+    public BaseResponse binding(@RequestBody IoCollectLedGroup ioCollectLedGroup) {
+        ioCollectLedGroupService.updateById(ioCollectLedGroup);
+        return ResultVOUtils.success();
+    }
+
+//    /**
+//     * 取货确认
+//     *
+//     * @return
+//     */
+//    @PostMapping("/udiwms/basic/collect/ledGroup/bizConfirm")
+//    @Transactional(rollbackFor = Exception.class)
+//    public BaseResponse bizConfirmOrder(@RequestBody String request) {
+//        LedResponse response = JSONObject.parseObject(request, new TypeReference<LedResponse>() {});
+//        /**
+//         * 取货确认
+//         */
+////        splitCodeService.confirmBizAutiTagCode(confirmOrderBiz, confirmOrderBiz.getQueueCode());
+//        return ResultVOUtils.success("确认成功！");
+//    }
+
+}
diff --git a/src/main/java/com/glxp/api/dao/collect/IoCollectLedGroupMapper.java b/src/main/java/com/glxp/api/dao/collect/IoCollectLedGroupMapper.java
new file mode 100644
index 000000000..049e93877
--- /dev/null
+++ b/src/main/java/com/glxp/api/dao/collect/IoCollectLedGroupMapper.java
@@ -0,0 +1,21 @@
+package com.glxp.api.dao.collect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.collect.IoCollectLedGroup;
+import com.glxp.api.req.collect.CollectLedGroupRequest;
+import com.glxp.api.res.collect.IoCollectLedGroupResponse;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @author : zhangsan
+ * @date : 2024/12/30 10:48
+ * @modyified By :
+ */
+
+@Mapper
+public interface IoCollectLedGroupMapper extends BaseMapper<IoCollectLedGroup> {
+
+    List<IoCollectLedGroupResponse> filterList(CollectLedGroupRequest collectLedGroupRequest);
+}
diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectLedGroup.java b/src/main/java/com/glxp/api/entity/collect/IoCollectLedGroup.java
new file mode 100644
index 000000000..1bdeb1f58
--- /dev/null
+++ b/src/main/java/com/glxp/api/entity/collect/IoCollectLedGroup.java
@@ -0,0 +1,124 @@
+package com.glxp.api.entity.collect;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+@Data
+public class IoCollectLedGroup implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 标签id
+     */
+    @TableField(value = "mac")
+    @ApiModelProperty(value = "标签id")
+    private String mac;
+
+    /**
+     * led灯编号
+     */
+    @TableField(value = "ledNum")
+    @ApiModelProperty(value = "led灯编号")
+    private Integer ledNum;
+
+    /**
+     * 红灯
+     */
+    @TableField(value = "red")
+    @ApiModelProperty(value = "红灯")
+    private Boolean red;
+
+    /**
+     * 橘灯
+     */
+    @TableField(value = "orange")
+    @ApiModelProperty(value = "橘灯")
+    private Boolean orange;
+
+    /**
+     * 蓝色
+     */
+    @TableField(value = "blue")
+    @ApiModelProperty(value = "蓝色")
+    private Boolean blue;
+
+    /**
+     * 绿色
+     */
+    @TableField(value = "green")
+    @ApiModelProperty(value = "绿色")
+    private Boolean green;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    /**
+     *
+     */
+    @TableField(value = "createTime")
+    @ApiModelProperty(value = "")
+    private Date createTime;
+
+    /**
+     *
+     */
+    @TableField(value = "updateTime")
+    @ApiModelProperty(value = "")
+    private Date updateTime;
+
+    /**
+     *
+     */
+    @TableField(value = "createUser")
+    @ApiModelProperty(value = "")
+    private String createUser;
+
+    /**
+     *
+     */
+    @TableField(value = "updateUser")
+    @ApiModelProperty(value = "")
+    private String updateUser;
+
+    /**
+     * 默认0 常亮，不自动灭。timeout>0,(timeout)秒后自动灭。
+     */
+    @TableField(value = "timeout")
+    @ApiModelProperty(value = "默认0 常亮，不自动灭。timeout>0,(timeout)秒后自动灭。")
+    private Integer timeout;
+
+    /**
+     * 亮灯模式 0灭灯，1常亮
+     */
+    @TableField(value = "ledMode")
+    @ApiModelProperty(value = "亮灯模式 0灭灯，1常亮")
+    private Boolean ledMode;
+
+    /**
+     * 产品id
+     */
+    @TableField(value = "relId")
+    @ApiModelProperty(value = "产品id")
+    private Long relId;
+
+    @TableField(value = "nameCode")
+    private String nameCode;
+
+    private static final long serialVersionUID = 1L;
+}
diff --git a/src/main/java/com/glxp/api/enums/led/LedColorStatusEnum.java b/src/main/java/com/glxp/api/enums/led/LedColorStatusEnum.java
new file mode 100644
index 000000000..ae866f4d9
--- /dev/null
+++ b/src/main/java/com/glxp/api/enums/led/LedColorStatusEnum.java
@@ -0,0 +1,29 @@
+package com.glxp.api.enums.led;
+
+import lombok.Getter;
+
+/**
+ * @author : zhangsan
+ * @date : 2024/12/30 19:30
+ * @modyified By :
+ */
+
+@Getter
+public enum LedColorStatusEnum {
+    RED_FALSE(1, "红色为false"),
+    ORANGE_FALSE(2, "橘色为false"),
+    BLUE_FALSE(3, "蓝色为false"),
+    DEFAULT(4, "绿色为false");
+
+    private final int returnValue;
+    private final String description;
+
+    LedColorStatusEnum(int returnValue, String description) {
+        this.returnValue = returnValue;
+        this.description = description;
+    }
+
+    public int getReturnValue() {
+        return returnValue;
+    }
+}
diff --git a/src/main/java/com/glxp/api/req/collect/CollectLedGroupRequest.java b/src/main/java/com/glxp/api/req/collect/CollectLedGroupRequest.java
new file mode 100644
index 000000000..ffcd88ebb
--- /dev/null
+++ b/src/main/java/com/glxp/api/req/collect/CollectLedGroupRequest.java
@@ -0,0 +1,20 @@
+package com.glxp.api.req.collect;
+
+import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+/**
+ * @author : zhuzhu
+ * @date : 2024/12/30 14:08
+ * @modyified By :
+ */
+
+@Data
+public class CollectLedGroupRequest extends ListPageRequest {
+
+    private String mac;
+    private Integer lednum;
+    private Integer timeout;
+    private Integer ledmode;
+}
diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java
index ac309c52c..8f92584ec 100644
--- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceQueueResponse.java
@@ -92,4 +92,10 @@ public class SysWorkplaceQueueResponse {
      */
     private String workplaceName;
 
+    /**
+     * 灯组标签
+     */
+    private String mac;
+
+
 }
diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectLedGroupResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectLedGroupResponse.java
new file mode 100644
index 000000000..d870f9bc8
--- /dev/null
+++ b/src/main/java/com/glxp/api/res/collect/IoCollectLedGroupResponse.java
@@ -0,0 +1,92 @@
+package com.glxp.api.res.collect;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author : zhuzhu
+ * @date : 2024/12/30 14:12
+ * @modyified By :
+ */
+
+@Data
+public class IoCollectLedGroupResponse {
+    /**
+     * 主键id
+     */
+    private Long id;
+
+    /**
+     * 标签id
+     */
+    private String mac;
+
+    /**
+     * led灯编号
+     */
+    private Integer ledNum;
+
+    /**
+     * 红灯
+     */
+    private Boolean red;
+
+    /**
+     * 橘灯
+     */
+    private Boolean orange;
+
+    /**
+     * 蓝色
+     */
+    private Boolean blue;
+
+    /**
+     * 绿色
+     */
+    private Boolean green;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     *
+     */
+    private Date createTime;
+
+    /**
+     *
+     */
+    private Date updateTime;
+
+    /**
+     *
+     */
+    private String createUser;
+
+    /**
+     *
+     */
+    private String updateUser;
+
+    /**
+     * 默认0 常亮，不自动灭。timeout>0,(timeout)秒后自动灭。
+     */
+    private Integer timeout;
+
+    /**
+     * 亮灯模式 0灭灯，1常亮
+     */
+    private Integer ledMode;
+
+    private Long relId;
+
+    private String nameCode;
+}
diff --git a/src/main/java/com/glxp/api/res/collect/LedResponse.java b/src/main/java/com/glxp/api/res/collect/LedResponse.java
new file mode 100644
index 000000000..a0fa52c4d
--- /dev/null
+++ b/src/main/java/com/glxp/api/res/collect/LedResponse.java
@@ -0,0 +1,25 @@
+package com.glxp.api.res.collect;
+
+import lombok.Data;
+
+/**
+ * @author : zhuzhu
+ * @date : 2024/12/30 20:11
+ * @modyified By :
+ */
+
+@Data
+public class LedResponse {
+    private String mac;
+
+    /**
+     * Led灯编号：1,2,3,4
+     */
+    private Integer lednum;
+    /**
+     * 1 按键主动灭灯，
+     * 2 超时自动灭灯
+     */
+    private Integer result;
+
+}
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java
index 6b6aa30df..6e00109a7 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java
@@ -72,7 +72,8 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
         List<IoCollectOrderCodeAuto> splitCodes = collectOrderCodeAutoService.listByBillNo(collectOrderBizRequest.getOrderIdFk(), 1);
         List<IoCollectOrderCodeAuto> unSplitCodes = collectOrderCodeAutoService.listByBillNo(collectOrderBizRequest.getOrderIdFk(), 2);
         List<IoCollectOrderCodeMan> manList = collectOrderCodeManService.listByBillNo(collectOrderBizRequest.getOrderIdFk());
-        //todo 码表插入采购类型
+        // 码表插入采购类型
+        //如果是器械使用清单 标记io_collect_code_backup 码为已使用  已经有这个码根据订单号可能查到的不是同一个
         for (CollectOrderBizResponse collectOrderBiz : list) {
             List<IoCollectOrderCodeMan> temp1 = manList.stream()
                     .filter(obj -> obj.getBizIdFk().equals(collectOrderBiz.getId()))
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java
new file mode 100644
index 000000000..fc003191e
--- /dev/null
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java
@@ -0,0 +1,87 @@
+package com.glxp.api.service.collect;
+
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.dao.collect.IoCollectLedGroupMapper;
+import com.glxp.api.entity.collect.IoCollectLedGroup;
+import com.glxp.api.entity.collect.IoCollectOrderBiz;
+import com.glxp.api.entity.thrsys.CodeRel;
+import com.glxp.api.enums.led.LedColorStatusEnum;
+import com.glxp.api.exception.JsonException;
+import com.glxp.api.req.collect.CollectLedGroupRequest;
+import com.glxp.api.res.collect.IoCollectLedGroupResponse;
+import com.glxp.api.util.OkHttpCli;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author : zhuzhu
+ * @date : 2024/12/30 10:47
+ * @modyified By :
+ */
+
+@Service
+public class IoCollectLedGroupService extends ServiceImpl<IoCollectLedGroupMapper, IoCollectLedGroup> {
+
+    @Resource
+    IoCollectLedGroupMapper ioCollectLedGroupMapper;
+
+    @Resource
+    private OkHttpCli okHttpCli;
+
+
+    public List<IoCollectLedGroupResponse> filterList(CollectLedGroupRequest collectLedGroupRequest) {
+        if (collectLedGroupRequest == null) {
+            return Collections.emptyList();
+        }
+        if (collectLedGroupRequest.getPage() != null) {
+            int offset = (collectLedGroupRequest.getPage() - 1) * collectLedGroupRequest.getLimit();
+            PageHelper.offsetPage(offset, collectLedGroupRequest.getLimit());
+        }
+        return ioCollectLedGroupMapper.filterList(collectLedGroupRequest);
+    }
+
+
+    public BaseResponse<String> openLed(IoCollectOrderBiz collectOrderBiz) {
+        IoCollectLedGroup one = getOne(new LambdaQueryWrapper<IoCollectLedGroup>().eq(IoCollectLedGroup::getRelId, collectOrderBiz.getRelId()));
+        if (one == null){
+            throw new JsonException(500,"当前产品未绑定灯组");
+        }
+        CollectLedGroupRequest collectLedGroupRequest = new CollectLedGroupRequest();
+        collectLedGroupRequest.setMac(one.getMac());
+        collectLedGroupRequest.setTimeout(one.getTimeout());
+        if (one.getLedMode()){
+            collectLedGroupRequest.setLedmode(1);
+        }else {
+            collectLedGroupRequest.setLedmode(0);
+        }
+        collectLedGroupRequest.setLednum(setLedNum(one));
+        String json = JSONUtil.toJsonStr(collectLedGroupRequest);
+        String result = okHttpCli.doPostJson( "http://192.168.0.166:9099/wms/associate/lighttagsled", json);
+        BaseResponse<String> response =
+                JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
+                });
+        return response;
+    }
+
+    private Integer setLedNum(IoCollectLedGroup ioCollectLedGroup) {
+        if (!ioCollectLedGroup.getRed()) {
+            return LedColorStatusEnum.RED_FALSE.getReturnValue();
+        }
+        if (!ioCollectLedGroup.getOrange()) {
+            return LedColorStatusEnum.ORANGE_FALSE.getReturnValue();
+        }
+        if (!ioCollectLedGroup.getBlue()) {
+            return LedColorStatusEnum.BLUE_FALSE.getReturnValue();
+        }
+        return LedColorStatusEnum.DEFAULT.getReturnValue();
+    }
+}
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
index 2984e7b76..a38b25f28 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
@@ -66,6 +66,9 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
     @Resource
     IoSplitFifoInvService splitFifoInvService;
 
+    @Resource
+    IoCollectLedGroupService ioCollectLedGroupService;
+
 
     @Resource
     SysWorkplacePutRelService workplacePutRelService;
@@ -558,6 +561,8 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                 collectOrderBiz.setAutoTagStatus(3);
             } else
                 collectOrderBiz.setAutoTagStatus(1);
+            ioCollectLedGroupService.openLed(collectOrderBiz);
+
         }
         collectOrderBizService.updateBatchById(collectOrderBizs);
     }
diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
index 3f9e26a24..46eae980c 100644
--- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml
@@ -41,7 +41,8 @@
         select swq.*,
                bp.nameCode,
                COALESCE(bp.ggxh, bp.bzgg) AS ggxh,
-               bp.cpmctymc,sys_workplace.workplaceName
+               bp.cpmctymc,sys_workplace.workplaceName,
+               io_collect_led_group.mac
         from sys_workplace_queue swq
                  left join
              (select bu.id, bp.nameCode, bp.ggxh, bp.cpmctymc, bp.bzgg
@@ -51,6 +52,7 @@
 
 
                  left join sys_workplace on swq.workPlaceIdFk = sys_workplace.workplaceId
+        left join io_collect_led_group on swq.relId = io_collect_led_group.relId
         <where>
             <if test="key != null and key != ''">
                 AND (
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectLedGroupMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectLedGroupMapper.xml
new file mode 100644
index 000000000..fb1252d24
--- /dev/null
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectLedGroupMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.api.dao.collect.IoCollectLedGroupMapper">
+    <select id="filterList" resultType="com.glxp.api.res.collect.IoCollectLedGroupResponse">
+        SELECT *
+        from io_collect_led_group
+        <where>
+            <if test="mac != '' and mac != null">
+                AND mac LIKE concat('%', #{mac}, '%')
+            </if>
+             and relId is null
+        </where>
+    </select>
+</mapper>
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 4ad6a874f..098b14288 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -964,12 +964,14 @@ CREATE TABLE IF NOT EXISTS `thr_inv_order_detail`
 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 (2086, '出入库明细', 1608, 8, 'thrInvOrder', NULL, NULL, 1, 0, 'M', '0', '0', NULL, '', '超级用户', '2024-02-28 11:47:10',
+VALUES (2086, '出入库明细', 1608, 8, 'thrInvOrder', NULL, NULL, 1, 0, 'M', '0', '0', NULL, '', '超级用户',
+        '2024-02-28 11:47:10',
         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 (2087, '出入库查询', 2086, 1, 'thirdSys/invOrder/thrInvOrder', 'thirdSys/invOrder/thrInvOrder', NULL, 1, 0, 'C', '0',
+VALUES (2087, '出入库查询', 2086, 1, 'thirdSys/invOrder/thrInvOrder', 'thirdSys/invOrder/thrInvOrder', NULL, 1, 0, 'C',
+        '0',
         '0', 'thirdSys:invOrder:thrInvOrder', NULL, '超级用户', '2024-02-28 11:51:21', NULL, NULL, NULL);
 
 UPDATE auth_menu
@@ -996,19 +998,23 @@ WHERE `menu_id` = 2087;
 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 (2088, '普耗出入库明细', 2086, 1, 'thirdSys/invOrder/thrInvPhOrder', 'thirdSys/invOrder/thrInvPhOrder', NULL, 1, 0, 'C',
+VALUES (2088, '普耗出入库明细', 2086, 1, 'thirdSys/invOrder/thrInvPhOrder', 'thirdSys/invOrder/thrInvPhOrder', NULL, 1,
+        0, 'C',
         '0', '0', 'thirdSys:invOrder:thrInvPhOrder', NULL, '超级用户', '2024-02-28 11:51:21', 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 (2089, '高耗出入库明细', 2086, 1, 'thirdSys/invOrder/thrInvGhOrder', 'thirdSys/invOrder/thrInvGhOrder', NULL, 1, 0, 'C',
+VALUES (2089, '高耗出入库明细', 2086, 1, 'thirdSys/invOrder/thrInvGhOrder', 'thirdSys/invOrder/thrInvGhOrder', NULL, 1,
+        0, 'C',
         '0', '0', 'thirdSys:invOrder:thrInvGhOrder', NULL, '超级用户', '2024-02-28 11:51:21', NULL, NULL, NULL);
 
 CALL Pro_Temp_ColumnWork('thr_inv_order', 'sourceType',
                          ' int(0) NULL DEFAULT NULL COMMENT ''来源类型，1收费，2普耗，3高耗'' AFTER `remark`', 1);
-CALL Pro_Temp_ColumnWork('thr_inv_order', 'exMsg', ' text NULL DEFAULT NULL COMMENT ''单据异常信息'' AFTER `remark`', 1);
-CALL Pro_Temp_ColumnWork('thr_inv_order', 'skProject', ' int(0) NULL DEFAULT NULL COMMENT ''是否组套'' AFTER `remark`', 1);
+CALL Pro_Temp_ColumnWork('thr_inv_order', 'exMsg', ' text NULL DEFAULT NULL COMMENT ''单据异常信息'' AFTER `remark`',
+                         1);
+CALL Pro_Temp_ColumnWork('thr_inv_order', 'skProject', ' int(0) NULL DEFAULT NULL COMMENT ''是否组套'' AFTER `remark`',
+                         1);
 CALL Pro_Temp_ColumnWork('thr_inv_order_detail', 'udiCode',
                          ' varchar(255)  NULL DEFAULT NULL COMMENT ''udiCode'' AFTER `remark`', 1);
 CALL Pro_Temp_ColumnWork('thr_inv_order_detail', 'serialNo',
@@ -1031,7 +1037,8 @@ CALL Pro_Temp_ColumnWork('basic_sk_project_detail', 'thrName',
 
 INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`,
                                      `itrCache`, `fromType`, `time`, `dlLastTime`)
-VALUES (75, '收费出入库明细下载', 'invSfOrderUrl', '/udiwms/erp/inv/getInvSfResult', 1, '1', '', 'thirdId', 1, 3, 1440, NULL);
+VALUES (75, '收费出入库明细下载', 'invSfOrderUrl', '/udiwms/erp/inv/getInvSfResult', 1, '1', '', 'thirdId', 1, 3, 1440,
+        NULL);
 INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`,
                                      `itrCache`, `fromType`, `time`, `dlLastTime`)
 VALUES (76, '收费出入库明细下载', 'invSfOrderUrl', '', 1, '1', '', 'thirdId1', 1, 3, NULL, NULL);
@@ -1047,7 +1054,8 @@ VALUES (79, '收费出入库明细下载', 'invSfOrderUrl', '', 1, '1', '', 'thi
 
 INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`,
                                      `itrCache`, `fromType`, `time`, `dlLastTime`)
-VALUES (90, '普耗出入库明细下载', 'invPhOrderUrl', '/udiwms/erp/inv/getInvPhResult', 1, '1', '', 'thirdId', 1, 3, 1440, NULL);
+VALUES (90, '普耗出入库明细下载', 'invPhOrderUrl', '/udiwms/erp/inv/getInvPhResult', 1, '1', '', 'thirdId', 1, 3, 1440,
+        NULL);
 INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`,
                                      `itrCache`, `fromType`, `time`, `dlLastTime`)
 VALUES (91, '普耗出入库明细下载', 'invPhOrderUrl', '', 1, '1', '', 'thirdId1', 1, 3, NULL, NULL);
@@ -1064,7 +1072,8 @@ VALUES (94, '普耗出入库明细下载', 'invPhOrderUrl', '', 1, '1', '', 'thi
 
 INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`,
                                      `itrCache`, `fromType`, `time`, `dlLastTime`)
-VALUES (95, '高耗出入库明细下载', 'invGhOrderUrl', '/udiwms/erp/inv/getInvGhResult', 1, '1', '', 'thirdId', 1, 3, 1440, NULL);
+VALUES (95, '高耗出入库明细下载', 'invGhOrderUrl', '/udiwms/erp/inv/getInvGhResult', 1, '1', '', 'thirdId', 1, 3, 1440,
+        NULL);
 INSERT ignore INTO thr_system_detail(`id`, `name`, `key`, `value`, `enabled`, `guideUrl`, `remark`, `thirdSysFk`,
                                      `itrCache`, `fromType`, `time`, `dlLastTime`)
 VALUES (96, '高耗出入库明细下载', 'invGhOrderUrl', '', 1, '1', '', 'thirdId1', 1, 3, NULL, NULL);
@@ -1086,30 +1095,38 @@ CALL Pro_Temp_ColumnWork('inv_product', 'inBatchNo', ' varchar(30)  NULL DEFAULT
 
 INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
                                       `paramType`, `paramExplain`, `updateTime`)
-VALUES (200320, 0, '普耗/收费出库先进先出', 'phfee_batchno_fifo', '1', 1, 0, '第三方普耗/收费出库是否按照批号先进先出先进先出', '2024-03-07 15:20:35');
+VALUES (200320, 0, '普耗/收费出库先进先出', 'phfee_batchno_fifo', '1', 1, 0,
+        '第三方普耗/收费出库是否按照批号先进先出先进先出', '2024-03-07 15:20:35');
 
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailInvBatchNo',
                          'tinyint  NULL DEFAULT NULL COMMENT ''是否允许库存批次号先进先出''', 1);
 
-CALL Pro_Temp_ColumnWork('io_code_temp', 'errUdiCode', 'varchar(255) NULL DEFAULT NULL COMMENT ''去掉错误符号异常UDI码''', 1);
-CALL Pro_Temp_ColumnWork('io_code', 'errUdiCode', 'varchar(255) NULL DEFAULT NULL COMMENT ''去掉错误符号异常UDI码''', 1);
-CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'fromCorp', 'varchar(255) NULL DEFAULT NULL COMMENT ''配置默认往来单位''', 1);
+CALL Pro_Temp_ColumnWork('io_code_temp', 'errUdiCode',
+                         'varchar(255) NULL DEFAULT NULL COMMENT ''去掉错误符号异常UDI码''', 1);
+CALL Pro_Temp_ColumnWork('io_code', 'errUdiCode', 'varchar(255) NULL DEFAULT NULL COMMENT ''去掉错误符号异常UDI码''',
+                         1);
+CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'fromCorp',
+                         'varchar(255) NULL DEFAULT NULL COMMENT ''配置默认往来单位''', 1);
 CALL Pro_Temp_ColumnWork('thr_inv_order', 'fromCorp', 'varchar(255) NULL DEFAULT NULL COMMENT ''配置默认往来单位''', 1);
 
 
 INSERT IGNORE INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
                                       `paramType`, `paramExplain`, `updateTime`)
-VALUES (200321, 0, '收费出库是否过滤高值耗材', 'fee_out_filter_hight', '0', 1, 0, '收费出库是否过滤高值耗材', '2024-03-13 09:50:48');
+VALUES (200321, 0, '收费出库是否过滤高值耗材', 'fee_out_filter_hight', '0', 1, 0, '收费出库是否过滤高值耗材',
+        '2024-03-13 09:50:48');
 
 INSERT IGNORE INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
                                       `paramType`, `paramExplain`, `updateTime`)
-VALUES (200322, 0, '收费出库是否过滤一对多', 'fee_out_filter_cp', '0', 1, 0, '收费出库是否过滤1对多的耗材', '2024-03-13 11:04:02');
+VALUES (200322, 0, '收费出库是否过滤一对多', 'fee_out_filter_cp', '0', 1, 0, '收费出库是否过滤1对多的耗材',
+        '2024-03-13 11:04:02');
 INSERT IGNORE INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
                                       `paramType`, `paramExplain`, `updateTime`)
-VALUES (200323, 0, '收费出库是否自动生成单据', 'fee_out_auto_gen', '0', 1, 0, '收费出库是否自动生成单据', '2024-03-13 11:04:02');
+VALUES (200323, 0, '收费出库是否自动生成单据', 'fee_out_auto_gen', '0', 1, 0, '收费出库是否自动生成单据',
+        '2024-03-13 11:04:02');
 INSERT IGNORE INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
                                       `paramType`, `paramExplain`, `updateTime`)
-VALUES (200325, 0, '高耗出库是否自动生成单据', 'gh_out_auto_gen', '0', 1, 0, '高耗出库是否自动生成单据', '2024-03-20 10:23:42');
+VALUES (200325, 0, '高耗出库是否自动生成单据', 'gh_out_auto_gen', '0', 1, 0, '高耗出库是否自动生成单据',
+        '2024-03-20 10:23:42');
 
 
 CALL Pro_Temp_ColumnWork('io_order', 'fromPatientCode',
@@ -1198,7 +1215,8 @@ CREATE TABLE if not exists `sys_approval_flow_config_mx`
 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 (2090, '审批配置', 1643, 7, 'basic/approval/SysApprovalFlowConfig', 'basic/approval/SysApprovalFlowConfig', NULL, 1,
+VALUES (2090, '审批配置', 1643, 7, 'basic/approval/SysApprovalFlowConfig', 'basic/approval/SysApprovalFlowConfig', NULL,
+        1,
         0, 'C', '0', '0', NULL, NULL, '超级用户', '2024-03-14 09:57:58', NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`,
@@ -1518,7 +1536,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
 VALUES (38001, 19, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL,
-        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL,
+        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL,
+        NULL, NULL,
         NULL, NULL, NULL, NULL, NULL, NULL);
 
 
@@ -1528,7 +1547,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
 VALUES (38002, 25, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL,
-        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL,
+        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL,
+        NULL, NULL,
         NULL, NULL, NULL, NULL, NULL, NULL);
 
 
@@ -1537,7 +1557,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
-VALUES (38003, 25, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL,
+VALUES (38003, 25, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1546,7 +1567,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
 VALUES (38004, 21, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL,
-        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL,
+        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL,
+        NULL, NULL,
         NULL, NULL, NULL, NULL, NULL, NULL);
 
 
@@ -1555,7 +1577,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
-VALUES (38005, 23, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL,
+VALUES (38005, 23, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1564,7 +1587,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
 VALUES (38006, 23, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL,
-        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL,
+        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL,
+        NULL, NULL,
         NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1572,7 +1596,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
-VALUES (38007, 27, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL,
+VALUES (38007, 27, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1581,7 +1606,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
 VALUES (38008, 27, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL,
-        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL,
+        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL,
+        NULL, NULL,
         NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1589,7 +1615,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
-VALUES (38009, 29, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL,
+VALUES (38009, 29, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1598,7 +1625,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
 VALUES (38010, 29, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL,
-        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL,
+        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL,
+        NULL, NULL,
         NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1606,7 +1634,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
-VALUES (38011, 31, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL,
+VALUES (38011, 31, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1615,7 +1644,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
 VALUES (38012, 31, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL,
-        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL,
+        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL,
+        NULL, NULL,
         NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1623,7 +1653,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
-VALUES (38013, 33, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL,
+VALUES (38013, 33, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1632,7 +1663,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
 VALUES (38014, 33, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL,
-        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL,
+        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL,
+        NULL, NULL,
         NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1640,7 +1672,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
-VALUES (38015, 33, '1', 1, 'flowAuditByName', '流程审核人', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL,
+VALUES (38015, 33, '1', 1, 'flowAuditByName', '流程审核人', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1672,7 +1705,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
-VALUES (38018, 35, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL,
+VALUES (38018, 35, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1681,7 +1715,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
 VALUES (38019, 35, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL,
-        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL,
+        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL,
+        NULL, NULL,
         NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1689,7 +1724,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
-VALUES (38021, 37, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL,
+VALUES (38021, 37, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1698,7 +1734,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
 VALUES (38020, 37, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL,
-        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL,
+        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL,
+        NULL, NULL,
         NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1707,7 +1744,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
 VALUES (38022, 39, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL,
-        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL,
+        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL,
+        NULL, NULL,
         NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1715,7 +1753,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
-VALUES (38023, 39, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL,
+VALUES (38023, 39, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1724,7 +1763,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
 VALUES (38024, 42, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL,
-        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL,
+        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL,
+        NULL, NULL,
         NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1732,7 +1772,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
-VALUES (38025, 42, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL,
+VALUES (38025, 42, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1750,7 +1791,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
 VALUES (38027, 44, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL,
-        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL,
+        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL,
+        NULL, NULL,
         NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1758,7 +1800,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
-VALUES (38028, 44, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL,
+VALUES (38028, 44, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1767,7 +1810,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
 VALUES (38029, 46, '1', 1, 'flowStatus', '流程单据状态', 'eltag', '', NULL,
-        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL, NULL, NULL,
+        '{\"1\":\"草稿\",\"2\":\"未审核\",\"3\":\"已审核\",\"4\":\"已拒绝\"}', NULL, NULL, '', NULL, NULL, NULL, NULL,
+        NULL, NULL,
         NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1775,7 +1819,8 @@ INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`,
                                             `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                             `dataFuc`, `isShowXx`)
-VALUES (38030, 46, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL,
+VALUES (38030, 46, '1', 1, 'flowAuditTime', '流程审核时间', 'text', NULL, 1, NULL, NULL, 1, NULL, NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -1797,7 +1842,8 @@ CALL Pro_Temp_ColumnWork('device_change_order_item', 'remark',
 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 (2091, '字典管理', 1, 8, 'dict', 'system/dict/index', NULL, 1, 0, 'C', '0', '0', 'system:dict:list', NULL, '超级用户',
+VALUES (2091, '字典管理', 1, 8, 'dict', 'system/dict/index', NULL, 1, 0, 'C', '0', '0', 'system:dict:list', NULL,
+        '超级用户',
         '2024-03-19 14:58:35', NULL, NULL, NULL);
 
 
@@ -1833,7 +1879,8 @@ VALUES (9, '相关人员类别', 'device_user_type', '0', 'admin', '2024-03-20 1
 insert IGNORE into sys_dict_data
 values (11, 1, '维护员', '1', 'device_user_type', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '维护人员');
 insert IGNORE into sys_dict_data
-values (12, 2, '厂家技术支持', '2', 'device_user_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '厂家技术支持人员');
+values (12, 2, '厂家技术支持', '2', 'device_user_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null,
+        '厂家技术支持人员');
 insert IGNORE into sys_dict_data
 values (13, 3, '操作员', '3', 'device_user_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '操作人员');
 
@@ -1941,7 +1988,8 @@ CALL Pro_Temp_ColumnWork('thr_inv_order', 'genStatus',
                          1);
 
 
-CALL Pro_Temp_ColumnWork('basic_udirel', 'newNeedUpload', 'tinyint NULL DEFAULT NULL COMMENT ''是否系统新增产品需要上传''', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'newNeedUpload',
+                         'tinyint NULL DEFAULT NULL COMMENT ''是否系统新增产品需要上传''', 1);
 
 CALL Pro_Temp_ColumnWork('inv_count_order_detail', 'supId',
                          ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''供应商ID''',
@@ -1981,7 +2029,8 @@ CREATE TABLE IF NOT EXISTS dept_material_category
 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,
+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);
 
 
@@ -1993,7 +2042,8 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
                              `is_frame`, `is_cache`, `menu_type`, `visible`,
                              `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`,
                              `remark`)
-VALUES (2092, '科室医保分类', 1643, 8, 'basic/consume/materialCategory', 'basic/consume/materialCategory', NULL, 1, 0, 'C',
+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);
 
@@ -2032,7 +2082,8 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
                              `is_frame`, `is_cache`, `menu_type`,
                              `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,
+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',
@@ -2460,7 +2511,8 @@ 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);
+CALL Pro_Temp_ColumnWork('device_plan', 'status',
+                         'tinyint    NULL DEFAULT NULL COMMENT ''设备巡检计划状态 ：1：草稿；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`,
@@ -2652,13 +2704,15 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
                              `is_frame`, `is_cache`, `menu_type`,
                              `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`,
                              `update_time`, `remark`)
-VALUES (3680, '待提交合同', 3679, 1, 'purchase/purContract/purContract', 'purchase/purContract/purContract', NULL, 1, 0, 'C',
+VALUES (3680, '待提交合同', 3679, 1, 'purchase/purContract/purContract', 'purchase/purContract/purContract', NULL, 1, 0,
+        'C',
         '0', '0', NULL, NULL, '超级用户', '2023-02-10 16:25:48', 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 (3689, '待审核合同', 3679, 2, 'purchase/purContract/purContractReviewed', 'purchase/purContract/purContractReviewed',
+VALUES (3689, '待审核合同', 3679, 2, 'purchase/purContract/purContractReviewed',
+        'purchase/purContract/purContractReviewed',
         NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-14 11:07:07', 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`,
@@ -2676,19 +2730,22 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
                              `is_frame`, `is_cache`, `menu_type`,
                              `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`,
                              `update_time`, `remark`)
-VALUES (3691, '申购管理', 1703, 13, 'purApply', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-02-08 17:01:50',
+VALUES (3691, '申购管理', 1703, 13, 'purApply', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户',
+        '2023-02-08 17:01: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 (3692, '计划管理', 1703, 14, 'purPlan', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-02-10 14:52:34',
+VALUES (3692, '计划管理', 1703, 14, 'purPlan', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户',
+        '2023-02-10 14:52:34',
         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 (3693, '订单管理', 1703, 15, 'purOrder', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-03-08 10:21:58',
+VALUES (3693, '订单管理', 1703, 15, 'purOrder', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户',
+        '2023-03-08 10:21:58',
         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`,
@@ -2701,7 +2758,8 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
                              `is_frame`,
                              `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`,
                              `update_by`, `update_time`, `remark`)
-VALUES (3695, '新增申购单', 3691, 1, 'purchase/purApply/purApply', 'purchase/purApply/purApply', '{\"pageType\":2}', 1, 0,
+VALUES (3695, '新增申购单', 3691, 1, 'purchase/purApply/purApply', 'purchase/purApply/purApply', '{\"pageType\":2}', 1,
+        0,
         'C',
         '0', '0', 'purchase:purApply:purApply', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
 INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
@@ -2710,7 +2768,8 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
                              `update_by`, `update_time`, `remark`)
 VALUES (3696, '审核申购单', 3691, 2, 'purchase/purApply/pureApplyAudit', 'purchase/purApply/pureApplyAudit',
         '{\"pageType\":2}',
-        1, 0, 'C', '0', '0', 'purchase:purApply:pureApplyAudit', NULL, '超级用户', '2023-02-10 13:54:03', NULL, NULL, NULL);
+        1, 0, 'C', '0', '0', 'purchase:purApply:pureApplyAudit', NULL, '超级用户', '2023-02-10 13:54:03', 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`,
@@ -2723,28 +2782,32 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
                              `is_frame`,
                              `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`,
                              `update_by`, `update_time`, `remark`)
-VALUES (3698, '新增采购计划', 3692, 1, 'purchase/purPlan/purPlan', 'purchase/purPlan/purPlan', '{\"pageType\":2}', 1, 0, 'C',
+VALUES (3698, '新增采购计划', 3692, 1, 'purchase/purPlan/purPlan', 'purchase/purPlan/purPlan', '{\"pageType\":2}', 1, 0,
+        'C',
         '0',
         '0', 'purchase:purPlan:purPlan', NULL, '超级用户', '2023-02-10 16:25:48', 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 (3699, '审核采购计划', 3692, 2, 'purchase/purPlan/purPlanAudit', 'purchase/purPlan/purPlanAudit', '{\"pageType\":2}',
+VALUES (3699, '审核采购计划', 3692, 2, 'purchase/purPlan/purPlanAudit', 'purchase/purPlan/purPlanAudit',
+        '{\"pageType\":2}',
         1, 0,
         'C', '0', '0', NULL, NULL, '超级用户', '2023-02-14 11:07:07', 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 (3700, '查询采购计划', 3692, 3, 'purchase/purPlan/purPlanSearch', 'purchase/purPlan/purPlanSearch', '{\"pageType\":2}',
+VALUES (3700, '查询采购计划', 3692, 3, 'purchase/purPlan/purPlanSearch', 'purchase/purPlan/purPlanSearch',
+        '{\"pageType\":2}',
         1,
         0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-14 11:27:49', 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 (3701, '新增采购订单', 3693, 1, 'purchase/purOrder/purOrder', 'purchase/purOrder/purOrder', '{\"pageType\":2}', 1, 0,
+VALUES (3701, '新增采购订单', 3693, 1, 'purchase/purOrder/purOrder', 'purchase/purOrder/purOrder', '{\"pageType\":2}',
+        1, 0,
         'C',
         '0', '0', NULL, '', '超级用户', '2023-03-08 10:32:25', NULL, NULL, NULL);
 INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
@@ -2765,20 +2828,23 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
                              `is_frame`,
                              `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`,
                              `update_by`, `update_time`, `remark`)
-VALUES (3704, '申购单明细', 3691, 4, 'details', 'purchase/purApply/pureApplySearchDetails', '{\"pageType\":2}', 1, 0, 'C',
+VALUES (3704, '申购单明细', 3691, 4, 'details', 'purchase/purApply/pureApplySearchDetails', '{\"pageType\":2}', 1, 0,
+        'C',
         '0',
         '0', NULL, NULL, '超级用户', '2023-04-04 09:30:27', 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 (3705, '采购计划明细', 3692, 4, 'details', 'purchase/purPlan/purPlanSearchDetails', '{\"pageType\":2}', 1, 0, 'C', '0',
+VALUES (3705, '采购计划明细', 3692, 4, 'details', 'purchase/purPlan/purPlanSearchDetails', '{\"pageType\":2}', 1, 0,
+        'C', '0',
         '0', NULL, NULL, '超级用户', '2023-04-04 09:32:00', 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 (3706, '采购订单明细', 3693, 4, 'details', 'purchase/purOrder/purOrderSearchDetails', '{\"pageType\":2}', 1, 0, 'C',
+VALUES (3706, '采购订单明细', 3693, 4, 'details', 'purchase/purOrder/purOrderSearchDetails', '{\"pageType\":2}', 1, 0,
+        'C',
         '0',
         '0', NULL, NULL, '超级用户', '2023-04-04 09:32:44', NULL, NULL, NULL);
 INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
@@ -2798,7 +2864,8 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
                              `is_frame`,
                              `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`,
                              `update_by`, `update_time`, `remark`)
-VALUES (3709, '待审核合同', 3694, 2, 'purchase/purContract/purContractReviewed', 'purchase/purContract/purContractReviewed',
+VALUES (3709, '待审核合同', 3694, 2, 'purchase/purContract/purContractReviewed',
+        'purchase/purContract/purContractReviewed',
         '{\"pageType\":2}', 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-14 11:07:07', NULL, NULL, NULL);
 INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
                              `is_frame`,
@@ -3366,7 +3433,8 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
                              `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',
+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);
 
@@ -3399,7 +3467,8 @@ VALUES (1724370174626394117, 'DECGJH', '设备采购计划', NULL, 3, 1, NULL, '
 INSERT IGNORE INTO basic_bustype_change(`id`, `originAction`, `originName`, `targetAction`, `type`, `enable`,
                                         `createUser`, `updateUser`, `createTime`, `updateTime`, `remark`, `auditStatus`,
                                         `busAuditStatus`, `targetBusAction`, `beforeTime`, `busBeforeTime`)
-VALUES (1724370174626394118, 'DECGDD', '设备采购订单', NULL, 5, 1, NULL, '1', NULL, '2023-11-14 18:14:22', NULL, 2, 2, NULL,
+VALUES (1724370174626394118, 'DECGDD', '设备采购订单', NULL, 5, 1, NULL, '1', NULL, '2023-11-14 18:14:22', NULL, 2, 2,
+        NULL,
         NULL, NULL);
 
 CALL Pro_Temp_ColumnWork('device_repair', 'repairUserId', 'bigint DEFAULT NULL COMMENT''报修人id''', 1);
@@ -3441,7 +3510,8 @@ INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`,
                               `is_frame`, `is_cache`,
                               `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`,
                               `update_by`, `update_time`, `remark`)
-VALUES (3711, '询价管理', 1673, 2, 'purInquiry', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-02-08 17:01:50',
+VALUES (3711, '询价管理', 1673, 2, 'purInquiry', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户',
+        '2023-02-08 17:01:50',
         NULL, NULL, NULL);
 
 INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`,
@@ -3456,7 +3526,8 @@ INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`,
                               `is_frame`, `is_cache`, `menu_type`,
                               `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`,
                               `update_time`, `remark`)
-VALUES (3713, '待审核询价计划单', 3711, 2, 'purchase/purInquiry/purInquiryReviewed', 'purchase/purInquiry/purInquiryReviewed',
+VALUES (3713, '待审核询价计划单', 3711, 2, 'purchase/purInquiry/purInquiryReviewed',
+        'purchase/purInquiry/purInquiryReviewed',
         '{\"pageType\":1}', 1, 0, 'C',
         '0', '0', 'purchase:purInquiry:purInquiryReviewed', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
 
@@ -3464,7 +3535,8 @@ INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`,
                               `is_frame`, `is_cache`, `menu_type`,
                               `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`,
                               `update_time`, `remark`)
-VALUES (3714, '已审核询价计划单', 3711, 3, 'purchase/purInquiry/purInquiryFinish', 'purchase/purInquiry/purInquiryFinish',
+VALUES (3714, '已审核询价计划单', 3711, 3, 'purchase/purInquiry/purInquiryFinish',
+        'purchase/purInquiry/purInquiryFinish',
         '{\"pageType\":1}', 1, 0, 'C',
         '0', '0', 'purchase:purInquiry:purInquiryFinish', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
 
@@ -3474,7 +3546,8 @@ INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`,
                               `update_time`, `remark`)
 VALUES (3715, '待审核询价报价单', 3711, 5, 'purchase/purInquiryOffer/purInquiryOfferReviewed',
         'purchase/purInquiryOffer/purInquiryOfferReviewed', '{\"pageType\":1}', 1, 0, 'C',
-        '0', '0', 'purchase:purInquiryOffer:purInquiryOfferReviewed', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL,
+        '0', '0', 'purchase:purInquiryOffer:purInquiryOfferReviewed', NULL, '超级用户', '2023-02-08 17:02:19', 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`,
@@ -3491,7 +3564,8 @@ INSERT IGNORE INTO auth_menu (`menu_id`, `menu_name`, `parent_id`, `order_num`,
                               `update_time`, `remark`)
 VALUES (3717, '待报价询价报价单', 3711, 4, 'purchase/purInquiryOffer/purInquiryOffer',
         'purchase/purInquiryOffer/purInquiryOffer', '{\"pageType\":1}', 1, 0, 'C',
-        '0', '0', 'purchase:purInquiryOffer:purInquiryOffer', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
+        '0', '0', 'purchase:purInquiryOffer:purInquiryOffer', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL,
+        NULL);
 
 INSERT IGNORE INTO sys_approval_flow_config(`id`, `type`, `typeName`, `approvalSort`, `createUser`, `createTime`,
                                             `updateUser`, `updateTime`)
@@ -3748,12 +3822,14 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
                              `update_by`, `update_time`, `remark`)
 VALUES (3719, '论证明细', 3718, 1, 'purchase/purApplyArgument/purApplyArgument',
         'purchase/purApplyArgument/purApplyArgument', '{\"pageType\":2}', 1, 0, 'C',
-        '0', '0', 'purchase:purApplyArgument:purApplyArgument', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL);
+        '0', '0', 'purchase:purApplyArgument:purApplyArgument', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL,
+        NULL);
 
 INSERT IGNORE INTO sys_pdf_template(`id`, `name`, `type`, `module`, `param`, `path`, `rowCount`, `qrcodeCount`,
                                     `remark`, `create_time`, `update_time`, `jrxmlPath`,
                                     `bussinessType`, `bussinessStatus`)
-VALUES (6, '设备申购论证单据模板', 2, 0, '', '', 10, 1, '', '2024-05-21 17:04:11', '2024-05-21 17:04:11', '', NULL, NULL);
+VALUES (6, '设备申购论证单据模板', 2, 0, '', '', 10, 1, '', '2024-05-21 17:04:11', '2024-05-21 17:04:11', '', NULL,
+        NULL);
 
 
 
@@ -3792,7 +3868,8 @@ INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow
                                                `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
                                                `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                                `dataFuc`, `isShowXx`)
-VALUES (41779, 94, '2', 1, 'confirmDateRange', '发票确认时间', 'datePickera', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+VALUES (41779, 94, '2', 1, 'confirmDateRange', '发票确认时间', 'datePickera', NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'requireScanCode',
@@ -3805,7 +3882,8 @@ INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow
                                                `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
                                                `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                                `dataFuc`, `isShowXx`)
-VALUES (41782, 68, '2', 1, 'invoiceEncode', '发票号', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+VALUES (41782, 68, '2', 1, 'invoiceEncode', '发票号', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
@@ -3813,7 +3891,8 @@ INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow
                                                `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
                                                `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
                                                `dataFuc`, `isShowXx`)
-VALUES (41780, 94, '2', 1, 'corpName', '供应商', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+VALUES (41780, 94, '2', 1, 'corpName', '供应商', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
                                                `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
@@ -3847,7 +3926,8 @@ ALTER TABLE sup_evaluate_detail
 
 
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'codeCheck',
-                         'tinyint    NULL DEFAULT NULL COMMENT '' 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品''', 1);
+                         'tinyint    NULL DEFAULT NULL COMMENT '' 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品''',
+                         1);
 
 CALL Pro_Temp_ColumnWork('basic_products', 'bzgg',
                          'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''包装规格''',
@@ -4035,7 +4115,8 @@ INSERT IGNORE INTO `basic_bussiness_type`(`id`, `mainAction`, `action`, `name`,
                                           `editType`, `inPreInBack`, `deptNoInvType`, `vailPrescribe`, `inputSick`,
                                           `groupBuySplit`, `vailInvBatchNo`, `vailProductAttributes`, `devInType`,
                                           `vailHcType`, `requireScanCode`, `codeCheck`)
-VALUES (1816739249285963776, 'WareHouseOut', 'SC72197936495755', '科室拆零出库', 1, '', '', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+VALUES (1816739249285963776, 'WareHouseOut', 'SC72197936495755', '科室拆零出库', 1, '', '', 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0,
         0, 0, 0, 0, 0, 0, 0, 4, '', 0, 0, 0, 1, '2024-07-26 15:36:05', NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 0, 0,
         0, NULL, NULL, 0, 0, NULL, 0, 0, NULL, NULL, '1', 0, 0, NULL, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,
         NULL, 1, NULL, 0, 999, 0, 0, 0, 0, 0, 2, 1, 0, 0, 0, NULL, 0, NULL, 0, NULL, b'0', NULL);
@@ -4045,7 +4126,8 @@ INSERT IGNORE INTO `basic_corp`(`id`, `erpId`, `name`, `spell`, `addr`, `status`
                                 `creditNo`, `thirdId`, `thirdId1`, `thirdId2`, `thirdId3`, `thirdId4`, `thirdName`,
                                 `thirdName1`, `thirdName2`, `thirdName3`, `thirdName4`, `corpType`, `outType`,
                                 `createUser`, `createTime`, `updateUser`, `updateTime`, `remark`, `adSickNum`)
-VALUES (1816742449581842432, '72198012799726', '拆零预出库', 'clyck', '', NULL, '', '', '', '000', NULL, NULL, NULL, NULL,
+VALUES (1816742449581842432, '72198012799726', '拆零预出库', 'clyck', '', NULL, '', '', '', '000', NULL, NULL, NULL,
+        NULL,
         NULL, NULL, NULL, NULL, NULL, NULL, 4, 1, '', NULL, '', '2024-07-26 15:48:48', '', NULL);
 
 
@@ -4902,7 +4984,8 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
                              `is_frame`,
                              `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`,
                              `update_by`, `update_time`, `remark`)
-VALUES (6001, '医保上传统计', 5210, 999, 'inout/split/tag/stats', 'collect/CollectOrderStatsNew', NULL, 1, 0, 'C', '0', '0',
+VALUES (6001, '医保上传统计', 5210, 999, 'inout/split/tag/stats', 'collect/CollectOrderStatsNew', NULL, 1, 0, 'C', '0',
+        '0',
         NULL, '', '超级用户', '2024-11-18 17:46:08', NULL, NULL, NULL);
 
 
@@ -4991,3 +5074,28 @@ CALL Pro_Temp_ColumnWork('io_collect_order_biz_origin', 'checkCode',
 #                          1);
 
 
+CREATE TABLE IF NOT EXISTS `io_collect_led_group`
+(
+    `id`         bigint                                                        NOT NULL COMMENT '主键id',
+    `mac`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '标签id',
+    `ledNum`     int                                                           NULL DEFAULT NULL COMMENT 'led灯编号',
+    `red`        tinyint                                                       NULL DEFAULT NULL COMMENT '红灯',
+    `orange`     tinyint                                                       NULL DEFAULT NULL COMMENT '橘灯',
+    `blue`       tinyint                                                       NULL DEFAULT NULL COMMENT '蓝色',
+    `green`      tinyint                                                       NULL DEFAULT NULL COMMENT '绿色',
+    `remark`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
+    `createTime` datetime                                                      NULL DEFAULT NULL,
+    `updateTime` datetime                                                      NULL DEFAULT NULL,
+    `createUser` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  NULL DEFAULT NULL,
+    `updateUser` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  NULL DEFAULT NULL,
+    `timeout`    int                                                           NULL DEFAULT NULL COMMENT '默认0 常亮，不自动灭。timeout>0,(timeout)秒后自动灭。',
+    `ledMode`    tinyint                                                       NULL DEFAULT NULL COMMENT '亮灯模式 0灭灯，1常亮',
+    `relId`      bigint                                                        NULL DEFAULT NULL COMMENT '产品id',
+    `nameCode`   varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  NULL DEFAULT NULL,
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 8052
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci
+  ROW_FORMAT = Dynamic;
+