物料类型字典数据sql维护，机构状态枚举优化

base/sql/bsl_sql/bsl_ddl_v1.0.0.sql

@@ -65,13 +65,13 @@ CREATE TABLE `base_sku`  (
   `sku` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '物料编号',
   `sku_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '物料名称',
   `sku_specs` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '规格',
-  `sku_packaging_specs` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '包装规格',
-  `sku_allergen_information` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '过敏原信息',
+  `sku_packaging_specs` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '包装规格',
+  `sku_allergen_information` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '过敏原信息',
   `sku_uom` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '计量单位',
   `sku_shelflife` int(11) NULL DEFAULT NULL COMMENT '有效期(天)',
   `sku_qc_time` double(4, 1) NULL DEFAULT NULL COMMENT '质检周期（复验期）',
   `sku_qc_check` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT '是否质检 Y:质检 N:不质检',
-  `sku_type` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '产品类型',
+  `sku_type` int(10) UNSIGNED ZEROFILL NULL DEFAULT NULL COMMENT '产品类型',
   `sku_desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '描述',
   `sku_tare` decimal(18, 8) NULL DEFAULT NULL COMMENT '皮重',
   `sku_grossweight` decimal(18, 8) NULL DEFAULT NULL COMMENT '毛重',
@@ -83,15 +83,15 @@ CREATE TABLE `base_sku`  (
   `sku_width` decimal(18, 8) NULL DEFAULT NULL COMMENT '宽',
   `sku_qc_rule` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '质检规则',
   `sku_manufacturer` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '生产企业',
-  `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
+  `creator` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者',
   `create_date` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
-  `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
+  `updater` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者',
   `update_date` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
-  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`sku_customer_id`, `sku`) USING BTREE,
   INDEX `base_sku_index1`(`sku_customer_id`, `sku`) USING BTREE,
   INDEX `base_sku_index2`(`sku_type`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '物料信息' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '物料信息' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- 客户/供应商表
@@ -101,13 +101,12 @@ CREATE TABLE `base_org`  (
   `id` bigint(32) NOT NULL COMMENT '主键',
   `org_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户/供应商编码',
   `org_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户/供应商全称',
-  `org_status` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户/供应商状态 Y:启用 N:禁用',
+  `org_status` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '客户/供应商状态 0:启用且合格 1:启用且不合格 2:禁用',
   `org_address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '通信地址',
   `org_contacts` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系人',
   `org_phone_num` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系电话',
   `org_accounts_bank` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '开户行',
   `org_credit_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '企业统一代码',
-  `org_isQualified` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否合格供应商',
   `org_business_license` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '营业执照',
   `org_production_license` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '生产许可证',
   `org_business_certificate` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '经营许可证',

base/sql/bsl_sql/bsl_dml_v1.0.0.sql

@@ -7,3 +7,14 @@ INSERT INTO `warewms-baicuilai`.`base_sku_type`(`item_code`, `item_name`, `paren
 INSERT INTO `warewms-baicuilai`.`base_sku_type`(`item_code`, `item_name`, `parent_code`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (6, '原料过敏', '0', '0', '', '2023-11-09 16:01:29', '', NULL, NULL);
 INSERT INTO `warewms-baicuilai`.`base_sku_type`(`item_code`, `item_name`, `parent_code`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (7, '空托', '0', '0', '', '2023-11-09 16:01:50', '', NULL, NULL);
 INSERT INTO `warewms-baicuilai`.`base_sku_type`(`item_code`, `item_name`, `parent_code`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (8, '低耗', '0', '0', '', '2023-11-09 16:02:14', '', NULL, NULL);
+
+INSERT INTO `warewms-baicuilai`.`sys_dict_type`(`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (119, '物料类型', 'sku_type', '0', 'admin', '2023-11-09 17:50:41', '', NULL, '物料类型');
+
+INSERT INTO `warewms-baicuilai`.`sys_dict_data`(`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (181, 0, '成品', '1', 'sku_type', NULL, 'default', 'N', '0', 'admin', '2023-11-09 17:53:59', '', NULL, NULL);
+INSERT INTO `warewms-baicuilai`.`sys_dict_data`(`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (182, 0, '包材', '2', 'sku_type', NULL, 'default', 'N', '0', 'admin', '2023-11-09 17:55:08', '', NULL, NULL);
+INSERT INTO `warewms-baicuilai`.`sys_dict_data`(`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (183, 0, '食品添加剂', '3', 'sku_type', NULL, 'default', 'N', '0', 'admin', '2023-11-09 17:55:26', '', NULL, NULL);
+INSERT INTO `warewms-baicuilai`.`sys_dict_data`(`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (184, 0, '食品添加剂过敏原区', '4', 'sku_type', NULL, 'default', 'N', '0', 'admin', '2023-11-09 17:55:45', '', NULL, NULL);
+INSERT INTO `warewms-baicuilai`.`sys_dict_data`(`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (185, 0, '原料', '5', 'sku_type', NULL, 'default', 'N', '0', 'admin', '2023-11-09 17:55:59', '', NULL, NULL);
+INSERT INTO `warewms-baicuilai`.`sys_dict_data`(`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (186, 0, '原料过敏', '6', 'sku_type', NULL, 'default', 'N', '0', 'admin', '2023-11-09 17:56:13', '', NULL, NULL);
+INSERT INTO `warewms-baicuilai`.`sys_dict_data`(`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (187, 0, '空托', '7', 'sku_type', NULL, 'default', 'N', '0', 'admin', '2023-11-09 17:56:25', '', NULL, NULL);
+INSERT INTO `warewms-baicuilai`.`sys_dict_data`(`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (188, 0, '低耗', '8', 'sku_type', NULL, 'default', 'N', '0', 'admin', '2023-11-09 17:56:37', '', NULL, NULL);

warewms-base/src/main/java/com/ruoyi/base/constant/type/BizEnum.java

@@ -35,13 +35,18 @@ public class BizEnum {
      */
     public enum OrgStatus implements IBaseEnum<String> {
         /**
-         * 启用
+         * 启用不合格
          */
-        Enable("0"),
+        ENABLE_NOT_QUALIFIED("2"),
+        /**
+         * 启用且合格
+         */
+        ENABLE_ISQUALIFIED("1"),
+
         /**
          * 禁用
          */
-        Disable("1");
+        DISABLE("0");
 
         private final String code;