新增是否组套，出入库明细改造，

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -217,7 +217,7 @@ public class BasicOrderPrintController {
                 for (IoCodeEntity obj : ioCodeEntityList) {
                     //查询业务表
                     for (IoOrderDetailBizEntity ioObj : ioOrderDetailBizEntityList) {
-                        if (StrUtil.trimToEmpty(ioObj.getBatchNo()).equals(StrUtil.trimToEmpty(obj.getBatchNo())) && ioObj.getBindRlFk().equals(obj.getRelId())) {
+                        if (StrUtil.nullToEmpty(ioObj.getBatchNo()).equals(StrUtil.nullToEmpty(obj.getBatchNo())) && ioObj.getBindRlFk().equals(obj.getRelId())) {
                             ioOrderDetailBizEntity = ioObj;
                             break;
                         }

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -738,6 +738,7 @@ public class UdiRelevanceController extends BaseController {
         udiRelevanceEntity.setPurType(udiProductEntity.getPurType());
         udiRelevanceEntity.setAttributeType(udiProductEntity.getAttributeType());
         udiRelevanceEntity.setHcType(udiProductEntity.getHcType());
+        udiRelevanceEntity.setIsStack(udiProductEntity.getIsStack());
         udiRelevanceEntity.setUpdateTime(new Date());
         boolean b = udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
         if (udiProductEntity.getRelSupId() != null) {

src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java

@@ -241,8 +241,8 @@ public class ThrProductsAddDiController {
                     udiRelevanceEntity.setHcType(thrProductsAddDiEntity.getHcType());
                     udiRelevanceEntity.setId(udiRelIdFk);
                     udiRelevanceEntity.setModifyTime(new Date());
-                    udiRelevanceEntity.setThirdId(udiProductEntity.getCode());
+//                    udiRelevanceEntity.setThirdId(udiProductEntity.getCode());
-                    udiRelevanceEntity.setMainId(udiProductEntity.getCode());
+//                    udiRelevanceEntity.setMainId(udiProductEntity.getCode());
                     udiRelevanceEntity.setUpdateTime(new Date());
                     udiRelevanceEntity.setUuid(udiProductEntity.getUuid());
                     udiRelevanceEntity.setSupName(thrProductsAddDiEntity.getSupName());

src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java

@@ -167,5 +167,5 @@ public class UdiProductEntity {
      */
     private String bzgg;
 
-
+    private Boolean isStack;
 }

src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java

@@ -194,4 +194,10 @@ public class UdiRelevanceEntity {
     @TableField(value = "newNeedUpload")
     private Boolean newNeedUpload;
 
+    /**
+     * 是否组套
+     */
+    @TableField(value = "isStack")
+    private Boolean isStack;
+
 }

src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java

@@ -314,6 +314,9 @@ public class ThrProductsAddDiEntity {
     @TableField(value = "hcType")
     private Integer hcType;
 
+    @TableField(value = "isStack")
+    private Integer isStack;
+
     /**
      * 1第三方2自增
      */

src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java

@@ -316,7 +316,6 @@ public class BussinessTypeSaveRequest {
      */
     private Integer vailHcType;
 
-
     /**
      * 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
      */

src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java

@@ -63,7 +63,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
      * 产品分类高值 ：1：高值耗材；2.普通耗材
      */
     private Integer hcType;
-
+    private Boolean isStack;
     private String corpId;
     private String billType;
     private String manufactory;
@@ -91,7 +91,6 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
      * 校验耗材类型 ：0:不耗材；1:高值耗材；2:无普通耗材
      */
     private Integer vailHcType;
-
     /**
      * 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
      */

src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java

@@ -59,7 +59,7 @@ public class FilterUdiInfoRequest extends ListPageRequest {
     private Integer hcType;
     private String corpId;
     private String billType;
-
+    private Boolean isStack;
     private String ybbm;
     private String sptm;
     private String unionFilterStr;//产品名称，规格，批文，生产厂家联合查询

src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java

@@ -61,7 +61,7 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private Integer hcType;
     private String corpId;
     private String billType;
-
+    private Boolean isStack;
     private String ybbm;
     private String sptm;
     private String unionFilterStr;//产品名称，规格，批文，生产厂家联合查询

src/main/java/com/glxp/api/req/basic/SupplementRequest.java

@@ -34,7 +34,7 @@ public class SupplementRequest {
      */
     private Integer hcType;
 
-
+    private Boolean isStack;
     /**
      * 一级分类名称(学科，品名）
      */

src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java

@@ -47,7 +47,7 @@ public class UdiRelevanceRequest {
     private String originUuid;
     private String price;
     private String modifyTime; //修改时间
-
+    private Boolean isStack;
     private Boolean useMuti;      //是否多次使用
     private Integer useNum;     //最小包装单元可使用次数
 
@@ -56,7 +56,6 @@ public class UdiRelevanceRequest {
     //是否集采产品
     private Integer isDateBy;
     private Boolean needCert;           //是否需要资质材料
-
     private String certIdFk;
 
 

src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java

@@ -45,7 +45,7 @@ public class UdiRelevanceSaveRequest {
     private String createUser;
     private String updateUser;
     private String remark;
-
+    private Boolean isStack;
     //UdiInfoEntity
     private String originUuid;
     private String nameCode;
@@ -114,7 +114,6 @@ public class UdiRelevanceSaveRequest {
     private Boolean groupBuy;           //是否集采产品
     private Boolean needCert;           //是否需要资质材料
     private String certIdFk;
-
     /**
      * 一级分类名称(学科，品名）
      */

src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java

@@ -50,6 +50,10 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
     private String templateId;
     private String manufacturer;
     private String zczbhhzbapzbh;
+
+    private String invCode;
+    private Boolean isStack;
+    private String invoiceEncode;
     private List<String> actions;
     private List<IoOrderDetailResultResponse> list;
 }

src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsExcelVo.java

@@ -57,6 +57,6 @@ public class AddThrDiProductsExcelVo {
 //    private String hcType;
 //    @ExcelProperty("收费码")
 //    private String basicPrductRemak1;
-
+private Boolean isStack;
 
 }

src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java

@@ -61,7 +61,7 @@ public class AddThrDiProductsRequest {
      */
     private Integer hcType;
 
-
+    private Boolean isStack;
 
     /**
      * 一级分类名称(学科，品名）

src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java

@@ -40,7 +40,7 @@ public class FilterThrProductsRequest extends ListPageRequest {
      * 产品分类高值 ：1：高值耗材；2.普通耗材
      */
     private Integer hcType;
-
+    private Boolean isStack;
     private List<String> codes;
     private Integer checkStatus;
     private String customerId;

src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java

@@ -96,4 +96,6 @@ public class CompanyProductRelevanceResponse {
     private String basicPrductRemak8;
 
     private String cphhhbh;
+
+    private Boolean isStack;
 }

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -145,6 +145,7 @@ public class UdiRelevanceResponse {
      */
     private Boolean newNeedUpload;
 
+    private Boolean isStack;
 
 
     /**
@@ -182,7 +183,6 @@ public class UdiRelevanceResponse {
      */
     private String bzgg;
 
-
     public int getBhzxxsbzsl() {
         if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
             return 1;

src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java

@@ -139,6 +139,6 @@ public class UdiRlSupResponse {
      * 产品分类高值 ：1：高值耗材；2.普通耗材
      */
     private Integer hcType;
-
+    private Boolean isStack;
     private Integer requireScanCode;
 }

src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java

@@ -186,4 +186,7 @@ public class IoOrderDetailResultResponse {
     private BigDecimal amount;
 
 
+    private String invoiceEncode;
+
+
 }

src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java

@@ -109,7 +109,7 @@ public class UdiInfoResponse {
     private String catalogname3;
 
     private String matrial;
-
+    private Boolean isStack;
 
     public Integer getId() {
         return id;

src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_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_spms_pt2?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -979,7 +979,7 @@
                  updateTime, modifyTime,
                  createUser,
                  updateUser,
-                 remark, useExpireTime, dispatch, groupBuy, needCert, newNeedUpload)
+                 remark, useExpireTime, dispatch, groupBuy, needCert, newNeedUpload, isStack)
         values (#{id},
                 #{uuid},
                 #{mainId},
@@ -1002,7 +1002,7 @@
                 #{modifyTime},
                 #{createUser},
                 #{updateUser},
-                #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}, #{newNeedUpload})
+                #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}, #{newNeedUpload}, #{isStack})
     </insert>
 
     <insert id="insertUdiRelevanceignore" keyProperty="id"
@@ -1016,7 +1016,7 @@
                  updateTime, modifyTime,
                  createUser,
                  updateUser,
-                 remark, useExpireTime, dispatch, groupBuy, needCert)
+                 remark, useExpireTime, dispatch, groupBuy, needCert,isStack)
         values (#{id},
                 #{uuid},
                 #{mainId},
@@ -1039,7 +1039,7 @@
                 #{modifyTime},
                 #{createUser},
                 #{updateUser},
-                #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert})
+                #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert},#{isStack})
     </insert>
 
     <delete id="deleteById" parameterType="Map">
@@ -1168,6 +1168,10 @@
             <if test="needCert != null">
                 needCert=#{needCert},
             </if>
+            <if test="isStack != null">
+                isStack=#{isStack},
+            </if>
+
         </trim>
         WHERE id = #{id}
     </update>
@@ -1197,7 +1201,7 @@
                  updateTime, modifyTime,
                  createUser,
                  updateUser,
-                 remark, useExpireTime, dispatch, groupBuy, needCert)
+                 remark, useExpireTime, dispatch, groupBuy, needCert,isStack)
                 values
 
         <foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
@@ -1223,7 +1227,7 @@
              #{item.modifyTime},
              #{item.createUser},
              #{item.updateUser},
-             #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert})
+             #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}, #{item.needCert},#{item.isStack})
         </foreach>
     </insert>
 

src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml

@@ -52,7 +52,7 @@
                basic_udirel.lowStockNum,
                basic_udirel.overStockNum,
                basic_udirel.recentDateTime,
-               basic_udirel.isDateBy,
+               basic_udirel.isDateBy,basic_udirel.isStack,
                bht.name             classifyName,
                basic_products.id as PRId,
                basic_products.originUuid,

src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml

@@ -26,11 +26,15 @@
     <select id="filterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailResultResponse">
         SELECT a2.*,
         a1.mainAction,
+        GROUP_CONCAT(ioi.invoiceEncode ORDER BY ioi.invoiceEncode SEPARATOR ',') as invoiceCodes,
         b1.NAME AS                                                               fromCorpName,
         (SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = a1.action) billTypeName
         FROM io_order_detail_result a2
         LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk
         LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp
+        left join basic_udirel bu on a2.bindRlFk = bu.id
+        left join io_order_invoice ioi on a1.billNo = ioi.orderIdFk
+
         <where>
             a1.status = 7
             <if test="orderIdFk != null and orderIdFk != ''">
@@ -42,6 +46,15 @@
             <if test="nameCode != null and nameCode != ''">
                 AND a2.nameCode = #{nameCode}
             </if>
+            <if test="isStack != null">
+                AND bu.isStack = #{isStack}
+            </if>
+            <if test="invCode != null and invCode != ''">
+                AND a1.invCode = #{invCode}
+            </if>
+            <if test="invoiceEncode != null and invoiceEncode != ''">
+                AND ioi.invoiceEncode = #{invoiceEncode}
+            </if>
             <if test="spec != null and spec != ''">
                 AND a2.spec like concat('%', #{spec}, '%')
             </if>
@@ -76,6 +89,7 @@
                 </foreach>
             </if>
         </where>
+        group by a2.id
     </select>
 
 

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

@@ -872,3 +872,6 @@ END;
 
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailHcType',
                          'tinyint    NULL DEFAULT NULL COMMENT '' 校验耗材类型 ：0:不耗材；1:高值耗材；2:无普通耗材''', 1);
+
+
+CALL Pro_Temp_ColumnWork('basic_udirel', 'isStack', 'tinyint', 1);

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

@@ -2,7 +2,8 @@
 #
 #
 
-CREATE TABLE IF NOT EXISTS `device_info` (
+CREATE TABLE IF NOT EXISTS `device_info`
+(
     `deviceCode`                    varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '设备编码',
     `deptCode`                      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '部门编码',
     `status`                        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '1.正常，2变更归属中，3.维修申请中  4.维修中  6.销毁/报废',
@@ -390,7 +391,8 @@ DEFAULT CHARSET=utf8mb4
   COLLATE = utf8mb4_0900_ai_ci COMMENT ='设备变更日志表'
   ROW_FORMAT = Dynamic;
 
-CREATE TABLE IF NOT EXISTS `device_change_order` (
+CREATE TABLE IF NOT EXISTS `device_change_order`
+(
     `orderId`         bigint                                                        NOT NULL COMMENT '编码',
     `type`            varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'add:新增入库，change:变更归属',
     `status`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '1.待目标部门接收 ，2.完成(目标确认接收) ，3.目标部门拒收，4.取消',
@@ -426,7 +428,6 @@ CALL Pro_Temp_ColumnWork('sync_data_set', 'deviceRepairApply',
 
 
 
-
 CALL Pro_Temp_ColumnWork('device_repair', 'repairDescription',
                          ' varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT''维修内容''',
                          1);
@@ -458,8 +459,6 @@ ROW_FORMAT=Dynamic;
 
 
 
-
-
 CALL Pro_Temp_ColumnWork('device_check_item_dict', 'type',
                          ' tinyint  NULL DEFAULT NULL COMMENT ''项目字典类型 1:巡检项目;2:保养项目''',
                          1);
@@ -590,7 +589,8 @@ CREATE TABLE IF NOT EXISTS `device_upkeep_detail_item`
   COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备保养项目'
   ROW_FORMAT = Dynamic;
 
-CREATE TABLE IF NOT EXISTS `thr_medical_product_category` (
+CREATE TABLE IF NOT EXISTS `thr_medical_product_category`
+(
     `id`                      int NOT NULL AUTO_INCREMENT,
     `materialId`              int          DEFAULT NULL COMMENT '物资分类编码',
     `materialName`            varchar(255) DEFAULT NULL COMMENT '物资分类的名称',
@@ -601,7 +601,10 @@ CREATE TABLE IF NOT EXISTS `thr_medical_product_category` (
     `managementType`          int          DEFAULT NULL COMMENT '管理类别 ',
     `materialCode`            varchar(255) DEFAULT NULL COMMENT '标识',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=160 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='医疗产品分类标识';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 160
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci COMMENT ='医疗产品分类标识';
 
 CALL Pro_Temp_ColumnWork('basic_products', 'requireScanCode',
                          'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要扫码 1是；0否''',
@@ -668,23 +671,109 @@ INSERT ignore INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `
 VALUES (2013, '新增入院产品', 1819, 3, 'supplier/products/supProductsAddDi', 'supplier/products/supProductsAddDi',
         NULL, 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-17 10:04:07', NULL, NULL, NULL);
 
-UPDATE sys_custom_config SET `businessType` = 'supProductsAddDi', `remark` = '新增入院产品', `type` = '1', `handleChangeFuc` = NULL WHERE `id` = 22;
+UPDATE sys_custom_config
-INSERT ignore INTO sys_custom_config(`id`, `businessType`, `remark`, `type`, `handleChangeFuc`) VALUES (84, 'supProductsOptinDi', '选入入院产品', '1', NULL);
+SET `businessType`    = 'supProductsAddDi',
-
+    `remark`          = '新增入院产品',
-
+    `type`            = '1',
-INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2105, 84, '2', 1, 'code', 'DI产品标识', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+    `handleChangeFuc` = NULL
-INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2106, 84, '2', 1, 'name', '物资名称', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+WHERE `id` = 22;
-INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2107, 84, '2', 1, 'spec', '规格型号', '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(`id`, `businessType`, `remark`, `type`, `handleChangeFuc`)
-INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2108, 84, '2', 1, 'registerNo', '注册证编号', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+VALUES (84, 'supProductsOptinDi', '选入入院产品', '1', NULL);
-INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2109, 84, '2', 1, 'checkStatus', '审核状态', 'select', NULL, NULL, '{\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"未通过\",\"\":\"全部\"}', 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`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2110, 84, '1', 1, 'index', '序号', 'id', 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`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2111, 84, '1', 1, 'code', '物资产品标识', 'text', NULL, NULL, 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`,
-INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2112, 84, '1', 1, 'name', '物资名称', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+                                            `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
-INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2113, 84, '1', 1, 'spec', '规格型号', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
-INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2114, 84, '1', 1, 'ylqxzcrbarmc', '医疗器械注册人', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
-INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2115, 84, '1', 1, 'registerNo', '注册证编号', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+                                            `dataFuc`, `isShowXx`)
-INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2116, 84, '1', 1, 'status', '审核状态', 'laber', '', NULL, '{\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"未通过\"}', NULL, 1, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+VALUES (2105, 84, '2', 1, 'code', 'DI产品标识', 'input', 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`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2117, 84, '1', 1, 'oper', '操作', 'button', '', NULL, '', 120, NULL, '[{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"详情\",\"clickFuc\":\"detail\",\"disabledFuc\":\"\",\"hasPermi\":\"\"},{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"删除\",\"clickFuc\":\"deleteProduct\",\"disabledFuc\":\"row.status == 2\",\"hasPermi\":\"\"}]', NULL, 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`,
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                            `dataFuc`, `isShowXx`)
+VALUES (2106, 84, '2', 1, 'name', '物资名称', '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`,
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                            `dataFuc`, `isShowXx`)
+VALUES (2107, 84, '2', 1, 'spec', '规格型号', '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`,
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                            `dataFuc`, `isShowXx`)
+VALUES (2108, 84, '2', 1, 'registerNo', '注册证编号', '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`,
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                            `dataFuc`, `isShowXx`)
+VALUES (2109, 84, '2', 1, 'checkStatus', '审核状态', 'select', NULL, NULL,
+        '{\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"未通过\",\"\":\"全部\"}', 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`,
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                            `dataFuc`, `isShowXx`)
+VALUES (2110, 84, '1', 1, 'index', '序号', 'id', 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`,
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                            `dataFuc`, `isShowXx`)
+VALUES (2111, 84, '1', 1, 'code', '物资产品标识', 'text', NULL, NULL, 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`,
+                                            `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                            `dataFuc`, `isShowXx`)
+VALUES (2112, 84, '1', 1, 'name', '物资名称', 'text', NULL, NULL, 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`,
+                                            `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                            `dataFuc`, `isShowXx`)
+VALUES (2113, 84, '1', 1, 'spec', '规格型号', 'text', NULL, NULL, 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`,
+                                            `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                            `dataFuc`, `isShowXx`)
+VALUES (2114, 84, '1', 1, 'ylqxzcrbarmc', '医疗器械注册人', 'text', NULL, NULL, 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`,
+                                            `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                            `dataFuc`, `isShowXx`)
+VALUES (2115, 84, '1', 1, 'registerNo', '注册证编号', 'text', NULL, NULL, 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`,
+                                            `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                            `dataFuc`, `isShowXx`)
+VALUES (2116, 84, '1', 1, 'status', '审核状态', 'laber', '', NULL, '{\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"未通过\"}', NULL, 1,
+        '', 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`,
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                            `dataFuc`, `isShowXx`)
+VALUES (2117, 84, '1', 1, 'oper', '操作', 'button', '', NULL, '', 120, NULL,
+        '[{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"详情\",\"clickFuc\":\"detail\",\"disabledFuc\":\"\",\"hasPermi\":\"\"},{\"type\":\"text\",\"size\":\"small\",\"style\":\"\",\"name\":\"删除\",\"clickFuc\":\"deleteProduct\",\"disabledFuc\":\"row.status == 2\",\"hasPermi\":\"\"}]',
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 
 CALL Pro_Temp_ColumnWork('thr_products_add_di', 'sourceType',
@@ -695,15 +784,67 @@ CALL Pro_Temp_ColumnWork('thr_products_add_di', 'sourceType',
 CALL Pro_Temp_ColumnWork('thr_products_add_di', 'internalMaterialCode',
                          'varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''内部物资编码''',
                          1);
-UPDATE sys_custom_config_detail SET `configId` = 22, `type` = '1', `isShow` = 1, `columnName` = 'internalMaterialCode', `columnDesc` = '内部物资编码', `columnType` = 'text', `colorRule` = NULL, `sort` = NULL, `lableRule` = NULL, `width` = NULL, `tooltip` = 1, `buttonRule` = NULL, `number` = NULL, `lineNumber` = NULL, `clickFuc` = NULL, `size` = NULL, `style` = NULL, `disabled` = NULL, `checkRules` = NULL, `inputType` = NULL, `disabledFuc` = NULL, `expression` = NULL, `dataFuc` = NULL, `isShowXx` = NULL WHERE `id` = 275;
+UPDATE sys_custom_config_detail
-
+SET `configId`    = 22,
-INSERT ignore INTO sys_custom_config_detail (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2118, 32, '1', 1, 'internalMaterialCode', '内部物资编码', 'text', NULL, NULL, NULL, NULL, 1, NULL, 99, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+    `type`        = '1',
-INSERT ignore INTO sys_param_config (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (1070, 0, '开启内部物资编码', 'internal_material_code', '1', 1, 0, '开启内部物资编码 0：否；1：是', NULL);
+    `isShow`      = 1,
-INSERT ignore INTO  sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2019, 18, '2', 1, 'mainId', '内部物资编码', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+    `columnName`  = 'internalMaterialCode',
-INSERT ignore INTO  sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2020, 22, '2', 1, 'internalMaterialCode', '内部物资编码', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+    `columnDesc`  = '内部物资编码',
-
+    `columnType`  = 'text',
-INSERT ignore INTO  sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2021, 8, '2', 1, 'mainIdLike', '内部物资编码', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+    `colorRule`   = NULL,
+    `sort`        = NULL,
+    `lableRule`   = NULL,
+    `width`       = NULL,
+    `tooltip`     = 1,
+    `buttonRule`  = NULL,
+    `number`      = NULL,
+    `lineNumber`  = NULL,
+    `clickFuc`    = NULL,
+    `size`        = NULL,
+    `style`       = NULL,
+    `disabled`    = NULL,
+    `checkRules`  = NULL,
+    `inputType`   = NULL,
+    `disabledFuc` = NULL,
+    `expression`  = NULL,
+    `dataFuc`     = NULL,
+    `isShowXx`    = NULL
+WHERE `id` = 275;
+
+INSERT ignore INTO sys_custom_config_detail (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
+                                             `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
+                                             `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                             `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                             `dataFuc`, `isShowXx`)
+VALUES (2118, 32, '1', 1, 'internalMaterialCode', '内部物资编码', 'text', NULL, NULL, NULL, NULL, 1, NULL, 99, NULL, NULL,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT ignore INTO sys_param_config (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`,
+                                     `paramType`, `paramExplain`, `updateTime`)
+VALUES (1070, 0, '开启内部物资编码', 'internal_material_code', '1', 1, 0, '开启内部物资编码 0：否；1：是', NULL);
+INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`,
+                                            `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`,
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                            `dataFuc`, `isShowXx`)
+VALUES (2019, 18, '2', 1, 'mainId', '内部物资编码', '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`,
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                            `dataFuc`, `isShowXx`)
+VALUES (2020, 22, '2', 1, 'internalMaterialCode', '内部物资编码', '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`,
+                                            `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`,
+                                            `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`,
+                                            `dataFuc`, `isShowXx`)
+VALUES (2021, 8, '2', 1, 'mainIdLike', '内部物资编码', 'input', 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', 'codeCheck',
                          'tinyint    NULL DEFAULT NULL COMMENT '' 是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品''', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'isStack', 'tinyint', 1);