Pre Merge pull request !408 from zhuobaoji/dev

pom.xml

@@ -31,6 +31,8 @@
         <commons.fileupload.version>1.4</commons.fileupload.version>
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>
+        <log4j2.version>2.17.1</log4j2.version>
+        <oracle.version>19.3.0.0</oracle.version>
     </properties>
 
     <!-- 依赖声明 -->
@@ -164,6 +166,18 @@
                 <version>${fastjson.version}</version>
             </dependency>
 
+            <!-- log4j日志组件 -->
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>${log4j2.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-to-slf4j</artifactId>
+                <version>${log4j2.version}</version>
+            </dependency>
+
             <!-- 定时任务-->
             <dependency>
                 <groupId>com.ruoyi</groupId>

ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java

@@ -55,7 +55,7 @@ public class SwaggerConfig
         // 用ApiInfoBuilder进行定制
         return new ApiInfoBuilder()
                 // 设置标题
-                .title("标题：若依管理系统_接口文档")
+                .title("标题：管理系统_接口文档")
                 // 描述
                 .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
                 // 作者信息

ruoyi-admin/src/main/resources/application-druid.yml

@@ -8,14 +8,15 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: password
+                password: 123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
-                enabled: false
-                url: 
-                username: 
-                password: 
+                enabled: true
+                url: jdbc:oracle:thin:@10.71.16.243:1521/ERM
+                username: ERM_CC7_M1
+                password: Welcome1
+                driverClassName: oracle.jdbc.driver.OracleDriver
             # 初始连接数
             initialSize: 5
             # 最小连接池数量

ruoyi-admin/src/main/resources/application.yml

@@ -11,7 +11,7 @@ ruoyi:
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: D:/ruoyi/uploadPath
   # 获取ip地址开关
-  addressEnabled: false
+  addressEnabled: true
 
 # 开发环境配置
 server:
@@ -98,7 +98,7 @@ shiro:
     # 首页地址
     indexUrl: /index
     # 验证码开关
-    captchaEnabled: true
+    captchaEnabled: false
     # 验证码类型 math 数组计算 char 字符
     captchaType: math
   cookie:
@@ -111,7 +111,7 @@ shiro:
     # 设置Cookie的过期时间，天为单位
     maxAge: 30
     # 设置密钥，务必保持唯一性（生成方式，直接拷贝到main运行即可）Base64.encodeToString(CipherUtils.generateNewKey(128, "AES").getEncoded()) （默认启动生成随机秘钥，随机秘钥会导致之前客户端RememberMe Cookie无效，如设置固定秘钥RememberMe Cookie则有效）
-    cipherKey: 
+    cipherKey: hA2mylRlEwPo9bH4kdP62w==
   session:
     # Session超时时间，-1代表永不过期（默认30分钟）
     expireTime: 30

ruoyi-admin/src/main/resources/static/i18n/messages_en_US.properties

@@ -0,0 +1,39 @@
+#错误消息
+not.null=* 必须填写
+user.jcaptcha.error=验证码错误
+user.not.exists=用户不存在/密码错误
+user.password.not.match=用户不存在/密码错误
+user.password.retry.limit.count=密码输入错误{0}次
+user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
+user.password.delete=对不起，您的账号已被删除
+user.blocked=用户已封禁，请联系管理员
+role.blocked=角色已封禁，请联系管理员
+user.logout.success=退出成功
+
+length.not.valid=长度必须在{min}到{max}个字符之间
+
+user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
+user.password.not.valid=* 5-50个字符
+ 
+user.email.not.valid=邮箱格式错误
+user.mobile.phone.number.not.valid=手机号格式错误
+user.login.success=登录成功
+user.register.success=注册成功
+user.notfound=请重新登录
+user.forcelogout=管理员强制退出，请重新登录
+user.unknown.error=未知错误，请重新登录
+
+##文件上传消息
+upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
+upload.filename.exceed.length=上传的文件名最长{0}个字符
+
+##权限
+no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
+no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
+no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
+no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
+no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
+no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
+login.username=username
+login.password=password
+login.login=login

ruoyi-admin/src/main/resources/static/i18n/messages_zh_CN.properties

@@ -0,0 +1,39 @@
+#错误消息
+not.null=* 必须填写
+user.jcaptcha.error=验证码错误
+user.not.exists=用户不存在/密码错误
+user.password.not.match=用户不存在/密码错误
+user.password.retry.limit.count=密码输入错误{0}次
+user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
+user.password.delete=对不起，您的账号已被删除
+user.blocked=用户已封禁，请联系管理员
+role.blocked=角色已封禁，请联系管理员
+user.logout.success=退出成功
+
+length.not.valid=长度必须在{min}到{max}个字符之间
+
+user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
+user.password.not.valid=* 5-50个字符
+ 
+user.email.not.valid=邮箱格式错误
+user.mobile.phone.number.not.valid=手机号格式错误
+user.login.success=登录成功
+user.register.success=注册成功
+user.notfound=请重新登录
+user.forcelogout=管理员强制退出，请重新登录
+user.unknown.error=未知错误，请重新登录
+
+##文件上传消息
+upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
+upload.filename.exceed.length=上传的文件名最长{0}个字符
+
+##权限
+no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
+no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
+no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
+no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
+no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
+no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
+login.username=用户名
+login.password=密码
+login.login=登陆

ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -112,4 +112,17 @@ public class Constants
      */
     public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
             "org.springframework", "org.apache", "com.ruoyi.common.utils.file" };
+    /**
+     * ERM物料分类
+     */
+    public static final String WLFL = "http://10.71.16.233:3721/wsp/ythclglxt/wlfl";
+    /**
+     * ERM物料CC编码
+     */
+    public static final String WLCCBM = "http://10.71.16.233:3721/wsp/ythclglxt/wlccbm";
+    /**
+     * ERM物料ID编码
+     */
+    public static final String WLIDBM = "http://10.71.16.233:3721/wsp/ythclglxt/wlidbm";
+
 }

ruoyi-system/pom.xml

@@ -16,12 +16,45 @@
     </description>
 
     <dependencies>
-
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka_2.11</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+        <!-- oracle驱动 -->
+        <dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>ojdbc8</artifactId>
+            <version>${oracle.version}</version>
+        </dependency>
         <!-- 通用工具-->
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.2</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

ruoyi-system/src/main/java/com/ruoyi/system/controller/AttribController.java

@@ -0,0 +1,135 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.Attrib;
+import com.ruoyi.system.service.IAttribService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 属性Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+@Controller
+@RequestMapping("/system/attrib")
+public class AttribController extends BaseController
+{
+    private String prefix = "system/attrib";
+
+    @Autowired
+    private IAttribService attribService;
+
+    @RequiresPermissions("system:attrib:view")
+    @GetMapping()
+    public String attrib()
+    {
+        return prefix + "/attrib";
+    }
+
+    /**
+     * 查询属性列表
+     */
+    @RequiresPermissions("system:attrib:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(Attrib attrib)
+    {
+        startPage();
+        List<Attrib> list = attribService.selectAttribList(attrib);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出属性列表
+     */
+    @RequiresPermissions("system:attrib:export")
+    @Log(title = "属性", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(Attrib attrib)
+    {
+        List<Attrib> list = attribService.selectAttribList(attrib);
+        ExcelUtil<Attrib> util = new ExcelUtil<Attrib>(Attrib.class);
+        return util.exportExcel(list, "属性数据");
+    }
+
+    /**
+     * 新增属性
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存属性
+     */
+    @RequiresPermissions("system:attrib:add")
+    @Log(title = "属性", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(Attrib attrib)
+    {
+        return toAjax(attribService.insertAttrib(attrib));
+    }
+
+    /**
+     * 修改属性
+     */
+    @GetMapping("/edit/{attribNo}")
+    public String edit(@PathVariable("attribNo") Long attribNo, ModelMap mmap)
+    {
+        Attrib attrib = attribService.selectAttribByAttribNo(attribNo);
+        mmap.put("attrib", attrib);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存属性
+     */
+    @RequiresPermissions("system:attrib:edit")
+    @Log(title = "属性", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(Attrib attrib)
+    {
+        return toAjax(attribService.updateAttrib(attrib));
+    }
+
+    /**
+     * 删除属性1
+     */
+    @RequiresPermissions("system:attrib:remove")
+    @Log(title = "属性", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(attribService.deleteAttribByAttribNos(ids));
+    }
+    /**
+     * 根据材料分类获取属性
+     */
+    @Log(title = "根据材料分类获取属性")
+    @PostMapping( "/selectAttribListByClasss/{classsId}")
+    @ResponseBody
+    public AjaxResult selectAttribListByClasss(@PathVariable("classsId") Long classsId)
+    {
+        AjaxResult ajax = new AjaxResult();
+        ajax.put("data", attribService.selectAttribListByClasss(classsId));
+        return ajax;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/controller/AttribValueController.java

@@ -0,0 +1,167 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.AttribValue;
+import com.ruoyi.system.service.IAttribValueService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Table containing ATTRIB_VALUEController
+ * 
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+@Api(tags ={"属性值查询"} )
+@Controller
+@RequestMapping("/system/value")
+public class AttribValueController extends BaseController
+{
+    private String prefix = "system/value";
+
+    @Autowired
+    private IAttribValueService attribValueService;
+
+    @RequiresPermissions("system:value:view")
+    @GetMapping()
+    public String value()
+    {
+        return prefix + "/value";
+    }
+
+    /**
+     * 查询Table containing ATTRIB_VALUE列表
+     */
+    @RequiresPermissions("system:value:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(AttribValue attribValue)
+    {
+        startPage();
+        List<AttribValue> list = attribValueService.selectAttribValueList(attribValue);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出Table containing ATTRIB_VALUE列表
+     */
+    @RequiresPermissions("system:value:export")
+    @Log(title = "Table containing ATTRIB_VALUE", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(AttribValue attribValue)
+    {
+        List<AttribValue> list = attribValueService.selectAttribValueList(attribValue);
+        ExcelUtil<AttribValue> util = new ExcelUtil<AttribValue>(AttribValue.class);
+        return util.exportExcel(list, "Table containing ATTRIB_VALUE数据");
+    }
+
+    /**
+     * 新增Table containing ATTRIB_VALUE
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存Table containing ATTRIB_VALUE
+     */
+    @RequiresPermissions("system:value:add")
+    @Log(title = "Table containing ATTRIB_VALUE", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(AttribValue attribValue)
+    {
+        return toAjax(attribValueService.insertAttribValue(attribValue));
+    }
+
+    /**
+     * 修改Table containing ATTRIB_VALUE
+     */
+    @GetMapping("/edit/{attribValueNo}")
+    public String edit(@PathVariable("attribValueNo") Long attribValueNo, ModelMap mmap)
+    {
+        AttribValue attribValue = attribValueService.selectAttribValueByAttribValueNo(attribValueNo);
+        mmap.put("attribValue", attribValue);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存Table containing ATTRIB_VALUE
+     */
+    @RequiresPermissions("system:value:edit")
+    @Log(title = "Table containing ATTRIB_VALUE", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(AttribValue attribValue)
+    {
+        return toAjax(attribValueService.updateAttribValue(attribValue));
+    }
+
+    /**
+     * 删除Table containing ATTRIB_VALUE
+     */
+    @RequiresPermissions("system:value:remove")
+    @Log(title = "Table containing ATTRIB_VALUE", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(attribValueService.deleteAttribValueByAttribValueNos(ids));
+    }
+    /**
+     * 根据属性获取属性值
+     */
+    @Log(title = "根据属性获取属性值")
+    @PostMapping( "/selectByAttrib/{attribId}")
+    @ResponseBody
+    public AjaxResult selectByAttrib(@PathVariable("attribId") Long attribId)
+    {
+        AjaxResult ajax = new AjaxResult();
+        ajax.put("data", attribValueService.selectByAttrib(attribId));
+        return ajax;
+    }
+    /**
+     * 根据分类获取描述规则
+     */
+@ApiOperation("根据分类ID获取描述规则")
+
+    @Log(title = "根据分类ID获取描述规则")
+    @PostMapping( "/selectPropertyFormulaByTypeId/{typeId}")
+    @ResponseBody
+    public AjaxResult selectPropertyFormulaByTypeId(@ApiParam@PathVariable("typeId") Long typeId)
+    {
+        AjaxResult ajax = new AjaxResult();
+        ajax.put("data", attribValueService.selectPropertyFormulaByTypeId(typeId));
+        return ajax;
+    }
+    /**
+     * 根据分类和描述获取描述规则
+     */
+@ApiOperation("根据分类和描述获取描述规则")
+
+    @Log(title = "根据分类和描述获取描述规则")
+    @PostMapping( "/selectPropertyFormulaByTypeAndProperty/{class_no},{entity_property_no}")
+    @ResponseBody
+    public AjaxResult selectPropertyFormulaByTypeId(@ApiParam@PathVariable("class_no") Long class_no,@ApiParam@PathVariable("entity_property_no") Long entity_property_no)
+    {
+        AjaxResult ajax = new AjaxResult();
+        ajax.put("data", attribValueService.selectPropertyFormulaByTypeAndProperty(class_no,entity_property_no));
+        return ajax;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/controller/ClasssController.java

@@ -0,0 +1,161 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.Ztree;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.Classs;
+import com.ruoyi.system.service.IClasssService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Table containing Class HierarchyController
+ * 
+ * @author zbj
+ * @date 2021-08-31
+ */
+@Controller
+@RequestMapping("/system/class")
+public class ClasssController extends BaseController
+{
+    private String prefix = "system/class";
+
+    @Autowired
+    private IClasssService classsService;
+
+    @RequiresPermissions("system:class:view")
+    @GetMapping()
+    public String classs()
+    {
+        return prefix + "/class";
+    }
+
+    /**
+     * 查询Table containing Class Hierarchy树列表
+     */
+    @RequiresPermissions("system:class:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(Classs classs)
+    {
+        startPage();
+        List<Classs> list = classsService.selectClasssList(classs);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出Table containing Class Hierarchy列表
+     */
+    @RequiresPermissions("system:class:export")
+    @Log(title = "Table containing Class Hierarchy", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(Classs classs)
+    {
+        List<Classs> list = classsService.selectClasssList(classs);
+        ExcelUtil<Classs> util = new ExcelUtil<Classs>(Classs.class);
+        return util.exportExcel(list, "Table containing Class Hierarchy数据");
+    }
+
+    /**
+     * 新增Table containing Class Hierarchy
+     */
+    @GetMapping(value = { "/add/{classNo}", "/add/" })
+    public String add(@PathVariable(value = "classNo", required = false) Long classNo, ModelMap mmap)
+    {
+        if (StringUtils.isNotNull(classNo))
+        {
+            mmap.put("classs", classsService.selectClasssByClassNo(classNo));
+        }
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存Table containing Class Hierarchy
+     */
+    @RequiresPermissions("system:class:add")
+    @Log(title = "Table containing Class Hierarchy", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(Classs classs)
+    {
+        return toAjax(classsService.insertClasss(classs));
+    }
+
+    /**
+     * 修改Table containing Class Hierarchy
+     */
+    @GetMapping("/edit/{classNo}")
+    public String edit(@PathVariable("classNo") Long classNo, ModelMap mmap)
+    {
+        Classs classs = classsService.selectClasssByClassNo(classNo);
+        mmap.put("classs", classs);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存Table containing Class Hierarchy
+     */
+    @RequiresPermissions("system:class:edit")
+    @Log(title = "Table containing Class Hierarchy", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(Classs classs)
+    {
+        return toAjax(classsService.updateClasss(classs));
+    }
+
+    /**
+     * 删除
+     */
+    @RequiresPermissions("system:class:remove")
+    @Log(title = "Table containing Class Hierarchy", businessType = BusinessType.DELETE)
+    @GetMapping("/remove/{classNo}")
+    @ResponseBody
+    public AjaxResult remove(@PathVariable("classNo") Long classNo)
+    {
+        return toAjax(classsService.deleteClasssByClassNo(classNo));
+    }
+
+    public static void main(String[] args) {
+        if(true){
+
+        }
+            System.out.println(1);
+
+            System.out.println(2);
+    }
+    /**
+     * 选择Table containing Class Hierarchy树
+     */
+    @GetMapping(value = { "/selectClassTree/{classNo}", "/selectClassTree/" })
+    public String selectClassTree(@PathVariable(value = "classNo", required = false) Long classNo, ModelMap mmap)
+    {
+        if (StringUtils.isNotNull(classNo))
+        {
+            mmap.put("classs", classsService.selectClasssByClassNo(classNo));
+        }
+        return prefix + "/tree";
+    }
+
+    /**
+     * 加载物料分类树列表
+     */
+    @GetMapping("/treeData")
+    @ResponseBody
+    public List<Ztree> treeData()
+    {
+        List<Ztree> ztrees = classsService.selectClasssTree();
+        return ztrees;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/controller/CommodityController.java

@@ -0,0 +1,123 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.Commodity;
+import com.ruoyi.system.service.ICommodityService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * CC码Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+@Controller
+@RequestMapping("/system/commodity")
+public class CommodityController extends BaseController
+{
+    private String prefix = "system/commodity";
+
+    @Autowired
+    private ICommodityService commodityService;
+
+    @RequiresPermissions("system:commodity:view")
+    @GetMapping()
+    public String commodity()
+    {
+        return prefix + "/commodity";
+    }
+
+    /**
+     * 查询CC码列表
+     */
+    @RequiresPermissions("system:commodity:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(Commodity commodity)
+    {
+        startPage();
+        List<Commodity> list = commodityService.selectCommodityList(commodity);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出CC码列表
+     */
+    @RequiresPermissions("system:commodity:export")
+    @Log(title = "CC码", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(Commodity commodity)
+    {
+        List<Commodity> list = commodityService.selectCommodityList(commodity);
+        ExcelUtil<Commodity> util = new ExcelUtil<Commodity>(Commodity.class);
+        return util.exportExcel(list, "CC码数据");
+    }
+
+    /**
+     * 新增CC码
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存CC码
+     */
+    @RequiresPermissions("system:commodity:add")
+    @Log(title = "CC码", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(Commodity commodity)
+    {
+        return toAjax(commodityService.insertCommodity(commodity));
+    }
+
+    /**
+     * 修改CC码
+     */
+    @GetMapping("/edit/{commodityNo}")
+    public String edit(@PathVariable("commodityNo") Long commodityNo, ModelMap mmap)
+    {
+        Commodity commodity = commodityService.selectCommodityByCommodityNo(commodityNo);
+        mmap.put("commodity", commodity);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存CC码
+     */
+    @RequiresPermissions("system:commodity:edit")
+    @Log(title = "CC码", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(Commodity commodity)
+    {
+        return toAjax(commodityService.updateCommodity(commodity));
+    }
+
+    /**
+     * 删除CC码
+     */
+    @RequiresPermissions("system:commodity:remove")
+    @Log(title = "CC码", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(commodityService.deleteCommodityByCommodityNos(ids));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/controller/Consumer.java

@@ -0,0 +1,49 @@
+package com.ruoyi.system.controller;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.apache.kafka.clients.consumer.ConsumerRecords;
+import org.apache.kafka.clients.consumer.KafkaConsumer;
+
+import java.util.Arrays;
+import java.util.Properties;
+import java.util.logging.Logger;
+
+public class Consumer {
+    static Logger log = Logger.getLogger("Producer");
+
+    private static final String TOPIC = "milo2";
+    private static final String BROKER_LIST = "192.168.10.158:9092";
+    private static KafkaConsumer<String,String> consumer = null;
+
+    static {
+        Properties configs = initConfig();
+        consumer = new KafkaConsumer<String, String>(configs);
+    }
+
+    private static Properties initConfig(){
+        Properties properties = new Properties();
+        properties.put("bootstrap.servers",BROKER_LIST);
+        properties.put("group.id","0");
+        properties.put("key.deserializer", "org.apache.kafka.common.serialization.StringDeserializer");
+        properties.put("value.deserializer", "org.apache.kafka.common.serialization.StringDeserializer");
+        properties.setProperty("enable.auto.commit", "true");
+        properties.setProperty("auto.offset.reset", "earliest");
+        return properties;
+    }
+
+
+    public static void main(String[] args) {
+        consumer.subscribe(Arrays.asList("milo2"));
+        try {
+            while (true) {
+                ConsumerRecords<String, String> records = consumer.poll(10);
+                for (ConsumerRecord<String, String> record : records) {
+//                log.info(record);
+                    System.out.println(record);
+                }
+            }
+        }catch (Exception e){
+            System.out.println(e);
+        }
+
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/controller/Producer.java

@@ -0,0 +1,53 @@
+package com.ruoyi.system.controller;
+
+import com.fasterxml.jackson.databind.ser.std.StringSerializer;
+import org.apache.kafka.clients.producer.*;
+
+import java.util.Properties;
+
+public class Producer {
+
+    private static final String TOPIC = "milo2";
+    private static final String BROKER_LIST = "192.168.10.158:9092";
+    private static KafkaProducer<String,String> producer = null;
+
+    /*
+    初始化生产者
+     */
+    static {
+        Properties configs = initConfig();
+        producer = new KafkaProducer<String, String>(configs);
+    }
+
+    /*
+    初始化配置
+     */
+    private static Properties initConfig(){
+        Properties properties = new Properties();
+        properties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,BROKER_LIST);
+        properties.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG, StringSerializer.class.getName());
+        properties.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,StringSerializer.class.getName());
+        return properties;
+    }
+
+    public static void main(String[] args) throws InterruptedException {
+        //消息实体
+        ProducerRecord<String , String> record = null;
+        for (int i = 0; i < 1000; i++) {
+            record = new ProducerRecord<String, String>(TOPIC, "value"+(int)(10*(Math.random())));
+            //发送消息
+            producer.send(record, new Callback() {
+                @Override
+                public void onCompletion(RecordMetadata recordMetadata, Exception e) {
+                    if (null != e){
+//                        log.info("send error" + e.getMessage());
+                        System.out.println(e.getMessage());
+                    }else {
+                        System.out.println(String.format("offset:%s,partition:%s",recordMetadata.offset(),recordMetadata.partition()));
+                    }
+                }
+            });
+        }
+        producer.close();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/controller/SysAppController.java

@@ -0,0 +1,142 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.SysApp;
+import com.ruoyi.system.service.impl.ISysAppDataService;
+import com.ruoyi.system.service.impl.ISysAppService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 编码申请Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-29
+ */
+@Controller
+@RequestMapping("/system/app")
+public class SysAppController extends BaseController
+{
+    private String prefix = "system/app";
+    @Autowired
+    private ISysAppDataService sysAppDataService;
+    @Autowired
+    private ISysAppService sysAppService;
+
+    @RequiresPermissions("system:app:view")
+    @GetMapping()
+    public String app()
+    {
+        return prefix + "/app";
+    }
+    @RequiresPermissions("system:app:view")
+    @GetMapping("/fuwenben")
+    public String fuwenben()
+    {
+        return prefix + "/fuwenben";
+    }
+
+    /**
+     * 查询编码申请列表
+     */
+    @RequiresPermissions("system:app:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SysApp sysApp)
+    {
+        startPage();
+        List<SysApp> list = sysAppService.selectSysAppList(sysApp);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出编码申请列表
+     */
+    @RequiresPermissions("system:app:export")
+    @Log(title = "编码申请", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SysApp sysApp)
+    {
+        List<SysApp> list = sysAppService.selectSysAppList(sysApp);
+        ExcelUtil<SysApp> util = new ExcelUtil<SysApp>(SysApp.class);
+        return util.exportExcel(list, "编码申请数据");
+    }
+
+    /**
+     * 新增编码申请
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存编码申请
+     */
+    @RequiresPermissions("system:app:add")
+    @Log(title = "编码申请", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SysApp sysApp)
+    {
+        return toAjax(sysAppService.insertSysApp(sysApp));
+    }
+
+    /**
+     * 查询申请单详细
+     */
+    @RequiresPermissions("system:app:list")
+    @GetMapping("/detail/{appId}")
+    public String detail(@PathVariable("appId") Long dictId, ModelMap mmap)
+    {
+        mmap.put("app", sysAppService.selectSysAppByAppId(dictId));
+        mmap.put("appList", sysAppService.selectAppAll());
+        return "system/data/data";
+    }
+    /**
+     * 修改编码申请
+     */
+    @GetMapping("/edit/{appId}")
+    public String edit(@PathVariable("appId") Long appId, ModelMap mmap)
+    {
+        SysApp sysApp = sysAppService.selectSysAppByAppId(appId);
+        mmap.put("sysApp", sysApp);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存编码申请
+     */
+    @RequiresPermissions("system:app:edit")
+    @Log(title = "编码申请", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SysApp sysApp)
+    {
+        return toAjax(sysAppService.updateSysApp(sysApp));
+    }
+
+    /**
+     * 删除编码申请
+     */
+    @RequiresPermissions("system:app:remove")
+    @Log(title = "编码申请", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(sysAppService.deleteSysAppByAppIds(ids));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/controller/SysAppDataController.java

@@ -0,0 +1,156 @@
+package com.ruoyi.system.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.Classs;
+import com.ruoyi.system.domain.SysAppData;
+import com.ruoyi.system.service.IClasssService;
+import com.ruoyi.system.service.impl.ISysAppDataService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 编码申请数据Controller
+ * 
+ * @author ruoyi
+ * @date 2021-09-29
+ */
+@Controller
+@RequestMapping("/system/data")
+public class SysAppDataController extends BaseController
+{
+    private String prefix = "system/data";
+
+    @Autowired
+    private ISysAppDataService sysAppDataService;
+    @Autowired
+    private IClasssService classsService;
+
+    @RequiresPermissions("system:data:view")
+    @GetMapping()
+    public String data()
+    {
+        return prefix + "/data";
+    }
+
+    /**
+     * 查询编码申请数据列表
+     */
+    @RequiresPermissions("system:data:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(SysAppData sysAppData)
+    {
+        startPage();
+        List<SysAppData> list = sysAppDataService.selectSysAppDataList(sysAppData);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出编码申请数据列表
+     */
+    @RequiresPermissions("system:data:export")
+    @Log(title = "编码申请数据", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(SysAppData sysAppData)
+    {
+        List<SysAppData> list = sysAppDataService.selectSysAppDataList(sysAppData);
+        ExcelUtil<SysAppData> util = new ExcelUtil<SysAppData>(SysAppData.class);
+        return util.exportExcel(list, "编码申请数据数据");
+    }
+
+    /**
+     * 新增编码申请数据
+     */
+    @GetMapping("/add")
+    public String add( ModelMap mmap)
+    {
+        Classs classs=new Classs();
+        classs.setApprovalStatusNo(Classs.APPROVAL_APPROVED);
+        classs.setCatEntityTypeNo(3L);
+        List<Classs> classList=classsService.selectClasssList( classs);
+        mmap.put("classList", classList);
+        return prefix + "/add";
+    }
+    /**
+     * 查询ERM中已经发布的分类
+     */
+    @PostMapping("/getClasss")
+    @ResponseBody
+    public AjaxResult getClasss()
+    {
+        Classs classs=new Classs();
+        classs.setApprovalStatusNo(Classs.APPROVAL_APPROVED);
+        List<Classs> classList=classsService.selectClasssList( classs);
+        return AjaxResult.success(classList);
+    }
+
+    /**
+     * 新增保存编码申请数据
+     */
+    @RequiresPermissions("system:data:add")
+    @Log(title = "编码申请数据", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(SysAppData sysAppData)
+    {
+        return toAjax(sysAppDataService.insertSysAppData(sysAppData));
+    }
+
+    /**
+     * 修改编码申请数据
+     */
+    @GetMapping("/edit/{appDataId}")
+    public String edit(@PathVariable("appDataId") Long appDataId, ModelMap mmap)
+    {
+        SysAppData sysAppData = sysAppDataService.selectSysAppDataByAppDataId(appDataId);
+        mmap.put("sysAppData", sysAppData);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存编码申请数据
+     */
+    @RequiresPermissions("system:data:edit")
+    @Log(title = "编码申请数据", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(SysAppData sysAppData)
+    {
+        return toAjax(sysAppDataService.updateSysAppData(sysAppData));
+    }
+
+    /**
+     * 删除编码申请数据
+     */
+    @RequiresPermissions("system:data:remove")
+    @Log(title = "编码申请数据", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(sysAppDataService.deleteSysAppDataByAppDataIds(ids));
+    }
+    /**
+     * 获取已审批的材料分类
+     */
+    @Log(title = "获取已审批的材料分类")
+    @PostMapping( "/selectApprovalClasss")
+    @ResponseBody
+    public AjaxResult selectApprovalClasss()
+    {
+        AjaxResult ajax = new AjaxResult();
+        ajax.put("data", classsService.selectApprovalClasss());
+        return ajax;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/Attrib.java

@@ -0,0 +1,378 @@
+package com.ruoyi.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.utils.security.CipherUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.apache.shiro.codec.Base64;
+
+import java.util.Date;
+
+/**
+ * 属性对象 attrib
+ * 
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public class Attrib extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** Internal ATTRIB number */
+    private Long attribNo;
+
+    /** External ATTRIB number */
+    @Excel(name = "External ATTRIB number")
+    private String attribId;
+
+    /** System id of catalogue */
+    @Excel(name = "System id of catalogue")
+    private Long catalogNo;
+
+    private Long classNo;
+
+    /** Optionally identifies a calculation parameter to be fed by this attribute */
+    @Excel(name = "Optionally identifies a calculation parameter to be fed by this attribute")
+    private String calcParam;
+
+    /** The type (heading) for the physical value. E.g. "mm OD" */
+    @Excel(name = "The type (heading) for the physical value. E.g. ")
+    private String physicalValueType;
+
+    /** The unit of measure for the physical values for this attribute type - e.g. for bolt diameters this would be length in mm */
+    @Excel(name = "The unit of measure for the physical values for this attribute type - e.g. for bolt diameters this would be length in mm")
+    private String physicalValueUnitId;
+
+    /** Description of the attribute type */
+    @Excel(name = "Description of the attribute type")
+    private String descr;
+
+    /** Whether the value of this attribute can be defined against a Commodity  (1 = can, 0 = cannot) */
+    @Excel(name = "Whether the value of this attribute can be defined against a Commodity  (1 = can, 0 = cannot)")
+    private String commodityLevel;
+
+    /** Whether the value of this attribute can be defined against a Size Reference (1 = can, 0 = cannot). */
+    @Excel(name = "Whether the value of this attribute can be defined against a Size Reference (1 = can, 0 = cannot).")
+    private String sizeRefLevel;
+
+    /** Whether the value of this attribute can be defined against a Part (component (1 = can, 0 = cannot). */
+    @Excel(name = "Whether the value of this attribute can be defined against a Part (component (1 = can, 0 = cannot).")
+    private String partLevel;
+
+    /** Whether the value of this attribute can be defined against a Modeller (component (1 = can, 0 = cannot). */
+    @Excel(name = "Whether the value of this attribute can be defined against a Modeller (component (1 = can, 0 = cannot).")
+    private String modellerLevel;
+
+    /** Defined scope of the attribute type (0 = Internal, 1 = External). */
+    @Excel(name = "Defined scope of the attribute type (0 = Internal, 1 = External).")
+    private Long defScope;
+
+    /** Whether this attribute type is obsolete. (1 = Active, 0 = Obsolete) */
+    @Excel(name = "Whether this attribute type is obsolete. (1 = Active, 0 = Obsolete)")
+    private String stat;
+
+    /** The category of attribute */
+    @Excel(name = "The category of attribute")
+    private Long attribCategoryNo;
+
+    /** System id of discipline. */
+    @Excel(name = "System id of discipline.")
+    private Long drawDisciplineNo;
+
+    /** Initials for person defining the position */
+    @Excel(name = "Initials for person defining the position")
+    private String defUsrId;
+
+    /** Definition date */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "Definition date", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date defDate;
+
+    /** Defining application of row */
+    @Excel(name = "Defining application of row")
+    private Long defApplNo;
+
+    /** Initials for person latest updating the position */
+    @Excel(name = "Initials for person latest updating the position")
+    private String updUsrId;
+
+    /** Latest update date */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "Latest update date", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updDate;
+
+    /** Last updating application of row */
+    @Excel(name = "Last updating application of row")
+    private Long updApplNo;
+
+    /** Weighting to be applied for this attribute when matching to alternative parts (10=LOW, 20=MEDIUM, 30=HIGH) */
+    @Excel(name = "Weighting to be applied for this attribute when matching to alternative parts (10=LOW, 20=MEDIUM, 30=HIGH)")
+    private Long matchWeightingNo;
+
+    /** If attribute is system attribute. */
+    @Excel(name = "If attribute is system attribute.")
+    private String isSystem;
+    private String class_attrib_id;
+
+    public void setAttribNo(Long attribNo) 
+    {
+        this.attribNo = attribNo;
+    }
+
+    public Long getAttribNo() 
+    {
+        return attribNo;
+    }
+    public void setAttribId(String attribId) 
+    {
+        this.attribId = attribId;
+    }
+
+    public String getAttribId() 
+    {
+        return attribId;
+    }
+    public void setCatalogNo(Long catalogNo) 
+    {
+        this.catalogNo = catalogNo;
+    }
+
+    public Long getCatalogNo() 
+    {
+        return catalogNo;
+    }
+    public void setCalcParam(String calcParam) 
+    {
+        this.calcParam = calcParam;
+    }
+
+    public String getCalcParam() 
+    {
+        return calcParam;
+    }
+    public void setPhysicalValueType(String physicalValueType) 
+    {
+        this.physicalValueType = physicalValueType;
+    }
+
+    public String getPhysicalValueType() 
+    {
+        return physicalValueType;
+    }
+    public void setPhysicalValueUnitId(String physicalValueUnitId) 
+    {
+        this.physicalValueUnitId = physicalValueUnitId;
+    }
+
+    public String getPhysicalValueUnitId() 
+    {
+        return physicalValueUnitId;
+    }
+    public void setDescr(String descr) 
+    {
+        this.descr = descr;
+    }
+
+    public String getDescr() 
+    {
+        return descr;
+    }
+    public void setCommodityLevel(String commodityLevel) 
+    {
+        this.commodityLevel = commodityLevel;
+    }
+
+    public String getCommodityLevel() 
+    {
+        return commodityLevel;
+    }
+    public void setSizeRefLevel(String sizeRefLevel) 
+    {
+        this.sizeRefLevel = sizeRefLevel;
+    }
+
+    public String getClass_attrib_id() {
+        return class_attrib_id;
+    }
+
+    public void setClass_attrib_id(String class_attrib_id) {
+        this.class_attrib_id = class_attrib_id;
+    }
+
+    public String getSizeRefLevel()
+    {
+        return sizeRefLevel;
+    }
+    public void setPartLevel(String partLevel) 
+    {
+        this.partLevel = partLevel;
+    }
+
+    public String getPartLevel() 
+    {
+        return partLevel;
+    }
+    public void setModellerLevel(String modellerLevel) 
+    {
+        this.modellerLevel = modellerLevel;
+    }
+
+    public String getModellerLevel() 
+    {
+        return modellerLevel;
+    }
+    public void setDefScope(Long defScope) 
+    {
+        this.defScope = defScope;
+    }
+
+    public Long getDefScope() 
+    {
+        return defScope;
+    }
+    public void setStat(String stat) 
+    {
+        this.stat = stat;
+    }
+
+    public String getStat() 
+    {
+        return stat;
+    }
+    public Long getClassNo()
+    {
+        return classNo;
+    }
+    public void setAttribCategoryNo(Long attribCategoryNo)
+    {
+        this.attribCategoryNo = attribCategoryNo;
+    }
+
+    public Long getAttribCategoryNo() 
+    {
+        return attribCategoryNo;
+    }
+    public void setDrawDisciplineNo(Long drawDisciplineNo) 
+    {
+        this.drawDisciplineNo = drawDisciplineNo;
+    }
+
+    public Long getDrawDisciplineNo() 
+    {
+        return drawDisciplineNo;
+    }
+    public void setDefUsrId(String defUsrId) 
+    {
+        this.defUsrId = defUsrId;
+    }
+
+    public String getDefUsrId() 
+    {
+        return defUsrId;
+    }
+    public void setDefDate(Date defDate) 
+    {
+        this.defDate = defDate;
+    }
+
+    public Date getDefDate() 
+    {
+        return defDate;
+    }
+    public void setDefApplNo(Long defApplNo) 
+    {
+        this.defApplNo = defApplNo;
+    }
+
+    public Long getDefApplNo() 
+    {
+        return defApplNo;
+    }
+    public void setUpdUsrId(String updUsrId) 
+    {
+        this.updUsrId = updUsrId;
+    }
+
+    public String getUpdUsrId() 
+    {
+        return updUsrId;
+    }
+    public void setUpdDate(Date updDate) 
+    {
+        this.updDate = updDate;
+    }
+
+    public Date getUpdDate() 
+    {
+        return updDate;
+    }
+    public void setUpdApplNo(Long updApplNo) 
+    {
+        this.updApplNo = updApplNo;
+    }
+
+    public Long getUpdApplNo() 
+    {
+        return updApplNo;
+    }
+    public void setMatchWeightingNo(Long matchWeightingNo) 
+    {
+        this.matchWeightingNo = matchWeightingNo;
+    }
+
+    public void setClassNo(Long classNo) {
+        this.classNo = classNo;
+    }
+
+    public Long getMatchWeightingNo()
+    {
+        return matchWeightingNo;
+    }
+    public void setIsSystem(String isSystem) 
+    {
+        this.isSystem = isSystem;
+    }
+
+    public String getIsSystem() 
+    {
+        return isSystem;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("attribNo", getAttribNo())
+            .append("attribId", getAttribId())
+            .append("catalogNo", getCatalogNo())
+            .append("calcParam", getCalcParam())
+            .append("physicalValueType", getPhysicalValueType())
+            .append("physicalValueUnitId", getPhysicalValueUnitId())
+            .append("descr", getDescr())
+            .append("commodityLevel", getCommodityLevel())
+            .append("sizeRefLevel", getSizeRefLevel())
+            .append("partLevel", getPartLevel())
+            .append("modellerLevel", getModellerLevel())
+            .append("defScope", getDefScope())
+            .append("stat", getStat())
+            .append("classNo", getClassNo())
+            .append("attribCategoryNo", getAttribCategoryNo())
+            .append("drawDisciplineNo", getDrawDisciplineNo())
+            .append("defUsrId", getDefUsrId())
+            .append("defDate", getDefDate())
+            .append("defApplNo", getDefApplNo())
+            .append("updUsrId", getUpdUsrId())
+            .append("updDate", getUpdDate())
+            .append("updApplNo", getUpdApplNo())
+            .append("matchWeightingNo", getMatchWeightingNo())
+            .append("isSystem", getIsSystem())
+            .append("class_attrib_id", getClass_attrib_id())
+            .toString();
+    }
+
+    public static void main(String[] args) {
+        String aes = Base64.encodeToString(CipherUtils.generateNewKey(128, "AES").getEncoded());
+        System.out.println(aes);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/AttribValue.java

@@ -0,0 +1,154 @@
+package com.ruoyi.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * Table containing ATTRIB_VALUE对象 attrib_value
+ * 
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public class AttribValue extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** Internal ATTRIB_VALUE number */
+    private Long attribValueNo;
+
+    /** Actual attribute value */
+    @Excel(name = "Actual attribute value")
+    private String valueText;
+
+    /** System id of catalogue */
+    @Excel(name = "System id of catalogue")
+    private Long catalogNo;
+
+    /** System id for the set of equivalent values to which this value belongs */
+    @Excel(name = "System id for the set of equivalent values to which this value belongs")
+    private Long attribEquivSetNo;
+
+    /** System id for the representation in which this value is being specified */
+    @Excel(name = "System id for the representation in which this value is being specified")
+    private Long attribRepresentNo;
+
+    /** Initials for person defining the position */
+    @Excel(name = "Initials for person defining the position")
+    private String defUsrId;
+
+    /** Definition date */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "Definition date", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date defDate;
+
+    /** Initials for person latest updating the position */
+    @Excel(name = "Initials for person latest updating the position")
+    private String updUsrId;
+
+    /** Latest update date */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "Latest update date", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updDate;
+
+    public void setAttribValueNo(Long attribValueNo) 
+    {
+        this.attribValueNo = attribValueNo;
+    }
+
+    public Long getAttribValueNo() 
+    {
+        return attribValueNo;
+    }
+    public void setValueText(String valueText) 
+    {
+        this.valueText = valueText;
+    }
+
+    public String getValueText() 
+    {
+        return valueText;
+    }
+    public void setCatalogNo(Long catalogNo) 
+    {
+        this.catalogNo = catalogNo;
+    }
+
+    public Long getCatalogNo() 
+    {
+        return catalogNo;
+    }
+    public void setAttribEquivSetNo(Long attribEquivSetNo) 
+    {
+        this.attribEquivSetNo = attribEquivSetNo;
+    }
+
+    public Long getAttribEquivSetNo() 
+    {
+        return attribEquivSetNo;
+    }
+    public void setAttribRepresentNo(Long attribRepresentNo) 
+    {
+        this.attribRepresentNo = attribRepresentNo;
+    }
+
+    public Long getAttribRepresentNo() 
+    {
+        return attribRepresentNo;
+    }
+    public void setDefUsrId(String defUsrId) 
+    {
+        this.defUsrId = defUsrId;
+    }
+
+    public String getDefUsrId() 
+    {
+        return defUsrId;
+    }
+    public void setDefDate(Date defDate) 
+    {
+        this.defDate = defDate;
+    }
+
+    public Date getDefDate() 
+    {
+        return defDate;
+    }
+    public void setUpdUsrId(String updUsrId) 
+    {
+        this.updUsrId = updUsrId;
+    }
+
+    public String getUpdUsrId() 
+    {
+        return updUsrId;
+    }
+    public void setUpdDate(Date updDate) 
+    {
+        this.updDate = updDate;
+    }
+
+    public Date getUpdDate() 
+    {
+        return updDate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("attribValueNo", getAttribValueNo())
+            .append("valueText", getValueText())
+            .append("catalogNo", getCatalogNo())
+            .append("attribEquivSetNo", getAttribEquivSetNo())
+            .append("attribRepresentNo", getAttribRepresentNo())
+            .append("defUsrId", getDefUsrId())
+            .append("defDate", getDefDate())
+            .append("updUsrId", getUpdUsrId())
+            .append("updDate", getUpdDate())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/Classs.java

@@ -0,0 +1,424 @@
+package com.ruoyi.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.TreeEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * Table containing Class Hierarchy对象 class
+ * 
+ * @author zbj
+ * @date 2021-08-31
+ */
+public class Classs extends TreeEntity
+{
+    private static final long serialVersionUID = 1L;
+    /**
+     *  1 = Working, 2 = Approved
+     * */
+    public static final long APPROVAL_APPROVED = 2L;
+
+    /** Unique internal identifier for class in class hierarchy. */
+    private Long classNo;
+
+    /** Name of class. */
+    @Excel(name = "Name of class.")
+    private String classId;
+
+    /** System id of catalogue. */
+    @Excel(name = "System id of catalogue.")
+    private Long catalogNo;
+
+    /** Sequence number of the class within parent class, or the top level if there is no parent. */
+    @Excel(name = "Sequence number of the class within parent class, or the top level if there is no parent.")
+    private Long seqNo;
+
+    /** Description of class. */
+    @Excel(name = "Description of class.")
+    private String descr;
+
+    /** Indicates valid entries (1 = Active, 0 = Obsolete). */
+    @Excel(name = "Indicates valid entries (1 = Active, 0 = Obsolete).")
+    private String stat;
+
+    /** Class approval status. (1 = Working, 2 = Approved) */
+    @Excel(name = "Class approval status. (1 = Working, 2 = Approved)")
+    private Long approvalStatusNo;
+
+    /** Specifies the parent (if any) for a class. A null value indicates a top level class. */
+    @Excel(name = "Specifies the parent (if any) for a class. A null value indicates a top level class.")
+    private Long parentClassNo;
+
+    /** System id of discipline. */
+    @Excel(name = "System id of discipline.")
+    private Long drawDisciplineNo;
+
+    /** The ultimate type of catalogue entity generated from this class. (1 = Commodity, 2 = Size Reference Format, 3 = Basic Component Type, 4 = Commodity Code Format, 5 = Part Number Format, 6 = CATREF Format, 7 = SPREF Format, 8 = STYP Format, 9 = CMPREF Format, 10 = BLTREF Format, 11 = Compound Component Type, 12 = Sub Commodity code). */
+    @Excel(name = "The ultimate type of catalogue entity generated from this class. (1 = Commodity, 2 = Size Reference Format, 3 = Basic Component Type, 4 = Commodity Code Format, 5 = Part Number Format, 6 = CATREF Format, 7 = SPREF Format, 8 = STYP Format, 9 = CMPREF Format, 10 = BLTREF Format, 11 = Compound Component Type, 12 = Sub Commodity code).")
+    private Long catEntityTypeNo;
+
+    /** Whether this class can be instantiated. (1 = Can instantiate, 0 = Cannot instantiate). */
+    @Excel(name = "Whether this class can be instantiated. (1 = Can instantiate, 0 = Cannot instantiate).")
+    private String canInstantiate;
+
+    /** Default branch code to be used for this type of component in branch tables. */
+    @Excel(name = "Default branch code to be used for this type of component in branch tables.")
+    private String branchCode;
+
+    /** Whether this class is internal or external (0 = Internal, 1 = External). */
+    @Excel(name = "Whether this class is internal or external (0 = Internal, 1 = External).")
+    private Long defScopeNo;
+
+    /** Whether bolts required. (1 - Required, 0 = Not required). */
+    @Excel(name = "Whether bolts required. (1 - Required, 0 = Not required).")
+    private String boltsRequired;
+
+    /** Which size to use for the BLTREF FirstSize = 1 SecondSize = 4 ThirdSize = 5. Null is assumed to be the FirstSize */
+    @Excel(name = "Which size to use for the BLTREF FirstSize = 1 SecondSize = 4 ThirdSize = 5. Null is assumed to be the FirstSize")
+    private Long boltAtSizeNo;
+
+    /** System id of the spec short code. */
+    @Excel(name = "System id of the spec short code.")
+    private Long specShortCodeNo;
+
+    /** The category of component (1 = PIPE, 2 = BOLTS, 3 = BOLTITEMS, 4 = INSUL). */
+    @Excel(name = "The category of component (1 = PIPE, 2 = BOLTS, 3 = BOLTITEMS, 4 = INSUL).")
+    private Long compCategoryNo;
+
+    /** Default spec component group for this Component Type. */
+    @Excel(name = "Default spec component group for this Component Type.")
+    private Long specCompGroupNo;
+
+    /** Unit of class. */
+    @Excel(name = "Unit of class.")
+    private String unitId;
+
+    /** The commodity code prefix for this component type */
+    @Excel(name = "The commodity code prefix for this component type")
+    private String commodityCodePref;
+
+    /** Defines Sub-Code uniqueness.(1 = Sequence, 2 = Set) */
+    @Excel(name = "Defines Sub-Code uniqueness.(1 = Sequence, 2 = Set)")
+    private Long uniqueness;
+
+    /** Whether this class can have size less parts in standard catalogue. */
+    @Excel(name = "Whether this class can have size less parts in standard catalogue.")
+    private String allowSizeLess;
+
+    /** Identifies defining application for this class. */
+    @Excel(name = "Identifies defining application for this class.")
+    private Long defApplNo;
+
+    /** Initials for person defining the class */
+    @Excel(name = "Initials for person defining the class")
+    private String defUsrId;
+
+    /** Definition date */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "Definition date", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date defDate;
+
+    /** Identifies updating application for this class. */
+    @Excel(name = "Identifies updating application for this class.")
+    private Long updApplNo;
+
+    /** Initials for person latest updating the class */
+    @Excel(name = "Initials for person latest updating the class")
+    private String updUsrId;
+
+    /** Latest update date */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "Latest update date", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updDate;
+
+    public void setClassNo(Long classNo) 
+    {
+        this.classNo = classNo;
+    }
+
+    public Long getClassNo() 
+    {
+        return classNo;
+    }
+    public void setClassId(String classId) 
+    {
+        this.classId = classId;
+    }
+
+    public String getClassId() 
+    {
+        return classId;
+    }
+    public void setCatalogNo(Long catalogNo) 
+    {
+        this.catalogNo = catalogNo;
+    }
+
+    public Long getCatalogNo() 
+    {
+        return catalogNo;
+    }
+    public void setSeqNo(Long seqNo) 
+    {
+        this.seqNo = seqNo;
+    }
+
+    public Long getSeqNo() 
+    {
+        return seqNo;
+    }
+    public void setDescr(String descr) 
+    {
+        this.descr = descr;
+    }
+
+    public String getDescr() 
+    {
+        return descr;
+    }
+    public void setStat(String stat) 
+    {
+        this.stat = stat;
+    }
+
+    public String getStat() 
+    {
+        return stat;
+    }
+    public void setApprovalStatusNo(Long approvalStatusNo) 
+    {
+        this.approvalStatusNo = approvalStatusNo;
+    }
+
+    public Long getApprovalStatusNo() 
+    {
+        return approvalStatusNo;
+    }
+    public void setParentClassNo(Long parentClassNo) 
+    {
+        this.parentClassNo = parentClassNo;
+    }
+
+    public Long getParentClassNo() 
+    {
+        return parentClassNo;
+    }
+    public void setDrawDisciplineNo(Long drawDisciplineNo) 
+    {
+        this.drawDisciplineNo = drawDisciplineNo;
+    }
+
+    public Long getDrawDisciplineNo() 
+    {
+        return drawDisciplineNo;
+    }
+    public void setCatEntityTypeNo(Long catEntityTypeNo) 
+    {
+        this.catEntityTypeNo = catEntityTypeNo;
+    }
+
+    public Long getCatEntityTypeNo() 
+    {
+        return catEntityTypeNo;
+    }
+    public void setCanInstantiate(String canInstantiate) 
+    {
+        this.canInstantiate = canInstantiate;
+    }
+
+    public String getCanInstantiate() 
+    {
+        return canInstantiate;
+    }
+    public void setBranchCode(String branchCode) 
+    {
+        this.branchCode = branchCode;
+    }
+
+    public String getBranchCode() 
+    {
+        return branchCode;
+    }
+    public void setDefScopeNo(Long defScopeNo) 
+    {
+        this.defScopeNo = defScopeNo;
+    }
+
+    public Long getDefScopeNo() 
+    {
+        return defScopeNo;
+    }
+    public void setBoltsRequired(String boltsRequired) 
+    {
+        this.boltsRequired = boltsRequired;
+    }
+
+    public String getBoltsRequired() 
+    {
+        return boltsRequired;
+    }
+    public void setBoltAtSizeNo(Long boltAtSizeNo) 
+    {
+        this.boltAtSizeNo = boltAtSizeNo;
+    }
+
+    public Long getBoltAtSizeNo() 
+    {
+        return boltAtSizeNo;
+    }
+    public void setSpecShortCodeNo(Long specShortCodeNo) 
+    {
+        this.specShortCodeNo = specShortCodeNo;
+    }
+
+    public Long getSpecShortCodeNo() 
+    {
+        return specShortCodeNo;
+    }
+    public void setCompCategoryNo(Long compCategoryNo) 
+    {
+        this.compCategoryNo = compCategoryNo;
+    }
+
+    public Long getCompCategoryNo() 
+    {
+        return compCategoryNo;
+    }
+    public void setSpecCompGroupNo(Long specCompGroupNo) 
+    {
+        this.specCompGroupNo = specCompGroupNo;
+    }
+
+    public Long getSpecCompGroupNo() 
+    {
+        return specCompGroupNo;
+    }
+    public void setUnitId(String unitId) 
+    {
+        this.unitId = unitId;
+    }
+
+    public String getUnitId() 
+    {
+        return unitId;
+    }
+    public void setCommodityCodePref(String commodityCodePref) 
+    {
+        this.commodityCodePref = commodityCodePref;
+    }
+
+    public String getCommodityCodePref() 
+    {
+        return commodityCodePref;
+    }
+    public void setUniqueness(Long uniqueness) 
+    {
+        this.uniqueness = uniqueness;
+    }
+
+    public Long getUniqueness() 
+    {
+        return uniqueness;
+    }
+    public void setAllowSizeLess(String allowSizeLess) 
+    {
+        this.allowSizeLess = allowSizeLess;
+    }
+
+    public String getAllowSizeLess() 
+    {
+        return allowSizeLess;
+    }
+    public void setDefApplNo(Long defApplNo) 
+    {
+        this.defApplNo = defApplNo;
+    }
+
+    public Long getDefApplNo() 
+    {
+        return defApplNo;
+    }
+    public void setDefUsrId(String defUsrId) 
+    {
+        this.defUsrId = defUsrId;
+    }
+
+    public String getDefUsrId() 
+    {
+        return defUsrId;
+    }
+    public void setDefDate(Date defDate) 
+    {
+        this.defDate = defDate;
+    }
+
+    public Date getDefDate() 
+    {
+        return defDate;
+    }
+    public void setUpdApplNo(Long updApplNo) 
+    {
+        this.updApplNo = updApplNo;
+    }
+
+    public Long getUpdApplNo() 
+    {
+        return updApplNo;
+    }
+    public void setUpdUsrId(String updUsrId) 
+    {
+        this.updUsrId = updUsrId;
+    }
+
+    public String getUpdUsrId() 
+    {
+        return updUsrId;
+    }
+    public void setUpdDate(Date updDate) 
+    {
+        this.updDate = updDate;
+    }
+
+    public Date getUpdDate() 
+    {
+        return updDate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("classNo", getClassNo())
+            .append("classId", getClassId())
+            .append("catalogNo", getCatalogNo())
+            .append("seqNo", getSeqNo())
+            .append("descr", getDescr())
+            .append("stat", getStat())
+            .append("approvalStatusNo", getApprovalStatusNo())
+            .append("parentClassNo", getParentClassNo())
+            .append("drawDisciplineNo", getDrawDisciplineNo())
+            .append("catEntityTypeNo", getCatEntityTypeNo())
+            .append("canInstantiate", getCanInstantiate())
+            .append("branchCode", getBranchCode())
+            .append("defScopeNo", getDefScopeNo())
+            .append("boltsRequired", getBoltsRequired())
+            .append("boltAtSizeNo", getBoltAtSizeNo())
+            .append("specShortCodeNo", getSpecShortCodeNo())
+            .append("compCategoryNo", getCompCategoryNo())
+            .append("specCompGroupNo", getSpecCompGroupNo())
+            .append("unitId", getUnitId())
+            .append("commodityCodePref", getCommodityCodePref())
+            .append("uniqueness", getUniqueness())
+            .append("allowSizeLess", getAllowSizeLess())
+            .append("defApplNo", getDefApplNo())
+            .append("defUsrId", getDefUsrId())
+            .append("defDate", getDefDate())
+            .append("updApplNo", getUpdApplNo())
+            .append("updUsrId", getUpdUsrId())
+            .append("updDate", getUpdDate())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/ClasssAttrib.java

@@ -0,0 +1,26 @@
+package com.ruoyi.system.domain;
+
+/**
+ * ClasssAttrib
+ * 
+ * @author zbj
+ * @date 2021-08-31
+ */
+public class ClasssAttrib
+{
+    private static final long serialVersionUID = 1L;
+
+    private Long classNo;
+
+    private String classId;
+
+    private Long catalogNo;
+
+    private Long seqNo;
+
+    private String descr;
+
+    private String stat;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/Commodity.java

@@ -0,0 +1,266 @@
+package com.ruoyi.system.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * CC码对象 commodity
+ * 
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public class Commodity extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** System id of commodity.. */
+    private Long commodityNo;
+
+    /** Commodity code. */
+    @Excel(name = "Commodity code.")
+    private String commodityId;
+
+    /** Set to COMMODITY_NO to fake uniqueness of the Commodity Code. Set to 0 for approved Commodities enforce uniqueness. */
+    @Excel(name = "Set to COMMODITY_NO to fake uniqueness of the Commodity Code. Set to 0 for approved Commodities enforce uniqueness.")
+    private Long fakeUnique;
+
+    /** System id of catalogue. */
+    @Excel(name = "System id of catalogue.")
+    private Long catalogNo;
+
+    /** System id of class for this commodity (and its parts). */
+    @Excel(name = "System id of class for this commodity (and its parts).")
+    private Long commodityClassNo;
+
+    /** Method used to define this Commodity (1 = Generated, 2 = UserDefined, 3 = UserDefinedPartNumber, 4 = SubCode). */
+    @Excel(name = "Method used to define this Commodity (1 = Generated, 2 = UserDefined, 3 = UserDefinedPartNumber, 4 = SubCode).")
+    private Long defMethodNo;
+
+    /** Whether datasheet required (1 = True, 0 = False). */
+    @Excel(name = "Whether datasheet required (1 = True, 0 = False).")
+    private String datasheetReqd;
+
+    /** Whether part numbers for this Commodity may appear on requisitions (and other formal project reports) .(1 = True, 0 - False). */
+    @Excel(name = "Whether part numbers for this Commodity may appear on requisitions (and other formal project reports) .(1 = True, 0 - False).")
+    private String prntPartNo;
+
+    /** The unit of measure for the quantity of this commodity (e.g. whether it is purchased by length or by number off). */
+    @Excel(name = "The unit of measure for the quantity of this commodity (e.g. whether it is purchased by length or by number off).")
+    private String unitId;
+
+    /** Legacy commodity code. */
+    @Excel(name = "Legacy commodity code.")
+    private String commodityCodeOrig;
+
+    /** Approval status of Commodity (1 =  Working, 2 = Approved). */
+    @Excel(name = "Approval status of Commodity (1 =  Working, 2 = Approved).")
+    private Long approvalStatusNo;
+
+    /** Whether this part is obsolete. (1 = Active, 0 = Obsolete). */
+    @Excel(name = "Whether this part is obsolete. (1 = Active, 0 = Obsolete).")
+    private String stat;
+
+    /** Initials for person defining the COMMODITY. */
+    @Excel(name = "Initials for person defining the COMMODITY.")
+    private String defUsrId;
+
+    /** Definition date. */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "Definition date.", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date defDate;
+
+    /** Initials for person latest updating the COMMODITY. */
+    @Excel(name = "Initials for person latest updating the COMMODITY.")
+    private String updUsrId;
+
+    /** Latest update date. */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "Latest update date.", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updDate;
+
+    /** Unique id of the spec entry */
+    @Excel(name = "Unique id of the spec entry")
+    private Long specEntryNo;
+
+    public void setCommodityNo(Long commodityNo) 
+    {
+        this.commodityNo = commodityNo;
+    }
+
+    public Long getCommodityNo() 
+    {
+        return commodityNo;
+    }
+    public void setCommodityId(String commodityId) 
+    {
+        this.commodityId = commodityId;
+    }
+
+    public String getCommodityId() 
+    {
+        return commodityId;
+    }
+    public void setFakeUnique(Long fakeUnique) 
+    {
+        this.fakeUnique = fakeUnique;
+    }
+
+    public Long getFakeUnique() 
+    {
+        return fakeUnique;
+    }
+    public void setCatalogNo(Long catalogNo) 
+    {
+        this.catalogNo = catalogNo;
+    }
+
+    public Long getCatalogNo() 
+    {
+        return catalogNo;
+    }
+    public void setCommodityClassNo(Long commodityClassNo) 
+    {
+        this.commodityClassNo = commodityClassNo;
+    }
+
+    public Long getCommodityClassNo() 
+    {
+        return commodityClassNo;
+    }
+    public void setDefMethodNo(Long defMethodNo) 
+    {
+        this.defMethodNo = defMethodNo;
+    }
+
+    public Long getDefMethodNo() 
+    {
+        return defMethodNo;
+    }
+    public void setDatasheetReqd(String datasheetReqd) 
+    {
+        this.datasheetReqd = datasheetReqd;
+    }
+
+    public String getDatasheetReqd() 
+    {
+        return datasheetReqd;
+    }
+    public void setPrntPartNo(String prntPartNo) 
+    {
+        this.prntPartNo = prntPartNo;
+    }
+
+    public String getPrntPartNo() 
+    {
+        return prntPartNo;
+    }
+    public void setUnitId(String unitId) 
+    {
+        this.unitId = unitId;
+    }
+
+    public String getUnitId() 
+    {
+        return unitId;
+    }
+    public void setCommodityCodeOrig(String commodityCodeOrig) 
+    {
+        this.commodityCodeOrig = commodityCodeOrig;
+    }
+
+    public String getCommodityCodeOrig() 
+    {
+        return commodityCodeOrig;
+    }
+    public void setApprovalStatusNo(Long approvalStatusNo) 
+    {
+        this.approvalStatusNo = approvalStatusNo;
+    }
+
+    public Long getApprovalStatusNo() 
+    {
+        return approvalStatusNo;
+    }
+    public void setStat(String stat) 
+    {
+        this.stat = stat;
+    }
+
+    public String getStat() 
+    {
+        return stat;
+    }
+    public void setDefUsrId(String defUsrId) 
+    {
+        this.defUsrId = defUsrId;
+    }
+
+    public String getDefUsrId() 
+    {
+        return defUsrId;
+    }
+    public void setDefDate(Date defDate) 
+    {
+        this.defDate = defDate;
+    }
+
+    public Date getDefDate() 
+    {
+        return defDate;
+    }
+    public void setUpdUsrId(String updUsrId) 
+    {
+        this.updUsrId = updUsrId;
+    }
+
+    public String getUpdUsrId() 
+    {
+        return updUsrId;
+    }
+    public void setUpdDate(Date updDate) 
+    {
+        this.updDate = updDate;
+    }
+
+    public Date getUpdDate() 
+    {
+        return updDate;
+    }
+    public void setSpecEntryNo(Long specEntryNo) 
+    {
+        this.specEntryNo = specEntryNo;
+    }
+
+    public Long getSpecEntryNo() 
+    {
+        return specEntryNo;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("commodityNo", getCommodityNo())
+            .append("commodityId", getCommodityId())
+            .append("fakeUnique", getFakeUnique())
+            .append("catalogNo", getCatalogNo())
+            .append("commodityClassNo", getCommodityClassNo())
+            .append("defMethodNo", getDefMethodNo())
+            .append("datasheetReqd", getDatasheetReqd())
+            .append("prntPartNo", getPrntPartNo())
+            .append("unitId", getUnitId())
+            .append("commodityCodeOrig", getCommodityCodeOrig())
+            .append("approvalStatusNo", getApprovalStatusNo())
+            .append("stat", getStat())
+            .append("defUsrId", getDefUsrId())
+            .append("defDate", getDefDate())
+            .append("updUsrId", getUpdUsrId())
+            .append("updDate", getUpdDate())
+            .append("specEntryNo", getSpecEntryNo())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysApp.java

@@ -0,0 +1,98 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 编码申请对象 sys_app
+ * 
+ * @author ruoyi
+ * @date 2021-09-29
+ */
+public class SysApp extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编码申请单主键seq_sys_app.nextval */
+    private Long appId;
+
+    /** 申请编码 */
+    @Excel(name = "申请编码")
+    private String appCode;
+
+    /** 编码体系ID */
+    @Excel(name = "编码体系ID")
+    private Long categoryId;
+
+    /** 申请名称 */
+    @Excel(name = "申请名称")
+    private String appName;
+
+    /** 状态（0正常 1通过2驳回） */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=通过2驳回")
+    private String status;
+
+    public void setAppId(Long appId) 
+    {
+        this.appId = appId;
+    }
+
+    public Long getAppId() 
+    {
+        return appId;
+    }
+    public void setAppCode(String appCode) 
+    {
+        this.appCode = appCode;
+    }
+
+    public String getAppCode() 
+    {
+        return appCode;
+    }
+    public void setCategoryId(Long categoryId) 
+    {
+        this.categoryId = categoryId;
+    }
+
+    public Long getCategoryId() 
+    {
+        return categoryId;
+    }
+    public void setAppName(String appName) 
+    {
+        this.appName = appName;
+    }
+
+    public String getAppName() 
+    {
+        return appName;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("appId", getAppId())
+            .append("appCode", getAppCode())
+            .append("categoryId", getCategoryId())
+            .append("appName", getAppName())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/SysAppData.java

@@ -0,0 +1,280 @@
+package com.ruoyi.system.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 编码申请数据对象 sys_app_data
+ * 
+ * @author ruoyi
+ * @date 2021-09-29
+ */
+public class SysAppData extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 申请单明细主键seq_sys_app_data.nextval */
+    private Long appDataId;
+
+    /** 申请单ID */
+    @Excel(name = "申请单ID")
+    private Long appId;
+
+    /** CC或者ID（0:CC,1:ID） */
+    @Excel(name = "CC或者ID", readConverterExp = "0=:CC,1:ID")
+    private String type;
+
+    /** CC代码或ID代码 */
+    @Excel(name = "CC代码或ID代码")
+    private String code;
+
+    /** 设计描述 */
+    @Excel(name = "设计描述")
+    private String designDesc;
+
+    /** 中文公制短描述 */
+    @Excel(name = "中文公制短描述")
+    private String zhCnShortDesc;
+
+    /** 中文公制长描述 */
+    @Excel(name = "中文公制长描述")
+    private String zhCnLongDesc;
+
+    /** 中文英制短描述 */
+    @Excel(name = "中文英制短描述")
+    private String zhEnShortDesc;
+
+    /** 中文英制长描述 */
+    @Excel(name = "中文英制长描述")
+    private String zhEnLongDesc;
+
+    /** 俄文公制短描述 */
+    @Excel(name = "俄文公制短描述")
+    private String ruCnShortDesc;
+
+    /** 俄文公制长描述 */
+    @Excel(name = "俄文公制长描述")
+    private String ruCnLongDesc;
+
+    /** 俄文英制短描述 */
+    @Excel(name = "俄文英制短描述")
+    private String ruEnShortDesc;
+
+    /** 俄文英制长描述 */
+    @Excel(name = "俄文英制长描述")
+    private String ruEnLongDesc;
+
+    /** 英文公制短描述 */
+    @Excel(name = "英文公制短描述")
+    private String enCnShortDesc;
+
+    /** 英文公制长描述 */
+    @Excel(name = "英文公制长描述")
+    private String enCnLongDesc;
+
+    /** 英文英制短描述 */
+    @Excel(name = "英文英制短描述")
+    private String enEnShortDesc;
+
+    /** 英文英制长描述 */
+    @Excel(name = "英文英制长描述")
+    private String enEnLongDesc;
+
+    /** 状态（0正常 1停用） */
+    @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
+    private String status;
+
+    public void setAppDataId(Long appDataId) 
+    {
+        this.appDataId = appDataId;
+    }
+
+    public Long getAppDataId() 
+    {
+        return appDataId;
+    }
+    public void setAppId(Long appId) 
+    {
+        this.appId = appId;
+    }
+
+    public Long getAppId() 
+    {
+        return appId;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setCode(String code) 
+    {
+        this.code = code;
+    }
+
+    public String getCode() 
+    {
+        return code;
+    }
+    public void setDesignDesc(String designDesc) 
+    {
+        this.designDesc = designDesc;
+    }
+
+    public String getDesignDesc() 
+    {
+        return designDesc;
+    }
+    public void setZhCnShortDesc(String zhCnShortDesc) 
+    {
+        this.zhCnShortDesc = zhCnShortDesc;
+    }
+
+    public String getZhCnShortDesc() 
+    {
+        return zhCnShortDesc;
+    }
+    public void setZhCnLongDesc(String zhCnLongDesc) 
+    {
+        this.zhCnLongDesc = zhCnLongDesc;
+    }
+
+    public String getZhCnLongDesc() 
+    {
+        return zhCnLongDesc;
+    }
+    public void setZhEnShortDesc(String zhEnShortDesc) 
+    {
+        this.zhEnShortDesc = zhEnShortDesc;
+    }
+
+    public String getZhEnShortDesc() 
+    {
+        return zhEnShortDesc;
+    }
+    public void setZhEnLongDesc(String zhEnLongDesc) 
+    {
+        this.zhEnLongDesc = zhEnLongDesc;
+    }
+
+    public String getZhEnLongDesc() 
+    {
+        return zhEnLongDesc;
+    }
+    public void setRuCnShortDesc(String ruCnShortDesc) 
+    {
+        this.ruCnShortDesc = ruCnShortDesc;
+    }
+
+    public String getRuCnShortDesc() 
+    {
+        return ruCnShortDesc;
+    }
+    public void setRuCnLongDesc(String ruCnLongDesc) 
+    {
+        this.ruCnLongDesc = ruCnLongDesc;
+    }
+
+    public String getRuCnLongDesc() 
+    {
+        return ruCnLongDesc;
+    }
+    public void setRuEnShortDesc(String ruEnShortDesc) 
+    {
+        this.ruEnShortDesc = ruEnShortDesc;
+    }
+
+    public String getRuEnShortDesc() 
+    {
+        return ruEnShortDesc;
+    }
+    public void setRuEnLongDesc(String ruEnLongDesc) 
+    {
+        this.ruEnLongDesc = ruEnLongDesc;
+    }
+
+    public String getRuEnLongDesc() 
+    {
+        return ruEnLongDesc;
+    }
+    public void setEnCnShortDesc(String enCnShortDesc) 
+    {
+        this.enCnShortDesc = enCnShortDesc;
+    }
+
+    public String getEnCnShortDesc() 
+    {
+        return enCnShortDesc;
+    }
+    public void setEnCnLongDesc(String enCnLongDesc) 
+    {
+        this.enCnLongDesc = enCnLongDesc;
+    }
+
+    public String getEnCnLongDesc() 
+    {
+        return enCnLongDesc;
+    }
+    public void setEnEnShortDesc(String enEnShortDesc) 
+    {
+        this.enEnShortDesc = enEnShortDesc;
+    }
+
+    public String getEnEnShortDesc() 
+    {
+        return enEnShortDesc;
+    }
+    public void setEnEnLongDesc(String enEnLongDesc) 
+    {
+        this.enEnLongDesc = enEnLongDesc;
+    }
+
+    public String getEnEnLongDesc() 
+    {
+        return enEnLongDesc;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("appDataId", getAppDataId())
+            .append("appId", getAppId())
+            .append("type", getType())
+            .append("code", getCode())
+            .append("designDesc", getDesignDesc())
+            .append("zhCnShortDesc", getZhCnShortDesc())
+            .append("zhCnLongDesc", getZhCnLongDesc())
+            .append("zhEnShortDesc", getZhEnShortDesc())
+            .append("zhEnLongDesc", getZhEnLongDesc())
+            .append("ruCnShortDesc", getRuCnShortDesc())
+            .append("ruCnLongDesc", getRuCnLongDesc())
+            .append("ruEnShortDesc", getRuEnShortDesc())
+            .append("ruEnLongDesc", getRuEnLongDesc())
+            .append("enCnShortDesc", getEnCnShortDesc())
+            .append("enCnLongDesc", getEnCnLongDesc())
+            .append("enEnShortDesc", getEnEnShortDesc())
+            .append("enEnLongDesc", getEnEnLongDesc())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/AttribMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.Attrib;
+
+import java.util.List;
+
+/**
+ * 属性Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public interface AttribMapper 
+{
+    /**
+     * 查询属性
+     * 
+     * @param attribNo 属性主键
+     * @return 属性
+     */
+    public Attrib selectAttribByAttribNo(Long attribNo);
+
+    /**
+     * 查询属性列表
+     * 
+     * @param attrib 属性
+     * @return 属性集合
+     */
+    public List<Attrib> selectAttribList(Attrib attrib);
+    public List<Attrib> selectAttribListByClasss(long classId);
+
+    /**
+     * 新增属性
+     * 
+     * @param attrib 属性
+     * @return 结果
+     */
+    public int insertAttrib(Attrib attrib);
+
+    /**
+     * 修改属性
+     * 
+     * @param attrib 属性
+     * @return 结果
+     */
+    public int updateAttrib(Attrib attrib);
+
+    /**
+     * 删除属性
+     * 
+     * @param attribNo 属性主键
+     * @return 结果
+     */
+    public int deleteAttribByAttribNo(Long attribNo);
+
+    /**
+     * 批量删除属性
+     * 
+     * @param attribNos 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAttribByAttribNos(String[] attribNos);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/AttribValueMapper.java

@@ -0,0 +1,78 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.AttribValue;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * Table containing ATTRIB_VALUEMapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public interface AttribValueMapper 
+{
+    /**
+     * 查询Table containing ATTRIB_VALUE
+     * 
+     * @param attribValueNo Table containing ATTRIB_VALUE主键
+     * @return Table containing ATTRIB_VALUE
+     */
+    public AttribValue selectAttribValueByAttribValueNo(Long attribValueNo);
+
+    /**
+     * 查询Table containing ATTRIB_VALUE列表
+     * 
+     * @param attribValue Table containing ATTRIB_VALUE
+     * @return Table containing ATTRIB_VALUE集合
+     */
+    public List<AttribValue> selectAttribValueList(AttribValue attribValue);
+    /**
+     * 查询Table containing ATTRIB_VALUE列表
+     *
+     * @param attribId 属性ID
+     * @return ATTRIB_VALUE集合
+     */
+    public List<AttribValue> selectByAttrib(Long attribId);
+    /**
+     * 查询Table containing ATTRIB_VALUE列表
+     *
+     * @param typeId typeId
+     * @return 集合
+     */
+    public List<AttribValue> selectPropertyFormulaByTypeId(Long typeId);
+    public List<AttribValue> selectPropertyFormulaByTypeAndProperty(@Param("class_no")Long class_no, @Param("entity_property_no")Long entity_property_no    );
+
+    /**
+     * 新增Table containing ATTRIB_VALUE
+     * 
+     * @param attribValue Table containing ATTRIB_VALUE
+     * @return 结果
+     */
+    public int insertAttribValue(AttribValue attribValue);
+
+    /**
+     * 修改Table containing ATTRIB_VALUE
+     * 
+     * @param attribValue Table containing ATTRIB_VALUE
+     * @return 结果
+     */
+    public int updateAttribValue(AttribValue attribValue);
+
+    /**
+     * 删除Table containing ATTRIB_VALUE
+     * 
+     * @param attribValueNo Table containing ATTRIB_VALUE主键
+     * @return 结果
+     */
+    public int deleteAttribValueByAttribValueNo(Long attribValueNo);
+
+    /**
+     * 批量删除Table containing ATTRIB_VALUE
+     * 
+     * @param attribValueNos 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAttribValueByAttribValueNos(String[] attribValueNos);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ClasssMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.Classs;
+
+import java.util.List;
+
+/**
+ * Table containing Class HierarchyMapper接口
+ * 
+ * @author zbj
+ * @date 2021-08-31
+ */
+public interface ClasssMapper 
+{
+    /**
+     * 查询Table containing Class Hierarchy
+     * 
+     * @param classNo Table containing Class Hierarchy主键
+     * @return Table containing Class Hierarchy
+     */
+    public Classs selectClasssByClassNo(Long classNo);
+
+    /**
+     * 查询Table containing Class Hierarchy列表
+     * 
+     * @param classs Table containing Class Hierarchy
+     * @return Table containing Class Hierarchy集合
+     */
+    public List<Classs> selectClasssList(Classs classs);
+
+    /**
+     * 新增Table containing Class Hierarchy
+     * 
+     * @param classs Table containing Class Hierarchy
+     * @return 结果
+     */
+    public int insertClasss(Classs classs);
+
+    /**
+     * 修改Table containing Class Hierarchy
+     * 
+     * @param classs Table containing Class Hierarchy
+     * @return 结果
+     */
+    public int updateClasss(Classs classs);
+
+    /**
+     * 删除Table containing Class Hierarchy
+     * 
+     * @param classNo Table containing Class Hierarchy主键
+     * @return 结果
+     */
+    public int deleteClasssByClassNo(Long classNo);
+
+    /**
+     * 批量删除Table containing Class Hierarchy
+     * 
+     * @param classNos 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteClasssByClassNos(String[] classNos);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/CommodityMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.Commodity;
+
+import java.util.List;
+
+/**
+ * CC码Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public interface CommodityMapper 
+{
+    /**
+     * 查询CC码
+     * 
+     * @param commodityNo CC码主键
+     * @return CC码
+     */
+    public Commodity selectCommodityByCommodityNo(Long commodityNo);
+
+    /**
+     * 查询CC码列表
+     * 
+     * @param commodity CC码
+     * @return CC码集合
+     */
+    public List<Commodity> selectCommodityList(Commodity commodity);
+
+    /**
+     * 新增CC码
+     * 
+     * @param commodity CC码
+     * @return 结果
+     */
+    public int insertCommodity(Commodity commodity);
+
+    /**
+     * 修改CC码
+     * 
+     * @param commodity CC码
+     * @return 结果
+     */
+    public int updateCommodity(Commodity commodity);
+
+    /**
+     * 删除CC码
+     * 
+     * @param commodityNo CC码主键
+     * @return 结果
+     */
+    public int deleteCommodityByCommodityNo(Long commodityNo);
+
+    /**
+     * 批量删除CC码
+     * 
+     * @param commodityNos 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCommodityByCommodityNos(String[] commodityNos);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysAppDataMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+
+import com.ruoyi.system.domain.SysAppData;
+
+import java.util.List;
+
+/**
+ * 编码申请数据Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-09-29
+ */
+public interface SysAppDataMapper 
+{
+    /**
+     * 查询编码申请数据
+     * 
+     * @param appDataId 编码申请数据主键
+     * @return 编码申请数据
+     */
+    public SysAppData selectSysAppDataByAppDataId(Long appDataId);
+
+    /**
+     * 查询编码申请数据列表
+     * 
+     * @param sysAppData 编码申请数据
+     * @return 编码申请数据集合
+     */
+    public List<SysAppData> selectSysAppDataList(SysAppData sysAppData);
+
+    /**
+     * 新增编码申请数据
+     * 
+     * @param sysAppData 编码申请数据
+     * @return 结果
+     */
+    public int insertSysAppData(SysAppData sysAppData);
+
+    /**
+     * 修改编码申请数据
+     * 
+     * @param sysAppData 编码申请数据
+     * @return 结果
+     */
+    public int updateSysAppData(SysAppData sysAppData);
+
+    /**
+     * 删除编码申请数据
+     * 
+     * @param appDataId 编码申请数据主键
+     * @return 结果
+     */
+    public int deleteSysAppDataByAppDataId(Long appDataId);
+
+    /**
+     * 批量删除编码申请数据
+     * 
+     * @param appDataIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysAppDataByAppDataIds(String[] appDataIds);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysAppMapper.java

@@ -0,0 +1,68 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.SysApp;
+
+import java.util.List;
+
+/**
+ * 编码申请Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2021-09-29
+ */
+public interface SysAppMapper 
+{
+    /**
+     * 查询编码申请
+     * 
+     * @param appId 编码申请主键
+     * @return 编码申请
+     */
+    public SysApp selectSysAppByAppId(Long appId);
+
+    /**
+     * 查询编码申请列表
+     * 
+     * @param sysApp 编码申请
+     * @return 编码申请集合
+     */
+    public List<SysApp> selectSysAppList(SysApp sysApp);
+
+    /**
+     * 新增编码申请
+     * 
+     * @param sysApp 编码申请
+     * @return 结果
+     */
+    public int insertSysApp(SysApp sysApp);
+
+    /**
+     * 修改编码申请
+     * 
+     * @param sysApp 编码申请
+     * @return 结果
+     */
+    public int updateSysApp(SysApp sysApp);
+
+    /**
+     * 删除编码申请
+     * 
+     * @param appId 编码申请主键
+     * @return 结果
+     */
+    public int deleteSysAppByAppId(Long appId);
+
+    /**
+     * 批量删除编码申请
+     * 
+     * @param appIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysAppByAppIds(String[] appIds);
+    /**
+     * 查询所有申请单
+     *
+     * @return 结果
+     */
+    List<SysApp> selectAppAll();
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IAttribService.java

@@ -0,0 +1,69 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.Attrib;
+
+import java.util.List;
+
+/**
+ * 属性Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public interface IAttribService 
+{
+    /**
+     * 查询属性
+     * 
+     * @param attribNo 属性主键
+     * @return 属性
+     */
+    public Attrib selectAttribByAttribNo(Long attribNo);
+
+    /**
+     * 查询属性列表
+     * 
+     * @param attrib 属性
+     * @return 属性集合
+     */
+    public List<Attrib> selectAttribList(Attrib attrib);
+    /**
+     * 根据分类ID查询属性列表
+     *
+     * @param classsNo 属性
+     * @return 属性集合
+     */
+    public List<Attrib> selectAttribListByClasss(Long classsNo);
+
+    /**
+     * 新增属性
+     * 
+     * @param attrib 属性
+     * @return 结果
+     */
+    public int insertAttrib(Attrib attrib);
+
+    /**
+     * 修改属性
+     * 
+     * @param attrib 属性
+     * @return 结果
+     */
+    public int updateAttrib(Attrib attrib);
+
+    /**
+     * 批量删除属性
+     * 
+     * @param attribNos 需要删除的属性主键集合
+     * @return 结果
+     */
+    public int deleteAttribByAttribNos(String attribNos);
+
+    /**
+     * 删除属性信息
+     * 
+     * @param attribNo 属性主键
+     * @return 结果
+     */
+    public int deleteAttribByAttribNo(Long attribNo);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IAttribValueService.java

@@ -0,0 +1,77 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.AttribValue;
+
+import java.util.List;
+
+/**
+ * Table containing ATTRIB_VALUEService接口
+ * 
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public interface IAttribValueService 
+{
+    /**
+     * 查询Table containing ATTRIB_VALUE
+     * 
+     * @param attribValueNo Table containing ATTRIB_VALUE主键
+     * @return Table containing ATTRIB_VALUE
+     */
+    public AttribValue selectAttribValueByAttribValueNo(Long attribValueNo);
+
+    /**
+     * 查询Table containing ATTRIB_VALUE列表
+     * 
+     * @param attribValue Table containing ATTRIB_VALUE
+     * @return Table containing ATTRIB_VALUE集合
+     */
+    public List<AttribValue> selectAttribValueList(AttribValue attribValue);
+    /**
+     * 查询Table containing ATTRIB_VALUE列表
+     *
+     * @param attribId 属性ID
+     * @return ATTRIB_VALUE集合
+     */
+    public List<AttribValue> selectByAttrib(Long attribId);
+    /**
+     * 根据分类ID获取描述规则
+     *
+     * @param typeId 分类ID
+     * @return 集合
+     */
+    public List<AttribValue> selectPropertyFormulaByTypeId(Long typeId);
+    public List<AttribValue> selectPropertyFormulaByTypeAndProperty(Long typeId,Long property);
+
+    /**
+     * 新增Table containing ATTRIB_VALUE
+     * 
+     * @param attribValue Table containing ATTRIB_VALUE
+     * @return 结果
+     */
+    public int insertAttribValue(AttribValue attribValue);
+
+    /**
+     * 修改Table containing ATTRIB_VALUE
+     * 
+     * @param attribValue Table containing ATTRIB_VALUE
+     * @return 结果
+     */
+    public int updateAttribValue(AttribValue attribValue);
+
+    /**
+     * 批量删除Table containing ATTRIB_VALUE
+     * 
+     * @param attribValueNos 需要删除的Table containing ATTRIB_VALUE主键集合
+     * @return 结果
+     */
+    public int deleteAttribValueByAttribValueNos(String attribValueNos);
+
+    /**
+     * 删除Table containing ATTRIB_VALUE信息
+     * 
+     * @param attribValueNo Table containing ATTRIB_VALUE主键
+     * @return 结果
+     */
+    public int deleteAttribValueByAttribValueNo(Long attribValueNo);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IClasssService.java

@@ -0,0 +1,76 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.common.core.domain.Ztree;
+import com.ruoyi.system.domain.Classs;
+
+import java.util.List;
+
+/**
+ * Table containing Class HierarchyService接口
+ * 
+ * @author zbj
+ * @date 2021-08-31
+ */
+public interface IClasssService
+{
+    /**
+     * 查询Table containing Class Hierarchy
+     * 
+     * @param classNo Table containing Class Hierarchy主键
+     * @return Table containing Class Hierarchy
+     */
+    public Classs selectClasssByClassNo(Long classNo);
+
+    /**
+     * 查询Table containing Class Hierarchy列表
+     * 
+     * @param classs Table containing Class Hierarchy
+     * @return Table containing Class Hierarchy集合
+     */
+    public List<Classs> selectClasssList(Classs classs);
+
+    /**
+     * 新增Table containing Class Hierarchy
+     * 
+     * @param classs Table containing Class Hierarchy
+     * @return 结果
+     */
+    public int insertClasss(Classs classs);
+
+    /**
+     * 修改Table containing Class Hierarchy
+     * 
+     * @param classs Table containing Class Hierarchy
+     * @return 结果
+     */
+    public int updateClasss(Classs classs);
+
+    /**
+     * 批量删除Table containing Class Hierarchy
+     * 
+     * @param classNos 需要删除的Table containing Class Hierarchy主键集合
+     * @return 结果
+     */
+    public int deleteClasssByClassNos(String classNos);
+
+    /**
+     * 删除Table containing Class Hierarchy信息
+     * 
+     * @param classNo Table containing Class Hierarchy主键
+     * @return 结果
+     */
+    public int deleteClasssByClassNo(Long classNo);
+
+    /**
+     * 查询Table containing Class Hierarchy树列表
+     * 
+     * @return 所有Table containing Class Hierarchy信息
+     */
+    public List<Ztree> selectClasssTree();
+    /**
+     * 查询已发布分类树
+     *
+     * @return
+     */
+    public List<Classs> selectApprovalClasss();
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ICommodityService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.Commodity;
+
+import java.util.List;
+
+/**
+ * CC码Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+public interface ICommodityService 
+{
+    /**
+     * 查询CC码
+     * 
+     * @param commodityNo CC码主键
+     * @return CC码
+     */
+    public Commodity selectCommodityByCommodityNo(Long commodityNo);
+
+    /**
+     * 查询CC码列表
+     * 
+     * @param commodity CC码
+     * @return CC码集合
+     */
+    public List<Commodity> selectCommodityList(Commodity commodity);
+
+    /**
+     * 新增CC码
+     * 
+     * @param commodity CC码
+     * @return 结果
+     */
+    public int insertCommodity(Commodity commodity);
+
+    /**
+     * 修改CC码
+     * 
+     * @param commodity CC码
+     * @return 结果
+     */
+    public int updateCommodity(Commodity commodity);
+
+    /**
+     * 批量删除CC码
+     * 
+     * @param commodityNos 需要删除的CC码主键集合
+     * @return 结果
+     */
+    public int deleteCommodityByCommodityNos(String commodityNos);
+
+    /**
+     * 删除CC码信息
+     * 
+     * @param commodityNo CC码主键
+     * @return 结果
+     */
+    public int deleteCommodityByCommodityNo(Long commodityNo);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AttribServiceImpl.java

@@ -0,0 +1,102 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.enums.DataSourceType;
+import com.ruoyi.system.domain.Attrib;
+import com.ruoyi.system.mapper.AttribMapper;
+import com.ruoyi.system.service.IAttribService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 属性Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+@Service
+public class AttribServiceImpl implements IAttribService 
+{
+    @Autowired
+    private AttribMapper attribMapper;
+
+    /**
+     * 查询属性
+     * 
+     * @param attribNo 属性主键
+     * @return 属性
+     */
+    @Override
+    public Attrib selectAttribByAttribNo(Long attribNo)
+    {
+        return attribMapper.selectAttribByAttribNo(attribNo);
+    }
+
+    /**
+     * 查询属性列表
+     * 
+     * @param attrib 属性
+     * @return 属性
+     */
+    @Override
+    public List<Attrib> selectAttribList(Attrib attrib)
+    {
+        return attribMapper.selectAttribList(attrib);
+    }
+    @DataSource(value = DataSourceType.SLAVE)
+    @Override
+    public List<Attrib> selectAttribListByClasss(Long classsNo) {
+        return attribMapper.selectAttribListByClasss(classsNo);
+    }
+
+    /**
+     * 新增属性
+     * 
+     * @param attrib 属性
+     * @return 结果
+     */
+    @Override
+    public int insertAttrib(Attrib attrib)
+    {
+        return attribMapper.insertAttrib(attrib);
+    }
+
+    /**
+     * 修改属性
+     * 
+     * @param attrib 属性
+     * @return 结果
+     */
+    @Override
+    public int updateAttrib(Attrib attrib)
+    {
+        return attribMapper.updateAttrib(attrib);
+    }
+
+    /**
+     * 批量删除属性
+     * 
+     * @param attribNos 需要删除的属性主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAttribByAttribNos(String attribNos)
+    {
+        return attribMapper.deleteAttribByAttribNos(Convert.toStrArray(attribNos));
+    }
+
+    /**
+     * 删除属性信息
+     * 
+     * @param attribNo 属性主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAttribByAttribNo(Long attribNo)
+    {
+        return attribMapper.deleteAttribByAttribNo(attribNo);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AttribValueServiceImpl.java

@@ -0,0 +1,124 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.enums.DataSourceType;
+import com.ruoyi.system.domain.AttribValue;
+import com.ruoyi.system.mapper.AttribValueMapper;
+import com.ruoyi.system.service.IAttribValueService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Table containing ATTRIB_VALUEService业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+@Service
+public class AttribValueServiceImpl implements IAttribValueService 
+{
+    @Autowired
+    private AttribValueMapper attribValueMapper;
+
+    /**
+     * 查询Table containing ATTRIB_VALUE
+     * 
+     * @param attribValueNo Table containing ATTRIB_VALUE主键
+     * @return Table containing ATTRIB_VALUE
+     */
+    @Override
+    public AttribValue selectAttribValueByAttribValueNo(Long attribValueNo)
+    {
+        return attribValueMapper.selectAttribValueByAttribValueNo(attribValueNo);
+    }
+
+    /**
+     * 查询Table containing ATTRIB_VALUE列表
+     * 
+     * @param attribValue Table containing ATTRIB_VALUE
+     * @return Table containing ATTRIB_VALUE
+     */
+    @Override
+    public List<AttribValue> selectAttribValueList(AttribValue attribValue)
+    {
+        return attribValueMapper.selectAttribValueList(attribValue);
+    }
+
+    /**
+     * 新增Table containing ATTRIB_VALUE
+     * 
+     * @param attribValue Table containing ATTRIB_VALUE
+     * @return 结果
+     */
+    @Override
+    public int insertAttribValue(AttribValue attribValue)
+    {
+        return attribValueMapper.insertAttribValue(attribValue);
+    }
+
+    /**
+     * 修改Table containing ATTRIB_VALUE
+     * 
+     * @param attribValue Table containing ATTRIB_VALUE
+     * @return 结果
+     */
+    @Override
+    public int updateAttribValue(AttribValue attribValue)
+    {
+        return attribValueMapper.updateAttribValue(attribValue);
+    }
+
+    /**
+     * 批量删除Table containing ATTRIB_VALUE
+     * 
+     * @param attribValueNos 需要删除的Table containing ATTRIB_VALUE主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAttribValueByAttribValueNos(String attribValueNos)
+    {
+        return attribValueMapper.deleteAttribValueByAttribValueNos(Convert.toStrArray(attribValueNos));
+    }
+
+    /**
+     * 删除Table containing ATTRIB_VALUE信息
+     * 
+     * @param attribValueNo Table containing ATTRIB_VALUE主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAttribValueByAttribValueNo(Long attribValueNo)
+    {
+        return attribValueMapper.deleteAttribValueByAttribValueNo(attribValueNo);
+    }
+    /**
+     * 查询Table  ATTRIB_VALUE列表
+     *
+     * @param attribId 属性ID
+     * @return ATTRIB_VALUE集合
+     */
+    @DataSource(value = DataSourceType.SLAVE)
+    @Override
+    public List<AttribValue>selectByAttrib(Long attribId){
+        return attribValueMapper.selectByAttrib(attribId);
+    }
+    /**
+     * 根据分类ID获取描述规则
+     *
+     * @param typeId 分类ID
+     * @return 集合
+     */
+    @DataSource(value = DataSourceType.SLAVE)
+    @Override
+    public List<AttribValue>selectPropertyFormulaByTypeId(Long typeId){
+        return attribValueMapper.selectPropertyFormulaByTypeId(typeId);
+    }
+    @DataSource(value = DataSourceType.SLAVE)
+    @Override
+    public List<AttribValue> selectPropertyFormulaByTypeAndProperty(Long typeId,Long entity_property_no ){
+        return attribValueMapper.selectPropertyFormulaByTypeAndProperty(typeId,entity_property_no);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClasssServiceImpl.java

@@ -0,0 +1,152 @@
+package com.ruoyi.system.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.Ztree;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.enums.DataSourceType;
+import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.system.domain.Classs;
+import com.ruoyi.system.mapper.ClasssMapper;
+import com.ruoyi.system.service.IClasssService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Table containing Class HierarchyService业务层处理
+ * 
+ * @author zbj
+ * @date 2021-08-31
+ */
+@Service("classs")
+@DataSource(value = DataSourceType.SLAVE)
+public class ClasssServiceImpl implements IClasssService 
+{
+    @Autowired
+    private ClasssMapper classsMapper;
+
+    /**
+     * 查询Table containing Class Hierarchy
+     * 
+     * @param classNo Table containing Class Hierarchy主键
+     * @return Table containing Class Hierarchy
+     */
+    @Override
+    public Classs selectClasssByClassNo(Long classNo)
+    {
+        return classsMapper.selectClasssByClassNo(classNo);
+    }
+
+    /**
+     * 查询Table containing Class Hierarchy列表
+     * 
+     * @param classs Table containing Class Hierarchy
+     * @return Table containing Class Hierarchy
+     */
+    @Override
+    public List<Classs> selectClasssList(Classs classs)
+    {
+        return classsMapper.selectClasssList(classs);
+    }
+
+    /**
+     * 新增Table containing Class Hierarchy
+     * 
+     * @param classs Table containing Class Hierarchy
+     * @return 结果
+     */
+    @Override
+    public int insertClasss(Classs classs)
+    {
+        return classsMapper.insertClasss(classs);
+    }
+
+    /**
+     * 修改Table containing Class Hierarchy
+     * 
+     * @param classs Table containing Class Hierarchy
+     * @return 结果
+     */
+    @Override
+    public int updateClasss(Classs classs)
+    {
+        return classsMapper.updateClasss(classs);
+    }
+
+    /**
+     * 批量删除Table containing Class Hierarchy
+     * 
+     * @param classNos 需要删除的Table containing Class Hierarchy主键
+     * @return 结果
+     */
+    @Override
+    public int deleteClasssByClassNos(String classNos)
+    {
+        return classsMapper.deleteClasssByClassNos(Convert.toStrArray(classNos));
+    }
+
+    /**
+     * 删除Table containing Class Hierarchy信息
+     * 
+     * @param classNo Table containing Class Hierarchy主键
+     * @return 结果
+     */
+    @Override
+    public int deleteClasssByClassNo(Long classNo)
+    {
+        return classsMapper.deleteClasssByClassNo(classNo);
+    }
+
+    /**
+     * 查询Table containing Class Hierarchy树列表
+     * 
+     * @return 所有Table containing Class Hierarchy信息
+     */
+    @Override
+    public List<Ztree> selectClasssTree()
+    {
+        String json= HttpUtils.sendGet(Constants.WLFL,"pagecount=1");
+        JSONObject jsonObject = JSONObject.parseObject(json);
+        String totals = jsonObject.getString("totals");
+        Double num =Math.ceil(Double.parseDouble(totals)/100);
+        List<HashMap> object=new ArrayList<>();
+        for(int i=1;i<=num.intValue();i++){
+             json= HttpUtils.sendGet(Constants.WLFL,"pagecount=100&pagenum="+i);
+             jsonObject = JSONObject.parseObject(json);
+            String r = jsonObject.getString("data");
+            object.addAll (JSONArray.parseArray(r, HashMap.class)) ;
+        }
+        List<Ztree> ztrees = new ArrayList<Ztree>();
+        System.out.println(object.size());
+        for (HashMap map : object)
+        {
+            Ztree ztree = new Ztree();
+            ztree.setId(Long.valueOf(map.get("class_no").toString()));
+            ztree.setpId(Long.valueOf(map.get("parent_class_no")==null?"0":map.get("parent_class_no").toString()));
+            ztree.setName((String) map.get("class_id"));
+            ztree.setTitle((String) map.get("descr"));
+            ztrees.add(ztree);
+        }
+        return ztrees;
+    }
+
+    /**
+     * 查询已发布的分类
+     *
+     * @return 所有已发布的分类
+     */
+    @Override
+    public List<Classs> selectApprovalClasss() {
+        Classs classs=new Classs();
+        classs.setApprovalStatusNo(Classs.APPROVAL_APPROVED);
+        classs.setCatEntityTypeNo(3L);
+        List<Classs> classList=selectClasssList( classs);
+        return  classList;
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CommodityServiceImpl.java

@@ -0,0 +1,95 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.system.domain.Commodity;
+import com.ruoyi.system.mapper.CommodityMapper;
+import com.ruoyi.system.service.ICommodityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * CC码Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-09-02
+ */
+@Service
+public class CommodityServiceImpl implements ICommodityService 
+{
+    @Autowired
+    private CommodityMapper commodityMapper;
+
+    /**
+     * 查询CC码
+     * 
+     * @param commodityNo CC码主键
+     * @return CC码
+     */
+    @Override
+    public Commodity selectCommodityByCommodityNo(Long commodityNo)
+    {
+        return commodityMapper.selectCommodityByCommodityNo(commodityNo);
+    }
+
+    /**
+     * 查询CC码列表
+     * 
+     * @param commodity CC码
+     * @return CC码
+     */
+    @Override
+    public List<Commodity> selectCommodityList(Commodity commodity)
+    {
+        return commodityMapper.selectCommodityList(commodity);
+    }
+
+    /**
+     * 新增CC码
+     * 
+     * @param commodity CC码
+     * @return 结果
+     */
+    @Override
+    public int insertCommodity(Commodity commodity)
+    {
+        return commodityMapper.insertCommodity(commodity);
+    }
+
+    /**
+     * 修改CC码
+     * 
+     * @param commodity CC码
+     * @return 结果
+     */
+    @Override
+    public int updateCommodity(Commodity commodity)
+    {
+        return commodityMapper.updateCommodity(commodity);
+    }
+
+    /**
+     * 批量删除CC码
+     * 
+     * @param commodityNos 需要删除的CC码主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCommodityByCommodityNos(String commodityNos)
+    {
+        return commodityMapper.deleteCommodityByCommodityNos(Convert.toStrArray(commodityNos));
+    }
+
+    /**
+     * 删除CC码信息
+     * 
+     * @param commodityNo CC码主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCommodityByCommodityNo(Long commodityNo)
+    {
+        return commodityMapper.deleteCommodityByCommodityNo(commodityNo);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ISysAppDataService.java

@@ -0,0 +1,64 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.domain.SysAppData;
+
+import java.util.List;
+
+/**
+ * 编码申请数据Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-09-29
+ */
+public interface ISysAppDataService 
+{
+    /**
+     * 查询编码申请数据
+     * 
+     * @param appDataId 编码申请数据主键
+     * @return 编码申请数据
+     */
+    public SysAppData selectSysAppDataByAppDataId(Long appDataId);
+
+    /**
+     * 查询编码申请数据列表
+     * 
+     * @param sysAppData 编码申请数据
+     * @return 编码申请数据集合
+     */
+    public List<SysAppData> selectSysAppDataList(SysAppData sysAppData);
+
+    /**
+     * 新增编码申请数据
+     * 
+     * @param sysAppData 编码申请数据
+     * @return 结果
+     */
+    public int insertSysAppData(SysAppData sysAppData);
+
+    /**
+     * 修改编码申请数据
+     * 
+     * @param sysAppData 编码申请数据
+     * @return 结果
+     */
+    public int updateSysAppData(SysAppData sysAppData);
+
+    /**
+     * 批量删除编码申请数据
+     * 
+     * @param appDataIds 需要删除的编码申请数据主键集合
+     * @return 结果
+     */
+    public int deleteSysAppDataByAppDataIds(String appDataIds);
+
+    /**
+     * 删除编码申请数据信息
+     * 
+     * @param appDataId 编码申请数据主键
+     * @return 结果
+     */
+    public int deleteSysAppDataByAppDataId(Long appDataId);
+
+   
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ISysAppService.java

@@ -0,0 +1,68 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.domain.SysApp;
+
+import java.util.List;
+
+/**
+ * 编码申请Service接口
+ * 
+ * @author ruoyi
+ * @date 2021-09-29
+ */
+public interface ISysAppService 
+{
+    /**
+     * 查询编码申请
+     * 
+     * @param appId 编码申请主键
+     * @return 编码申请
+     */
+    public SysApp selectSysAppByAppId(Long appId);
+
+    /**
+     * 查询编码申请列表
+     * 
+     * @param sysApp 编码申请
+     * @return 编码申请集合
+     */
+    public List<SysApp> selectSysAppList(SysApp sysApp);
+
+    /**
+     * 新增编码申请
+     * 
+     * @param sysApp 编码申请
+     * @return 结果
+     */
+    public int insertSysApp(SysApp sysApp);
+
+    /**
+     * 修改编码申请
+     * 
+     * @param sysApp 编码申请
+     * @return 结果
+     */
+    public int updateSysApp(SysApp sysApp);
+
+    /**
+     * 批量删除编码申请
+     * 
+     * @param appIds 需要删除的编码申请主键集合
+     * @return 结果
+     */
+    public int deleteSysAppByAppIds(String appIds);
+
+    /**
+     * 删除编码申请信息
+     * 
+     * @param appId 编码申请主键
+     * @return 结果
+     */
+    public int deleteSysAppByAppId(Long appId);
+    /**
+     * 根据所有申请单
+     *
+     * @return 申请单集合信息
+     */
+    public List<SysApp> selectAppAll();
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysAppDataServiceImpl.java

@@ -0,0 +1,97 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.SysAppData;
+import com.ruoyi.system.mapper.SysAppDataMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 编码申请数据Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-09-29
+ */
+@Service
+public class SysAppDataServiceImpl implements ISysAppDataService 
+{
+    @Autowired
+    private SysAppDataMapper sysAppDataMapper;
+
+    /**
+     * 查询编码申请数据
+     * 
+     * @param appDataId 编码申请数据主键
+     * @return 编码申请数据
+     */
+    @Override
+    public SysAppData selectSysAppDataByAppDataId(Long appDataId)
+    {
+        return sysAppDataMapper.selectSysAppDataByAppDataId(appDataId);
+    }
+
+    /**
+     * 查询编码申请数据列表
+     * 
+     * @param sysAppData 编码申请数据
+     * @return 编码申请数据
+     */
+    @Override
+    public List<SysAppData> selectSysAppDataList(SysAppData sysAppData)
+    {
+        return sysAppDataMapper.selectSysAppDataList(sysAppData);
+    }
+
+    /**
+     * 新增编码申请数据
+     * 
+     * @param sysAppData 编码申请数据
+     * @return 结果
+     */
+    @Override
+    public int insertSysAppData(SysAppData sysAppData)
+    {
+        sysAppData.setCreateTime(DateUtils.getNowDate());
+        return sysAppDataMapper.insertSysAppData(sysAppData);
+    }
+
+    /**
+     * 修改编码申请数据
+     * 
+     * @param sysAppData 编码申请数据
+     * @return 结果
+     */
+    @Override
+    public int updateSysAppData(SysAppData sysAppData)
+    {
+        sysAppData.setUpdateTime(DateUtils.getNowDate());
+        return sysAppDataMapper.updateSysAppData(sysAppData);
+    }
+
+    /**
+     * 批量删除编码申请数据
+     * 
+     * @param appDataIds 需要删除的编码申请数据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysAppDataByAppDataIds(String appDataIds)
+    {
+        return sysAppDataMapper.deleteSysAppDataByAppDataIds(Convert.toStrArray(appDataIds));
+    }
+
+    /**
+     * 删除编码申请数据信息
+     * 
+     * @param appDataId 编码申请数据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysAppDataByAppDataId(Long appDataId)
+    {
+        return sysAppDataMapper.deleteSysAppDataByAppDataId(appDataId);
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysAppServiceImpl.java

@@ -0,0 +1,103 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.SysApp;
+import com.ruoyi.system.mapper.SysAppMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 编码申请Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2021-09-29
+ */
+@Service
+public class SysAppServiceImpl implements ISysAppService 
+{
+    @Autowired
+    private SysAppMapper sysAppMapper;
+
+    /**
+     * 查询编码申请
+     * 
+     * @param appId 编码申请主键
+     * @return 编码申请
+     */
+    @Override
+    public SysApp selectSysAppByAppId(Long appId)
+    {
+        return sysAppMapper.selectSysAppByAppId(appId);
+    }
+
+    /**
+     * 查询编码申请列表
+     * 
+     * @param sysApp 编码申请
+     * @return 编码申请
+     */
+    @Override
+    public List<SysApp> selectSysAppList(SysApp sysApp)
+    {
+        return sysAppMapper.selectSysAppList(sysApp);
+    }
+
+    /**
+     * 新增编码申请
+     * 
+     * @param sysApp 编码申请
+     * @return 结果
+     */
+    @Override
+    public int insertSysApp(SysApp sysApp)
+    {
+        sysApp.setCreateTime(DateUtils.getNowDate());
+        return sysAppMapper.insertSysApp(sysApp);
+    }
+
+    /**
+     * 修改编码申请
+     * 
+     * @param sysApp 编码申请
+     * @return 结果
+     */
+    @Override
+    public int updateSysApp(SysApp sysApp)
+    {
+        sysApp.setUpdateTime(DateUtils.getNowDate());
+        return sysAppMapper.updateSysApp(sysApp);
+    }
+
+    /**
+     * 批量删除编码申请
+     * 
+     * @param appIds 需要删除的编码申请主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysAppByAppIds(String appIds)
+    {
+        return sysAppMapper.deleteSysAppByAppIds(Convert.toStrArray(appIds));
+    }
+
+    /**
+     * 删除编码申请信息
+     * 
+     * @param appId 编码申请主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysAppByAppId(Long appId)
+    {
+        return sysAppMapper.deleteSysAppByAppId(appId);
+    }
+
+    @Override
+    public List<SysApp> selectAppAll() {
+        return sysAppMapper.selectAppAll();
+    }
+
+}

ruoyi-system/src/main/resources/mapper/system/AttribMapper.xml

@@ -0,0 +1,177 @@
+<?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.ruoyi.system.mapper.AttribMapper">
+    
+    <resultMap type="Attrib" id="AttribResult">
+        <result property="attribNo"    column="attrib_no"    />
+        <result property="attribId"    column="attrib_id"    />
+        <result property="catalogNo"    column="catalog_no"    />
+        <result property="calcParam"    column="calc_param"    />
+        <result property="physicalValueType"    column="physical_value_type"    />
+        <result property="physicalValueUnitId"    column="physical_value_unit_id"    />
+        <result property="descr"    column="descr"    />
+        <result property="commodityLevel"    column="commodity_level"    />
+        <result property="sizeRefLevel"    column="size_ref_level"    />
+        <result property="partLevel"    column="part_level"    />
+        <result property="modellerLevel"    column="modeller_level"    />
+        <result property="defScope"    column="def_scope"    />
+        <result property="stat"    column="stat"    />
+        <result property="attribCategoryNo"    column="attrib_category_no"    />
+        <result property="drawDisciplineNo"    column="draw_discipline_no"    />
+        <result property="defUsrId"    column="def_usr_id"    />
+        <result property="defDate"    column="def_date"    />
+        <result property="defApplNo"    column="def_appl_no"    />
+        <result property="updUsrId"    column="upd_usr_id"    />
+        <result property="updDate"    column="upd_date"    />
+        <result property="updApplNo"    column="upd_appl_no"    />
+        <result property="matchWeightingNo"    column="match_weighting_no"    />
+        <result property="isSystem"    column="is_system"    />
+        <result property="class_attrib_id"    column="class_attrib_id"    />
+    </resultMap>
+
+    <sql id="selectAttribVo">
+        select attrib_no, attrib_id, catalog_no, calc_param, physical_value_type, physical_value_unit_id, descr, commodity_level, size_ref_level, part_level, modeller_level, def_scope, stat, attrib_category_no, draw_discipline_no, def_usr_id, def_date, def_appl_no, upd_usr_id, upd_date, upd_appl_no, match_weighting_no, is_system from attrib
+    </sql>
+
+    <select id="selectAttribListByClasss" parameterType="Long" resultMap="AttribResult">
+        select t.* from CLASS_ATTRIB t
+        <where>
+            <if test="classsNo != null  and classsNo != ''"> and t.class_no = #{classsNo}</if>
+        </where>
+
+        and t.cat_entity_type_no = 1
+        order by t.seq_no
+    </select>
+    <select id="selectAttribList" parameterType="Attrib" resultMap="AttribResult">
+        <include refid="selectAttribVo"/>
+        <where>
+            <if test="attribId != null  and attribId != ''"> and attrib_id = #{attribId}</if>
+            <if test="catalogNo != null "> and catalog_no = #{catalogNo}</if>
+            <if test="calcParam != null  and calcParam != ''"> and calc_param = #{calcParam}</if>
+            <if test="physicalValueType != null  and physicalValueType != ''"> and physical_value_type = #{physicalValueType}</if>
+            <if test="physicalValueUnitId != null  and physicalValueUnitId != ''"> and physical_value_unit_id = #{physicalValueUnitId}</if>
+            <if test="descr != null  and descr != ''"> and descr = #{descr}</if>
+            <if test="commodityLevel != null  and commodityLevel != ''"> and commodity_level = #{commodityLevel}</if>
+            <if test="sizeRefLevel != null  and sizeRefLevel != ''"> and size_ref_level = #{sizeRefLevel}</if>
+            <if test="partLevel != null  and partLevel != ''"> and part_level = #{partLevel}</if>
+            <if test="modellerLevel != null  and modellerLevel != ''"> and modeller_level = #{modellerLevel}</if>
+            <if test="defScope != null "> and def_scope = #{defScope}</if>
+            <if test="stat != null  and stat != ''"> and stat = #{stat}</if>
+            <if test="attribCategoryNo != null "> and attrib_category_no = #{attribCategoryNo}</if>
+            <if test="drawDisciplineNo != null "> and draw_discipline_no = #{drawDisciplineNo}</if>
+            <if test="defUsrId != null  and defUsrId != ''"> and def_usr_id = #{defUsrId}</if>
+            <if test="defDate != null "> and def_date = #{defDate}</if>
+            <if test="defApplNo != null "> and def_appl_no = #{defApplNo}</if>
+            <if test="updUsrId != null  and updUsrId != ''"> and upd_usr_id = #{updUsrId}</if>
+            <if test="updDate != null "> and upd_date = #{updDate}</if>
+            <if test="updApplNo != null "> and upd_appl_no = #{updApplNo}</if>
+            <if test="matchWeightingNo != null "> and match_weighting_no = #{matchWeightingNo}</if>
+            <if test="isSystem != null  and isSystem != ''"> and is_system = #{isSystem}</if>
+            <if test="class_attrib_id != null  and class_attrib_id != ''"> and class_attrib_id = #{class_attrib_id}</if>
+        </where>
+    </select>
+    
+    <select id="selectAttribByAttribNo" parameterType="Long" resultMap="AttribResult">
+        <include refid="selectAttribVo"/>
+        where attrib_no = #{attribNo}
+    </select>
+        
+    <insert id="insertAttrib" parameterType="Attrib">
+        <selectKey keyProperty="attribNo" resultType="long" order="BEFORE">
+            SELECT seq_attrib.NEXTVAL as attribNo FROM DUAL
+        </selectKey>
+        insert into attrib
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="attribNo != null">attrib_no,</if>
+            <if test="attribId != null and attribId != ''">attrib_id,</if>
+            <if test="catalogNo != null">catalog_no,</if>
+            <if test="calcParam != null">calc_param,</if>
+            <if test="physicalValueType != null">physical_value_type,</if>
+            <if test="physicalValueUnitId != null">physical_value_unit_id,</if>
+            <if test="descr != null and descr != ''">descr,</if>
+            <if test="commodityLevel != null and commodityLevel != ''">commodity_level,</if>
+            <if test="sizeRefLevel != null and sizeRefLevel != ''">size_ref_level,</if>
+            <if test="partLevel != null and partLevel != ''">part_level,</if>
+            <if test="modellerLevel != null and modellerLevel != ''">modeller_level,</if>
+            <if test="defScope != null">def_scope,</if>
+            <if test="stat != null and stat != ''">stat,</if>
+            <if test="attribCategoryNo != null">attrib_category_no,</if>
+            <if test="drawDisciplineNo != null">draw_discipline_no,</if>
+            <if test="defUsrId != null and defUsrId != ''">def_usr_id,</if>
+            <if test="defDate != null">def_date,</if>
+            <if test="defApplNo != null">def_appl_no,</if>
+            <if test="updUsrId != null and updUsrId != ''">upd_usr_id,</if>
+            <if test="updDate != null">upd_date,</if>
+            <if test="updApplNo != null">upd_appl_no,</if>
+            <if test="matchWeightingNo != null">match_weighting_no,</if>
+            <if test="isSystem != null and isSystem != ''">is_system,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="attribNo != null">#{attribNo},</if>
+            <if test="attribId != null and attribId != ''">#{attribId},</if>
+            <if test="catalogNo != null">#{catalogNo},</if>
+            <if test="calcParam != null">#{calcParam},</if>
+            <if test="physicalValueType != null">#{physicalValueType},</if>
+            <if test="physicalValueUnitId != null">#{physicalValueUnitId},</if>
+            <if test="descr != null and descr != ''">#{descr},</if>
+            <if test="commodityLevel != null and commodityLevel != ''">#{commodityLevel},</if>
+            <if test="sizeRefLevel != null and sizeRefLevel != ''">#{sizeRefLevel},</if>
+            <if test="partLevel != null and partLevel != ''">#{partLevel},</if>
+            <if test="modellerLevel != null and modellerLevel != ''">#{modellerLevel},</if>
+            <if test="defScope != null">#{defScope},</if>
+            <if test="stat != null and stat != ''">#{stat},</if>
+            <if test="attribCategoryNo != null">#{attribCategoryNo},</if>
+            <if test="drawDisciplineNo != null">#{drawDisciplineNo},</if>
+            <if test="defUsrId != null and defUsrId != ''">#{defUsrId},</if>
+            <if test="defDate != null">#{defDate},</if>
+            <if test="defApplNo != null">#{defApplNo},</if>
+            <if test="updUsrId != null and updUsrId != ''">#{updUsrId},</if>
+            <if test="updDate != null">#{updDate},</if>
+            <if test="updApplNo != null">#{updApplNo},</if>
+            <if test="matchWeightingNo != null">#{matchWeightingNo},</if>
+            <if test="isSystem != null and isSystem != ''">#{isSystem},</if>
+         </trim>
+    </insert>
+
+    <update id="updateAttrib" parameterType="Attrib">
+        update attrib
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="attribId != null and attribId != ''">attrib_id = #{attribId},</if>
+            <if test="catalogNo != null">catalog_no = #{catalogNo},</if>
+            <if test="calcParam != null">calc_param = #{calcParam},</if>
+            <if test="physicalValueType != null">physical_value_type = #{physicalValueType},</if>
+            <if test="physicalValueUnitId != null">physical_value_unit_id = #{physicalValueUnitId},</if>
+            <if test="descr != null and descr != ''">descr = #{descr},</if>
+            <if test="commodityLevel != null and commodityLevel != ''">commodity_level = #{commodityLevel},</if>
+            <if test="sizeRefLevel != null and sizeRefLevel != ''">size_ref_level = #{sizeRefLevel},</if>
+            <if test="partLevel != null and partLevel != ''">part_level = #{partLevel},</if>
+            <if test="modellerLevel != null and modellerLevel != ''">modeller_level = #{modellerLevel},</if>
+            <if test="defScope != null">def_scope = #{defScope},</if>
+            <if test="stat != null and stat != ''">stat = #{stat},</if>
+            <if test="attribCategoryNo != null">attrib_category_no = #{attribCategoryNo},</if>
+            <if test="drawDisciplineNo != null">draw_discipline_no = #{drawDisciplineNo},</if>
+            <if test="defUsrId != null and defUsrId != ''">def_usr_id = #{defUsrId},</if>
+            <if test="defDate != null">def_date = #{defDate},</if>
+            <if test="defApplNo != null">def_appl_no = #{defApplNo},</if>
+            <if test="updUsrId != null and updUsrId != ''">upd_usr_id = #{updUsrId},</if>
+            <if test="updDate != null">upd_date = #{updDate},</if>
+            <if test="updApplNo != null">upd_appl_no = #{updApplNo},</if>
+            <if test="matchWeightingNo != null">match_weighting_no = #{matchWeightingNo},</if>
+            <if test="isSystem != null and isSystem != ''">is_system = #{isSystem},</if>
+        </trim>
+        where attrib_no = #{attribNo}
+    </update>
+
+    <delete id="deleteAttribByAttribNo" parameterType="Long">
+        delete from attrib where attrib_no = #{attribNo}
+    </delete>
+
+    <delete id="deleteAttribByAttribNos" parameterType="String">
+        delete from attrib where attrib_no in 
+        <foreach item="attribNo" collection="array" open="(" separator="," close=")">
+            #{attribNo}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/AttribValueMapper.xml

@@ -0,0 +1,157 @@
+<?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.ruoyi.system.mapper.AttribValueMapper">
+    
+    <resultMap type="AttribValue" id="AttribValueResult">
+        <result property="attribValueNo"    column="attrib_value_no"    />
+        <result property="valueText"    column="value_text"    />
+        <result property="catalogNo"    column="catalog_no"    />
+        <result property="attribEquivSetNo"    column="attrib_equiv_set_no"    />
+        <result property="attribRepresentNo"    column="attrib_represent_no"    />
+        <result property="defUsrId"    column="def_usr_id"    />
+        <result property="defDate"    column="def_date"    />
+        <result property="updUsrId"    column="upd_usr_id"    />
+        <result property="updDate"    column="upd_date"    />
+    </resultMap>
+
+    <sql id="selectAttribValueVo">
+        select attrib_value_no, value_text, catalog_no, attrib_equiv_set_no, attrib_represent_no, def_usr_id, def_date, upd_usr_id, upd_date from attrib_value
+    </sql>
+
+    <select id="selectAttribValueList" parameterType="AttribValue" resultMap="AttribValueResult">
+        <include refid="selectAttribValueVo"/>
+        <where>  
+            <if test="valueText != null  and valueText != ''"> and value_text = #{valueText}</if>
+            <if test="catalogNo != null "> and catalog_no = #{catalogNo}</if>
+            <if test="attribEquivSetNo != null "> and attrib_equiv_set_no = #{attribEquivSetNo}</if>
+            <if test="attribRepresentNo != null "> and attrib_represent_no = #{attribRepresentNo}</if>
+            <if test="defUsrId != null  and defUsrId != ''"> and def_usr_id = #{defUsrId}</if>
+            <if test="defDate != null "> and def_date = #{defDate}</if>
+            <if test="updUsrId != null  and updUsrId != ''"> and upd_usr_id = #{updUsrId}</if>
+            <if test="updDate != null "> and upd_date = #{updDate}</if>
+        </where>
+    </select>
+    
+    <select id="selectAttribValueByAttribValueNo" parameterType="Long" resultMap="AttribValueResult">
+        <include refid="selectAttribValueVo"/>
+        where attrib_value_no = #{attribValueNo}
+    </select>
+    <select id="selectByAttrib" resultType="map">
+       <!-- select    t.attrib_no,av.attrib_value_no,av.value_text,av.attrib_equiv_set_no,av.attrib_represent_no
+        from ATTRIB_VALUE av
+        join attrib_represent t
+        on av.attrib_represent_no = t.attrib_represent_no
+        join represent_type r
+        on r.represent_type_no = t.represent_type_no
+        where
+        <if test="attrib_no != null">t.attrib_no = #{attrib_no}</if>
+        &lt;!&ndash;and t.attrib_represent_no=133&ndash;&gt;
+        &lt;!&ndash;属性值默认取中文长描述ATTR_LONG_TEXT_CN&ndash;&gt;
+        and r.represent_type_id='ATTR_LONG_TEXT_CN'
+        order by ATTRIB_EQUIV_SET_NO,t.ATTRIB_REPRESENT_NO-->
+        select   to_char(listagg(av.attrib_value_no,'@@@')) ids, to_char(listagg(r.represent_type_id||'@'||av.value_text,'@@@')) value,av.attrib_equiv_set_no
+        from ATTRIB_VALUE av
+        join attrib_represent t
+        on av.attrib_represent_no = t.attrib_represent_no
+        join represent_type r
+        on r.represent_type_no = t.represent_type_no
+        where
+        <if test="attrib_no != null">t.attrib_no = #{attrib_no}</if>
+        group by av.attrib_equiv_set_no
+        order by ATTRIB_EQUIV_SET_NO
+
+    </select>
+    <select id="selectPropertyFormulaByTypeId" resultType="map">
+        select distinct  p.free_text,e.seq_no, e.entity_property_no, e.entity_property_id, e.descr
+        from ENTITY_PROPERTY e
+        join property_formula_detail t
+        on e.entity_property_no = t.entity_property_no
+        join  property_formula p on t.property_formula_no=p.property_formula_no
+        <if test="class_no != null">where t.class_no = #{class_no}</if>
+        order by  e.seq_no
+    </select>
+    <select id="selectPropertyFormulaByTypeAndProperty" resultType="map">
+        select q.free_text,
+        e.entity_property_no,
+        e.entity_property_id,
+        e.descr,
+        a.attrib_no,
+        a.class_attrib_id,
+        type.represent_type_id,
+        t.seq_no,
+        a.descr,
+        a.seq_no,
+        a.attrib_equiv_set_no
+        from property_formula q
+        join property_formula_detail t
+        on q.property_formula_no = t.property_formula_no
+        join attrib_represent ar
+        on ar.attrib_represent_no = t.attrib_represent_no
+        join represent_type type
+        on type.represent_type_no = ar.represent_type_no
+        join ENTITY_PROPERTY e
+        on e.entity_property_no = t.entity_property_no
+        join class_attrib a
+        on t.class_attrib_no = a.class_attrib_no
+        <if test="class_no != null">where t.class_no = #{class_no}</if>
+        <if test="entity_property_no != null">and e.entity_property_no = #{entity_property_no}</if>
+        order by q.entity_property_no, t.seq_no
+    </select>
+
+    <insert id="insertAttribValue" parameterType="AttribValue">
+        <selectKey keyProperty="attribValueNo" resultType="long" order="BEFORE">
+            SELECT seq_attrib_value.NEXTVAL as attribValueNo FROM DUAL
+        </selectKey>
+        insert into attrib_value
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="attribValueNo != null">attrib_value_no,</if>
+            <if test="valueText != null">value_text,</if>
+            <if test="catalogNo != null">catalog_no,</if>
+            <if test="attribEquivSetNo != null">attrib_equiv_set_no,</if>
+            <if test="attribRepresentNo != null">attrib_represent_no,</if>
+            <if test="defUsrId != null and defUsrId != ''">def_usr_id,</if>
+            <if test="defDate != null">def_date,</if>
+            <if test="updUsrId != null and updUsrId != ''">upd_usr_id,</if>
+            <if test="updDate != null">upd_date,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="attribValueNo != null">#{attribValueNo},</if>
+            <if test="valueText != null">#{valueText},</if>
+            <if test="catalogNo != null">#{catalogNo},</if>
+            <if test="attribEquivSetNo != null">#{attribEquivSetNo},</if>
+            <if test="attribRepresentNo != null">#{attribRepresentNo},</if>
+            <if test="defUsrId != null and defUsrId != ''">#{defUsrId},</if>
+            <if test="defDate != null">#{defDate},</if>
+            <if test="updUsrId != null and updUsrId != ''">#{updUsrId},</if>
+            <if test="updDate != null">#{updDate},</if>
+         </trim>
+    </insert>
+
+    <update id="updateAttribValue" parameterType="AttribValue">
+        update attrib_value
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="valueText != null">value_text = #{valueText},</if>
+            <if test="catalogNo != null">catalog_no = #{catalogNo},</if>
+            <if test="attribEquivSetNo != null">attrib_equiv_set_no = #{attribEquivSetNo},</if>
+            <if test="attribRepresentNo != null">attrib_represent_no = #{attribRepresentNo},</if>
+            <if test="defUsrId != null and defUsrId != ''">def_usr_id = #{defUsrId},</if>
+            <if test="defDate != null">def_date = #{defDate},</if>
+            <if test="updUsrId != null and updUsrId != ''">upd_usr_id = #{updUsrId},</if>
+            <if test="updDate != null">upd_date = #{updDate},</if>
+        </trim>
+        where attrib_value_no = #{attribValueNo}
+    </update>
+
+    <delete id="deleteAttribValueByAttribValueNo" parameterType="Long">
+        delete from attrib_value where attrib_value_no = #{attribValueNo}
+    </delete>
+
+    <delete id="deleteAttribValueByAttribValueNos" parameterType="String">
+        delete from attrib_value where attrib_value_no in 
+        <foreach item="attribValueNo" collection="array" open="(" separator="," close=")">
+            #{attribValueNo}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/ClasssMapper.xml

@@ -0,0 +1,195 @@
+<?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.ruoyi.system.mapper.ClasssMapper">
+    
+    <resultMap type="Classs" id="ClasssResult">
+        <result property="classNo"    column="class_no"    />
+        <result property="classId"    column="class_id"    />
+        <result property="catalogNo"    column="catalog_no"    />
+        <result property="seqNo"    column="seq_no"    />
+        <result property="descr"    column="descr"    />
+        <result property="stat"    column="stat"    />
+        <result property="approvalStatusNo"    column="approval_status_no"    />
+        <result property="parentClassNo"    column="parent_class_no"    />
+        <result property="drawDisciplineNo"    column="draw_discipline_no"    />
+        <result property="catEntityTypeNo"    column="cat_entity_type_no"    />
+        <result property="canInstantiate"    column="can_instantiate"    />
+        <result property="branchCode"    column="branch_code"    />
+        <result property="defScopeNo"    column="def_scope_no"    />
+        <result property="boltsRequired"    column="bolts_required"    />
+        <result property="boltAtSizeNo"    column="bolt_at_size_no"    />
+        <result property="specShortCodeNo"    column="spec_short_code_no"    />
+        <result property="compCategoryNo"    column="comp_category_no"    />
+        <result property="specCompGroupNo"    column="spec_comp_group_no"    />
+        <result property="unitId"    column="unit_id"    />
+        <result property="commodityCodePref"    column="commodity_code_pref"    />
+        <result property="uniqueness"    column="uniqueness"    />
+        <result property="allowSizeLess"    column="allow_size_less"    />
+        <result property="defApplNo"    column="def_appl_no"    />
+        <result property="defUsrId"    column="def_usr_id"    />
+        <result property="defDate"    column="def_date"    />
+        <result property="updApplNo"    column="upd_appl_no"    />
+        <result property="updUsrId"    column="upd_usr_id"    />
+        <result property="updDate"    column="upd_date"    />
+        <result property="parentName" column="parent_name" />
+    </resultMap>
+
+    <sql id="selectClasssVo">
+        select class_no, class_id, catalog_no, seq_no, descr, stat, approval_status_no, parent_class_no, draw_discipline_no, cat_entity_type_no, can_instantiate, branch_code, def_scope_no, bolts_required, bolt_at_size_no, spec_short_code_no, comp_category_no, spec_comp_group_no, unit_id, commodity_code_pref, uniqueness, allow_size_less, def_appl_no, def_usr_id, def_date, upd_appl_no, upd_usr_id, upd_date from class
+    </sql>
+
+    <select id="selectClasssList" parameterType="Classs" resultMap="ClasssResult">
+        <include refid="selectClasssVo"/>
+        <where>  
+            <if test="classId != null  and classId != ''"> and class_id = #{classId}</if>
+            <if test="catalogNo != null "> and catalog_no = #{catalogNo}</if>
+            <if test="seqNo != null "> and seq_no = #{seqNo}</if>
+            <if test="descr != null  and descr != ''"> and descr = #{descr}</if>
+            <if test="stat != null  and stat != ''"> and stat = #{stat}</if>
+            <if test="approvalStatusNo != null "> and approval_status_no = #{approvalStatusNo}</if>
+            <if test="parentClassNo != null "> and parent_class_no = #{parentClassNo}</if>
+            <if test="drawDisciplineNo != null "> and draw_discipline_no = #{drawDisciplineNo}</if>
+            <if test="catEntityTypeNo != null "> and cat_entity_type_no = #{catEntityTypeNo}</if>
+            <if test="canInstantiate != null  and canInstantiate != ''"> and can_instantiate = #{canInstantiate}</if>
+            <if test="branchCode != null  and branchCode != ''"> and branch_code = #{branchCode}</if>
+            <if test="defScopeNo != null "> and def_scope_no = #{defScopeNo}</if>
+            <if test="boltsRequired != null  and boltsRequired != ''"> and bolts_required = #{boltsRequired}</if>
+            <if test="boltAtSizeNo != null "> and bolt_at_size_no = #{boltAtSizeNo}</if>
+            <if test="specShortCodeNo != null "> and spec_short_code_no = #{specShortCodeNo}</if>
+            <if test="compCategoryNo != null "> and comp_category_no = #{compCategoryNo}</if>
+            <if test="specCompGroupNo != null "> and spec_comp_group_no = #{specCompGroupNo}</if>
+            <if test="unitId != null  and unitId != ''"> and unit_id = #{unitId}</if>
+            <if test="commodityCodePref != null  and commodityCodePref != ''"> and commodity_code_pref = #{commodityCodePref}</if>
+            <if test="uniqueness != null "> and uniqueness = #{uniqueness}</if>
+            <if test="allowSizeLess != null  and allowSizeLess != ''"> and allow_size_less = #{allowSizeLess}</if>
+            <if test="defApplNo != null "> and def_appl_no = #{defApplNo}</if>
+            <if test="defUsrId != null  and defUsrId != ''"> and def_usr_id = #{defUsrId}</if>
+            <if test="defDate != null "> and def_date = #{defDate}</if>
+            <if test="updApplNo != null "> and upd_appl_no = #{updApplNo}</if>
+            <if test="updUsrId != null  and updUsrId != ''"> and upd_usr_id = #{updUsrId}</if>
+            <if test="updDate != null "> and upd_date = #{updDate}</if>
+        </where>
+        order by parent_class_no
+    </select>
+    
+    <select id="selectClasssByClassNo" parameterType="Long" resultMap="ClasssResult">
+        select t.class_no, t.class_id, t.catalog_no, t.seq_no, t.descr, t.stat, t.approval_status_no, t.parent_class_no, t.draw_discipline_no, t.cat_entity_type_no, t.can_instantiate, t.branch_code, t.def_scope_no, t.bolts_required, t.bolt_at_size_no, t.spec_short_code_no, t.comp_category_no, t.spec_comp_group_no, t.unit_id, t.commodity_code_pref, t.uniqueness, t.allow_size_less, t.def_appl_no, t.def_usr_id, t.def_date, t.upd_appl_no, t.upd_usr_id, t.upd_date, p.class_id as parent_name
+        from class t
+        left join class p on p.class_no = t.parent_class_no
+        where t.class_no = #{classNo}
+    </select>
+        
+    <insert id="insertClasss" parameterType="Classs">
+        <selectKey keyProperty="classNo" resultType="long" order="BEFORE">
+            SELECT seq_class.NEXTVAL as classNo FROM DUAL
+        </selectKey>
+        insert into class
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="classNo != null">class_no,</if>
+            <if test="classId != null and classId != ''">class_id,</if>
+            <if test="catalogNo != null">catalog_no,</if>
+            <if test="seqNo != null">seq_no,</if>
+            <if test="descr != null and descr != ''">descr,</if>
+            <if test="stat != null and stat != ''">stat,</if>
+            <if test="approvalStatusNo != null">approval_status_no,</if>
+            <if test="parentClassNo != null">parent_class_no,</if>
+            <if test="drawDisciplineNo != null">draw_discipline_no,</if>
+            <if test="catEntityTypeNo != null">cat_entity_type_no,</if>
+            <if test="canInstantiate != null and canInstantiate != ''">can_instantiate,</if>
+            <if test="branchCode != null">branch_code,</if>
+            <if test="defScopeNo != null">def_scope_no,</if>
+            <if test="boltsRequired != null and boltsRequired != ''">bolts_required,</if>
+            <if test="boltAtSizeNo != null">bolt_at_size_no,</if>
+            <if test="specShortCodeNo != null">spec_short_code_no,</if>
+            <if test="compCategoryNo != null">comp_category_no,</if>
+            <if test="specCompGroupNo != null">spec_comp_group_no,</if>
+            <if test="unitId != null">unit_id,</if>
+            <if test="commodityCodePref != null">commodity_code_pref,</if>
+            <if test="uniqueness != null">uniqueness,</if>
+            <if test="allowSizeLess != null and allowSizeLess != ''">allow_size_less,</if>
+            <if test="defApplNo != null">def_appl_no,</if>
+            <if test="defUsrId != null and defUsrId != ''">def_usr_id,</if>
+            <if test="defDate != null">def_date,</if>
+            <if test="updApplNo != null">upd_appl_no,</if>
+            <if test="updUsrId != null and updUsrId != ''">upd_usr_id,</if>
+            <if test="updDate != null">upd_date,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="classNo != null">#{classNo},</if>
+            <if test="classId != null and classId != ''">#{classId},</if>
+            <if test="catalogNo != null">#{catalogNo},</if>
+            <if test="seqNo != null">#{seqNo},</if>
+            <if test="descr != null and descr != ''">#{descr},</if>
+            <if test="stat != null and stat != ''">#{stat},</if>
+            <if test="approvalStatusNo != null">#{approvalStatusNo},</if>
+            <if test="parentClassNo != null">#{parentClassNo},</if>
+            <if test="drawDisciplineNo != null">#{drawDisciplineNo},</if>
+            <if test="catEntityTypeNo != null">#{catEntityTypeNo},</if>
+            <if test="canInstantiate != null and canInstantiate != ''">#{canInstantiate},</if>
+            <if test="branchCode != null">#{branchCode},</if>
+            <if test="defScopeNo != null">#{defScopeNo},</if>
+            <if test="boltsRequired != null and boltsRequired != ''">#{boltsRequired},</if>
+            <if test="boltAtSizeNo != null">#{boltAtSizeNo},</if>
+            <if test="specShortCodeNo != null">#{specShortCodeNo},</if>
+            <if test="compCategoryNo != null">#{compCategoryNo},</if>
+            <if test="specCompGroupNo != null">#{specCompGroupNo},</if>
+            <if test="unitId != null">#{unitId},</if>
+            <if test="commodityCodePref != null">#{commodityCodePref},</if>
+            <if test="uniqueness != null">#{uniqueness},</if>
+            <if test="allowSizeLess != null and allowSizeLess != ''">#{allowSizeLess},</if>
+            <if test="defApplNo != null">#{defApplNo},</if>
+            <if test="defUsrId != null and defUsrId != ''">#{defUsrId},</if>
+            <if test="defDate != null">#{defDate},</if>
+            <if test="updApplNo != null">#{updApplNo},</if>
+            <if test="updUsrId != null and updUsrId != ''">#{updUsrId},</if>
+            <if test="updDate != null">#{updDate},</if>
+         </trim>
+    </insert>
+
+    <update id="updateClasss" parameterType="Classs">
+        update class
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="classId != null and classId != ''">class_id = #{classId},</if>
+            <if test="catalogNo != null">catalog_no = #{catalogNo},</if>
+            <if test="seqNo != null">seq_no = #{seqNo},</if>
+            <if test="descr != null and descr != ''">descr = #{descr},</if>
+            <if test="stat != null and stat != ''">stat = #{stat},</if>
+            <if test="approvalStatusNo != null">approval_status_no = #{approvalStatusNo},</if>
+            <if test="parentClassNo != null">parent_class_no = #{parentClassNo},</if>
+            <if test="drawDisciplineNo != null">draw_discipline_no = #{drawDisciplineNo},</if>
+            <if test="catEntityTypeNo != null">cat_entity_type_no = #{catEntityTypeNo},</if>
+            <if test="canInstantiate != null and canInstantiate != ''">can_instantiate = #{canInstantiate},</if>
+            <if test="branchCode != null">branch_code = #{branchCode},</if>
+            <if test="defScopeNo != null">def_scope_no = #{defScopeNo},</if>
+            <if test="boltsRequired != null and boltsRequired != ''">bolts_required = #{boltsRequired},</if>
+            <if test="boltAtSizeNo != null">bolt_at_size_no = #{boltAtSizeNo},</if>
+            <if test="specShortCodeNo != null">spec_short_code_no = #{specShortCodeNo},</if>
+            <if test="compCategoryNo != null">comp_category_no = #{compCategoryNo},</if>
+            <if test="specCompGroupNo != null">spec_comp_group_no = #{specCompGroupNo},</if>
+            <if test="unitId != null">unit_id = #{unitId},</if>
+            <if test="commodityCodePref != null">commodity_code_pref = #{commodityCodePref},</if>
+            <if test="uniqueness != null">uniqueness = #{uniqueness},</if>
+            <if test="allowSizeLess != null and allowSizeLess != ''">allow_size_less = #{allowSizeLess},</if>
+            <if test="defApplNo != null">def_appl_no = #{defApplNo},</if>
+            <if test="defUsrId != null and defUsrId != ''">def_usr_id = #{defUsrId},</if>
+            <if test="defDate != null">def_date = #{defDate},</if>
+            <if test="updApplNo != null">upd_appl_no = #{updApplNo},</if>
+            <if test="updUsrId != null and updUsrId != ''">upd_usr_id = #{updUsrId},</if>
+            <if test="updDate != null">upd_date = #{updDate},</if>
+        </trim>
+        where class_no = #{classNo}
+    </update>
+
+    <delete id="deleteClasssByClassNo" parameterType="Long">
+        delete from class where class_no = #{classNo}
+    </delete>
+
+    <delete id="deleteClasssByClassNos" parameterType="String">
+        delete from class where class_no in 
+        <foreach item="classNo" collection="array" open="(" separator="," close=")">
+            #{classNo}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/CommodityMapper.xml

@@ -0,0 +1,136 @@
+<?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.ruoyi.system.mapper.CommodityMapper">
+    
+    <resultMap type="Commodity" id="CommodityResult">
+        <result property="commodityNo"    column="commodity_no"    />
+        <result property="commodityId"    column="commodity_id"    />
+        <result property="fakeUnique"    column="fake_unique"    />
+        <result property="catalogNo"    column="catalog_no"    />
+        <result property="commodityClassNo"    column="commodity_class_no"    />
+        <result property="defMethodNo"    column="def_method_no"    />
+        <result property="datasheetReqd"    column="datasheet_reqd"    />
+        <result property="prntPartNo"    column="prnt_part_no"    />
+        <result property="unitId"    column="unit_id"    />
+        <result property="commodityCodeOrig"    column="commodity_code_orig"    />
+        <result property="approvalStatusNo"    column="approval_status_no"    />
+        <result property="stat"    column="stat"    />
+        <result property="defUsrId"    column="def_usr_id"    />
+        <result property="defDate"    column="def_date"    />
+        <result property="updUsrId"    column="upd_usr_id"    />
+        <result property="updDate"    column="upd_date"    />
+        <result property="specEntryNo"    column="spec_entry_no"    />
+    </resultMap>
+
+    <sql id="selectCommodityVo">
+        select commodity_no, commodity_id, fake_unique, catalog_no, commodity_class_no, def_method_no, datasheet_reqd, prnt_part_no, unit_id, commodity_code_orig, approval_status_no, stat, def_usr_id, def_date, upd_usr_id, upd_date, spec_entry_no from commodity
+    </sql>
+
+    <select id="selectCommodityList" parameterType="Commodity" resultMap="CommodityResult">
+        <include refid="selectCommodityVo"/>
+        <where>  
+            <if test="commodityId != null  and commodityId != ''"> and commodity_id = #{commodityId}</if>
+            <if test="fakeUnique != null "> and fake_unique = #{fakeUnique}</if>
+            <if test="catalogNo != null "> and catalog_no = #{catalogNo}</if>
+            <if test="commodityClassNo != null "> and commodity_class_no = #{commodityClassNo}</if>
+            <if test="defMethodNo != null "> and def_method_no = #{defMethodNo}</if>
+            <if test="datasheetReqd != null  and datasheetReqd != ''"> and datasheet_reqd = #{datasheetReqd}</if>
+            <if test="prntPartNo != null  and prntPartNo != ''"> and prnt_part_no = #{prntPartNo}</if>
+            <if test="unitId != null  and unitId != ''"> and unit_id = #{unitId}</if>
+            <if test="commodityCodeOrig != null  and commodityCodeOrig != ''"> and commodity_code_orig = #{commodityCodeOrig}</if>
+            <if test="approvalStatusNo != null "> and approval_status_no = #{approvalStatusNo}</if>
+            <if test="stat != null  and stat != ''"> and stat = #{stat}</if>
+            <if test="defUsrId != null  and defUsrId != ''"> and def_usr_id = #{defUsrId}</if>
+            <if test="defDate != null "> and def_date = #{defDate}</if>
+            <if test="updUsrId != null  and updUsrId != ''"> and upd_usr_id = #{updUsrId}</if>
+            <if test="updDate != null "> and upd_date = #{updDate}</if>
+            <if test="specEntryNo != null "> and spec_entry_no = #{specEntryNo}</if>
+        </where>
+    </select>
+    
+    <select id="selectCommodityByCommodityNo" parameterType="Long" resultMap="CommodityResult">
+        <include refid="selectCommodityVo"/>
+        where commodity_no = #{commodityNo}
+    </select>
+        
+    <insert id="insertCommodity" parameterType="Commodity">
+        <selectKey keyProperty="commodityNo" resultType="long" order="BEFORE">
+            SELECT seq_commodity.NEXTVAL as commodityNo FROM DUAL
+        </selectKey>
+        insert into commodity
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="commodityNo != null">commodity_no,</if>
+            <if test="commodityId != null and commodityId != ''">commodity_id,</if>
+            <if test="fakeUnique != null">fake_unique,</if>
+            <if test="catalogNo != null">catalog_no,</if>
+            <if test="commodityClassNo != null">commodity_class_no,</if>
+            <if test="defMethodNo != null">def_method_no,</if>
+            <if test="datasheetReqd != null and datasheetReqd != ''">datasheet_reqd,</if>
+            <if test="prntPartNo != null and prntPartNo != ''">prnt_part_no,</if>
+            <if test="unitId != null and unitId != ''">unit_id,</if>
+            <if test="commodityCodeOrig != null">commodity_code_orig,</if>
+            <if test="approvalStatusNo != null">approval_status_no,</if>
+            <if test="stat != null and stat != ''">stat,</if>
+            <if test="defUsrId != null and defUsrId != ''">def_usr_id,</if>
+            <if test="defDate != null">def_date,</if>
+            <if test="updUsrId != null and updUsrId != ''">upd_usr_id,</if>
+            <if test="updDate != null">upd_date,</if>
+            <if test="specEntryNo != null">spec_entry_no,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="commodityNo != null">#{commodityNo},</if>
+            <if test="commodityId != null and commodityId != ''">#{commodityId},</if>
+            <if test="fakeUnique != null">#{fakeUnique},</if>
+            <if test="catalogNo != null">#{catalogNo},</if>
+            <if test="commodityClassNo != null">#{commodityClassNo},</if>
+            <if test="defMethodNo != null">#{defMethodNo},</if>
+            <if test="datasheetReqd != null and datasheetReqd != ''">#{datasheetReqd},</if>
+            <if test="prntPartNo != null and prntPartNo != ''">#{prntPartNo},</if>
+            <if test="unitId != null and unitId != ''">#{unitId},</if>
+            <if test="commodityCodeOrig != null">#{commodityCodeOrig},</if>
+            <if test="approvalStatusNo != null">#{approvalStatusNo},</if>
+            <if test="stat != null and stat != ''">#{stat},</if>
+            <if test="defUsrId != null and defUsrId != ''">#{defUsrId},</if>
+            <if test="defDate != null">#{defDate},</if>
+            <if test="updUsrId != null and updUsrId != ''">#{updUsrId},</if>
+            <if test="updDate != null">#{updDate},</if>
+            <if test="specEntryNo != null">#{specEntryNo},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCommodity" parameterType="Commodity">
+        update commodity
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="commodityId != null and commodityId != ''">commodity_id = #{commodityId},</if>
+            <if test="fakeUnique != null">fake_unique = #{fakeUnique},</if>
+            <if test="catalogNo != null">catalog_no = #{catalogNo},</if>
+            <if test="commodityClassNo != null">commodity_class_no = #{commodityClassNo},</if>
+            <if test="defMethodNo != null">def_method_no = #{defMethodNo},</if>
+            <if test="datasheetReqd != null and datasheetReqd != ''">datasheet_reqd = #{datasheetReqd},</if>
+            <if test="prntPartNo != null and prntPartNo != ''">prnt_part_no = #{prntPartNo},</if>
+            <if test="unitId != null and unitId != ''">unit_id = #{unitId},</if>
+            <if test="commodityCodeOrig != null">commodity_code_orig = #{commodityCodeOrig},</if>
+            <if test="approvalStatusNo != null">approval_status_no = #{approvalStatusNo},</if>
+            <if test="stat != null and stat != ''">stat = #{stat},</if>
+            <if test="defUsrId != null and defUsrId != ''">def_usr_id = #{defUsrId},</if>
+            <if test="defDate != null">def_date = #{defDate},</if>
+            <if test="updUsrId != null and updUsrId != ''">upd_usr_id = #{updUsrId},</if>
+            <if test="updDate != null">upd_date = #{updDate},</if>
+            <if test="specEntryNo != null">spec_entry_no = #{specEntryNo},</if>
+        </trim>
+        where commodity_no = #{commodityNo}
+    </update>
+
+    <delete id="deleteCommodityByCommodityNo" parameterType="Long">
+        delete from commodity where commodity_no = #{commodityNo}
+    </delete>
+
+    <delete id="deleteCommodityByCommodityNos" parameterType="String">
+        delete from commodity where commodity_no in 
+        <foreach item="commodityNo" collection="array" open="(" separator="," close=")">
+            #{commodityNo}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/SysAppDataMapper.xml

@@ -0,0 +1,158 @@
+<?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.ruoyi.system.mapper.SysAppDataMapper">
+    
+    <resultMap type="SysAppData" id="SysAppDataResult">
+        <result property="appDataId"    column="app_data_id"    />
+        <result property="appId"    column="app_id"    />
+        <result property="type"    column="type"    />
+        <result property="code"    column="code"    />
+        <result property="designDesc"    column="design_desc"    />
+        <result property="zhCnShortDesc"    column="zh_cn_short_desc"    />
+        <result property="zhCnLongDesc"    column="zh_cn_long_desc"    />
+        <result property="zhEnShortDesc"    column="zh_en_short_desc"    />
+        <result property="zhEnLongDesc"    column="zh_en_long_desc"    />
+        <result property="ruCnShortDesc"    column="ru_cn_short_desc"    />
+        <result property="ruCnLongDesc"    column="ru_cn_long_desc"    />
+        <result property="ruEnShortDesc"    column="ru_en_short_desc"    />
+        <result property="ruEnLongDesc"    column="ru_en_long_desc"    />
+        <result property="enCnShortDesc"    column="en_cn_short_desc"    />
+        <result property="enCnLongDesc"    column="en_cn_long_desc"    />
+        <result property="enEnShortDesc"    column="en_en_short_desc"    />
+        <result property="enEnLongDesc"    column="en_en_long_desc"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSysAppDataVo">
+        select app_data_id, app_id, type, code, design_desc, zh_cn_short_desc, zh_cn_long_desc, zh_en_short_desc, zh_en_long_desc, ru_cn_short_desc, ru_cn_long_desc, ru_en_short_desc, ru_en_long_desc, en_cn_short_desc, en_cn_long_desc, en_en_short_desc, en_en_long_desc, status, create_by, create_time, update_by, update_time, remark from sys_app_data
+    </sql>
+
+    <select id="selectSysAppDataList" parameterType="SysAppData" resultMap="SysAppDataResult">
+        <include refid="selectSysAppDataVo"/>
+        <where>  
+            <if test="appId != null "> and app_id = #{appId}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="code != null  and code != ''"> and code = #{code}</if>
+            <if test="designDesc != null  and designDesc != ''"> and design_desc like concat(concat('%', #{designDesc}), '%')</if>
+            <if test="zhCnShortDesc != null  and zhCnShortDesc != ''"> and zh_cn_short_desc like concat(concat('%', #{zhCnShortDesc}), '%')</if>
+            <if test="zhCnLongDesc != null  and zhCnLongDesc != ''"> and zh_cn_long_desc like concat(concat('%', #{zhCnLongDesc}), '%')</if>
+            <if test="zhEnShortDesc != null  and zhEnShortDesc != ''"> and zh_en_short_desc like concat(concat('%', #{zhEnShortDesc}), '%')</if>
+            <if test="zhEnLongDesc != null  and zhEnLongDesc != ''"> and zh_en_long_desc like concat(concat('%', #{zhEnLongDesc}), '%')</if>
+            <if test="ruCnShortDesc != null  and ruCnShortDesc != ''"> and ru_cn_short_desc like concat(concat('%', #{ruCnShortDesc}), '%')</if>
+            <if test="ruCnLongDesc != null  and ruCnLongDesc != ''"> and ru_cn_long_desc like concat(concat('%', #{ruCnLongDesc}), '%')</if>
+            <if test="ruEnShortDesc != null  and ruEnShortDesc != ''"> and ru_en_short_desc like concat(concat('%', #{ruEnShortDesc}), '%')</if>
+            <if test="ruEnLongDesc != null  and ruEnLongDesc != ''"> and ru_en_long_desc like concat(concat('%', #{ruEnLongDesc}), '%')</if>
+            <if test="enCnShortDesc != null  and enCnShortDesc != ''"> and en_cn_short_desc like concat(concat('%', #{enCnShortDesc}), '%')</if>
+            <if test="enCnLongDesc != null  and enCnLongDesc != ''"> and en_cn_long_desc like concat(concat('%', #{enCnLongDesc}), '%')</if>
+            <if test="enEnShortDesc != null  and enEnShortDesc != ''"> and en_en_short_desc like concat(concat('%', #{enEnShortDesc}), '%')</if>
+            <if test="enEnLongDesc != null  and enEnLongDesc != ''"> and en_en_long_desc like concat(concat('%', #{enEnLongDesc}), '%')</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+        </where>
+    </select>
+    
+    <select id="selectSysAppDataByAppDataId" parameterType="Long" resultMap="SysAppDataResult">
+        <include refid="selectSysAppDataVo"/>
+        where app_data_id = #{appDataId}
+    </select>
+        
+    <insert id="insertSysAppData" parameterType="SysAppData">
+        insert into sys_app_data
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="appDataId != null">app_data_id,</if>
+            <if test="appId != null">app_id,</if>
+            <if test="type != null">type,</if>
+            <if test="code != null">code,</if>
+            <if test="designDesc != null">design_desc,</if>
+            <if test="zhCnShortDesc != null">zh_cn_short_desc,</if>
+            <if test="zhCnLongDesc != null">zh_cn_long_desc,</if>
+            <if test="zhEnShortDesc != null">zh_en_short_desc,</if>
+            <if test="zhEnLongDesc != null">zh_en_long_desc,</if>
+            <if test="ruCnShortDesc != null">ru_cn_short_desc,</if>
+            <if test="ruCnLongDesc != null">ru_cn_long_desc,</if>
+            <if test="ruEnShortDesc != null">ru_en_short_desc,</if>
+            <if test="ruEnLongDesc != null">ru_en_long_desc,</if>
+            <if test="enCnShortDesc != null">en_cn_short_desc,</if>
+            <if test="enCnLongDesc != null">en_cn_long_desc,</if>
+            <if test="enEnShortDesc != null">en_en_short_desc,</if>
+            <if test="enEnLongDesc != null">en_en_long_desc,</if>
+            <if test="status != null">status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="appDataId != null">#{appDataId},</if>
+            <if test="appId != null">#{appId},</if>
+            <if test="type != null">#{type},</if>
+            <if test="code != null">#{code},</if>
+            <if test="designDesc != null">#{designDesc},</if>
+            <if test="zhCnShortDesc != null">#{zhCnShortDesc},</if>
+            <if test="zhCnLongDesc != null">#{zhCnLongDesc},</if>
+            <if test="zhEnShortDesc != null">#{zhEnShortDesc},</if>
+            <if test="zhEnLongDesc != null">#{zhEnLongDesc},</if>
+            <if test="ruCnShortDesc != null">#{ruCnShortDesc},</if>
+            <if test="ruCnLongDesc != null">#{ruCnLongDesc},</if>
+            <if test="ruEnShortDesc != null">#{ruEnShortDesc},</if>
+            <if test="ruEnLongDesc != null">#{ruEnLongDesc},</if>
+            <if test="enCnShortDesc != null">#{enCnShortDesc},</if>
+            <if test="enCnLongDesc != null">#{enCnLongDesc},</if>
+            <if test="enEnShortDesc != null">#{enEnShortDesc},</if>
+            <if test="enEnLongDesc != null">#{enEnLongDesc},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSysAppData" parameterType="SysAppData">
+        update sys_app_data
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="appId != null">app_id = #{appId},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="code != null">code = #{code},</if>
+            <if test="designDesc != null">design_desc = #{designDesc},</if>
+            <if test="zhCnShortDesc != null">zh_cn_short_desc = #{zhCnShortDesc},</if>
+            <if test="zhCnLongDesc != null">zh_cn_long_desc = #{zhCnLongDesc},</if>
+            <if test="zhEnShortDesc != null">zh_en_short_desc = #{zhEnShortDesc},</if>
+            <if test="zhEnLongDesc != null">zh_en_long_desc = #{zhEnLongDesc},</if>
+            <if test="ruCnShortDesc != null">ru_cn_short_desc = #{ruCnShortDesc},</if>
+            <if test="ruCnLongDesc != null">ru_cn_long_desc = #{ruCnLongDesc},</if>
+            <if test="ruEnShortDesc != null">ru_en_short_desc = #{ruEnShortDesc},</if>
+            <if test="ruEnLongDesc != null">ru_en_long_desc = #{ruEnLongDesc},</if>
+            <if test="enCnShortDesc != null">en_cn_short_desc = #{enCnShortDesc},</if>
+            <if test="enCnLongDesc != null">en_cn_long_desc = #{enCnLongDesc},</if>
+            <if test="enEnShortDesc != null">en_en_short_desc = #{enEnShortDesc},</if>
+            <if test="enEnLongDesc != null">en_en_long_desc = #{enEnLongDesc},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where app_data_id = #{appDataId}
+    </update>
+
+    <delete id="deleteSysAppDataByAppDataId" parameterType="Long">
+        delete from sys_app_data where app_data_id = #{appDataId}
+    </delete>
+
+    <delete id="deleteSysAppDataByAppDataIds" parameterType="String">
+        delete from sys_app_data where app_data_id in 
+        <foreach item="appDataId" collection="array" open="(" separator="," close=")">
+            #{appDataId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/SysAppMapper.xml

@@ -0,0 +1,96 @@
+<?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.ruoyi.system.mapper.SysAppMapper">
+    
+    <resultMap type="SysApp" id="SysAppResult">
+        <result property="appId"    column="app_id"    />
+        <result property="appCode"    column="app_code"    />
+        <result property="categoryId"    column="category_id"    />
+        <result property="appName"    column="app_name"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSysAppVo">
+        select app_id, app_code, category_id, app_name, status, create_by, create_time, update_by, update_time, remark from sys_app
+    </sql>
+
+    <select id="selectSysAppList" parameterType="SysApp" resultMap="SysAppResult">
+        <include refid="selectSysAppVo"/>
+        <where>  
+            <if test="appCode != null  and appCode != ''"> and app_code = #{appCode}</if>
+            <if test="categoryId != null "> and category_id = #{categoryId}</if>
+            <if test="appName != null  and appName != ''"> and app_name like concat(concat('%', #{appName}), '%')</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+        </where>
+    </select>
+    
+    <select id="selectSysAppByAppId" parameterType="Long" resultMap="SysAppResult">
+        <include refid="selectSysAppVo"/>
+        where app_id = #{appId}
+    </select>
+    <select id="selectAppAll" resultMap="SysAppResult">
+        <include refid="selectSysAppVo"/>
+    </select>
+
+    <insert id="insertSysApp" parameterType="SysApp">
+        insert into sys_app
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="appId != null">app_id,</if>
+            <if test="appCode != null and appCode != ''">app_code,</if>
+            <if test="categoryId != null">category_id,</if>
+            <if test="appName != null">app_name,</if>
+            <if test="status != null">status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="appId != null">#{appId},</if>
+            <if test="appCode != null and appCode != ''">#{appCode},</if>
+            <if test="categoryId != null">#{categoryId},</if>
+            <if test="appName != null">#{appName},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSysApp" parameterType="SysApp">
+        update sys_app
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="appCode != null and appCode != ''">app_code = #{appCode},</if>
+            <if test="categoryId != null">category_id = #{categoryId},</if>
+            <if test="appName != null">app_name = #{appName},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where app_id = #{appId}
+    </update>
+
+    <delete id="deleteSysAppByAppId" parameterType="Long">
+        delete from sys_app where app_id = #{appId}
+    </delete>
+
+    <delete id="deleteSysAppByAppIds" parameterType="String">
+        delete from sys_app where app_id in 
+        <foreach item="appId" collection="array" open="(" separator="," close=")">
+            #{appId}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-system/src/main/resources/templates/include.html

@@ -0,0 +1,222 @@
+<!-- 通用CSS -->
+<head th:fragment=header(title)>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="keywords" content="">
+	<meta name="description" content="">
+	<title th:text="${title}"></title>
+	<link th:href="@{/css/bootstrap.min.css?v=3.3.7}" rel="stylesheet"/>
+	<link th:href="@{/css/font-awesome.min.css?v=4.7.0}" rel="stylesheet"/>
+	<!-- bootstrap-table 表格插件样式 -->
+	<link th:href="@{/ajax/libs/bootstrap-table/bootstrap-table.min.css?v=1.18.3}" rel="stylesheet"/>
+	<link th:href="@{/css/animate.min.css?v=20210831}" rel="stylesheet"/>
+	<link th:href="@{/css/style.min.css?v=20210831}" rel="stylesheet"/>
+	<link th:href="@{/ruoyi/css/ry-ui.css?v=4.7.0}" rel="stylesheet"/>
+</head>
+
+<!-- 通用JS -->
+<div th:fragment="footer">
+    <script th:inline="javascript"> var ctx = [[@{/}]]; var lockscreen = [[${session.lockscreen}]]; if(lockscreen){window.top.location=ctx+"lockscreen";} </script>
+    <a id="scroll-up" href="#" class="btn btn-sm display"><i class="fa fa-angle-double-up"></i></a>
+	<script th:src="@{/js/jquery.min.js?v=3.6.0}"></script>
+	<script th:src="@{/js/bootstrap.min.js?v=3.3.7}"></script>
+	<!-- bootstrap-table 表格插件 -->
+	<script th:src="@{/ajax/libs/bootstrap-table/bootstrap-table.min.js?v=1.18.3}"></script>
+	<script th:src="@{/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js?v=1.18.3}"></script>
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js?v=1.18.3}"></script>
+	<!-- jquery-validate 表单验证插件 -->
+	<script th:src="@{/ajax/libs/validate/jquery.validate.min.js?v=1.19.3}"></script>
+	<script th:src="@{/ajax/libs/validate/jquery.validate.extend.js?v=1.19.3}"></script>
+	<script th:src="@{/ajax/libs/validate/messages_zh.js?v=1.19.3}"></script>
+	<!-- bootstrap-table 表格树插件 -->
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/tree/bootstrap-table-tree.min.js?v=1.18.3}"></script>
+	<!-- 遮罩层 -->
+	<script th:src="@{/ajax/libs/blockUI/jquery.blockUI.js?v=2.70.0}"></script>
+    <script th:src="@{/ajax/libs/iCheck/icheck.min.js?v=1.0.3}"></script>
+	<script th:src="@{/ajax/libs/layer/layer.min.js?v=3.5.1}"></script>
+	<script th:src="@{/ajax/libs/layui/layui.min.js?v=2.6.8}"></script>
+	<script th:src="@{/ruoyi/js/common.js?v=4.7.0}"></script>
+	<script th:src="@{/ruoyi/js/ry-ui.js?v=4.7.0}"></script>
+</div>
+
+<!-- ztree树插件 -->
+<div th:fragment="ztree-css">
+    <link th:href="@{/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css}" rel="stylesheet"/>
+</div>
+<div th:fragment="ztree-js">
+    <script th:src="@{/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js}"></script>
+</div>
+
+<!-- select2下拉框插件 -->
+<div th:fragment="select2-css">
+    <link th:href="@{/ajax/libs/select2/select2.min.css?v=4.0.13}" rel="stylesheet"/>
+    <link th:href="@{/ajax/libs/select2/select2-bootstrap.min.css?v=4.0.13}" rel="stylesheet"/>
+</div>
+<div th:fragment="select2-js">
+    <script th:src="@{/ajax/libs/select2/select2.min.js?v=4.0.13}"></script>
+</div>
+
+<!-- bootstrap-select下拉框插件 -->
+<div th:fragment="bootstrap-select-css">
+    <link th:href="@{/ajax/libs/bootstrap-select/bootstrap-select.min.css?v=1.13.18}" rel="stylesheet"/>
+</div>
+<div th:fragment="bootstrap-select-js">
+    <script th:src="@{/ajax/libs/bootstrap-select/bootstrap-select.min.js?v=1.13.18}"></script>
+</div>
+
+<!-- datetimepicker日期和时间插件 -->
+<div th:fragment="datetimepicker-css">
+    <link th:href="@{/ajax/libs/datapicker/bootstrap-datetimepicker.min.css?v=2.4.4}" rel="stylesheet"/>
+</div>
+<div th:fragment="datetimepicker-js">
+    <script th:src="@{/ajax/libs/datapicker/bootstrap-datetimepicker.min.js?v=2.4.4}"></script>
+</div>
+
+<!-- ui布局插件 -->
+<div th:fragment="layout-latest-css">
+    <link th:href="@{/ajax/libs/jquery-layout/jquery.layout-latest.css?v=1.4.4}" rel="stylesheet"/>
+</div>
+<div th:fragment="layout-latest-js">
+    <script th:src="@{/ajax/libs/jquery-layout/jquery.layout-latest.js?v=1.4.4}"></script>
+</div>
+
+<!-- summernote富文本编辑器插件 -->
+<div th:fragment="summernote-css">
+    <link th:href="@{/ajax/libs/summernote/summernote.css?v=0.8.18}" rel="stylesheet"/>
+</div>
+<div th:fragment="summernote-js">
+    <script th:src="@{/ajax/libs/summernote/summernote.min.js?v=0.8.18}"></script>
+	<script th:src="@{/ajax/libs/summernote/summernote-zh-CN.js?v=0.8.18}"></script>
+</div>
+
+<!-- cropper图像裁剪插件 -->
+<div th:fragment="cropper-css">
+    <link th:href="@{/ajax/libs/cropper/cropper.min.css?v=1.5.12}" rel="stylesheet"/>
+</div>
+<div th:fragment="cropper-js">
+    <script th:src="@{/ajax/libs/cropper/cropper.min.js?v=1.5.12}"></script>
+</div>
+
+<!-- jasny功能扩展插件 -->
+<div th:fragment="jasny-bootstrap-css">
+    <link th:href="@{/ajax/libs/jasny/jasny-bootstrap.min.css?v=3.1.3}" rel="stylesheet"/>
+</div>
+<div th:fragment="jasny-bootstrap-js">
+    <script th:src="@{/ajax/libs/jasny/jasny-bootstrap.min.js?v=3.1.3}"></script>
+</div>
+
+<!-- fileinput文件上传插件 -->
+<div th:fragment="bootstrap-fileinput-css">
+    <link th:href="@{/ajax/libs/bootstrap-fileinput/fileinput.min.css?v=5.2.4}" rel="stylesheet"/>
+</div>
+<div th:fragment="bootstrap-fileinput-js">
+    <script th:src="@{/ajax/libs/bootstrap-fileinput/fileinput.min.js?v=5.2.4}"></script>
+</div>
+
+<!-- duallistbox双列表框插件 -->
+<div th:fragment="bootstrap-duallistbox-css">
+    <link th:href="@{/ajax/libs/duallistbox/bootstrap-duallistbox.min.css?v=3.0.9}" rel="stylesheet"/>
+</div>
+<div th:fragment="bootstrap-duallistbox-js">
+    <script th:src="@{/ajax/libs/duallistbox/bootstrap-duallistbox.min.js?v=3.0.9}"></script>
+</div>
+
+<!-- suggest搜索自动补全 -->
+<div th:fragment="bootstrap-suggest-js">
+    <script th:src="@{/ajax/libs/suggest/bootstrap-suggest.min.js?v=0.1.29}"></script>
+</div>
+
+<!-- typeahead搜索自动补全 -->
+<div th:fragment="bootstrap-typeahead-js">
+    <script th:src="@{/ajax/libs/typeahead/bootstrap-typeahead.min.js?v=4.0.2}"></script>
+</div>
+
+<!-- 多级联动下拉 -->
+<div th:fragment="jquery-cxselect-js">
+    <script th:src="@{/ajax/libs/cxselect/jquery.cxselect.min.js?v=1.4.2}"></script>
+</div>
+
+<!-- jsonview格式化和语法高亮JSON格式数据查看插件 -->
+<div th:fragment="jsonview-css">
+    <link th:href="@{/ajax/libs/jsonview/jquery.jsonview.css?v=1.2.0}" rel="stylesheet"/>
+</div>
+<div th:fragment="jsonview-js">
+    <script th:src="@{/ajax/libs/jsonview/jquery.jsonview.js?v=1.2.0}"></script>
+</div>
+
+<!-- jquery.smartwizard表单向导插件 -->
+<div th:fragment="jquery-smartwizard-css">
+    <link th:href="@{/ajax/libs/smartwizard/smart_wizard_all.min.css?v=5.1.1}" rel="stylesheet"/>
+</div>
+<div th:fragment="jquery-smartwizard-js">
+    <script th:src="@{/ajax/libs/smartwizard/jquery.smartWizard.min.js?v=5.1.1}"></script>
+</div>
+
+<!-- ECharts百度统计图表插件 -->
+<div th:fragment="echarts-js">
+    <script th:src="@{/ajax/libs/report/echarts/echarts-all.min.js?v=4.2.1}"></script>
+</div>
+
+<!-- peity图表组合插件 -->
+<div th:fragment="peity-js">
+    <script th:src="@{/ajax/libs/report/peity/jquery.peity.min.js?v=2.0.3}"></script>
+</div>
+
+<!-- sparkline线状图插件 -->
+<div th:fragment="sparkline-js">
+    <script th:src="@{/ajax/libs/report/sparkline/jquery.sparkline.min.js?v=2.1.2}"></script>
+</div>
+
+<!-- 表格行拖拽插件 -->
+<div th:fragment="bootstrap-table-reorder-rows-js">
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/reorder-rows/bootstrap-table-reorder-rows.js?v=1.18.3}"></script>
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/reorder-rows/jquery.tablednd.js?v=1.0.3}"></script>
+</div>
+
+<!-- 表格列拖拽插件 -->
+<div th:fragment="bootstrap-table-reorder-columns-js">
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/reorder-columns/jquery.dragtable.js?v=5.3.5}"></script>
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/reorder-columns/bootstrap-table-reorder-columns.js?v=1.18.3}"></script>
+</div>
+
+<!-- 表格列宽拖动插件 -->
+<div th:fragment="bootstrap-table-resizable-js">
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/resizable/jquery.resizableColumns.min.js?v=0.1.0}"></script>
+    <script th:src="@{/ajax/libs/bootstrap-table/extensions/resizable/bootstrap-table-resizable.js?v=1.18.3}"></script>
+</div>
+
+<!-- 表格行内编辑插件 -->
+<div th:fragment="bootstrap-editable-css">
+    <link th:href="@{/ajax/libs/bootstrap-table/extensions/editable/bootstrap-editable.css?v=1.5.1}" rel="stylesheet"/>
+</div>
+<div th:fragment="bootstrap-table-editable-js">
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/editable/bootstrap-editable.min.js?v=1.5.1}"></script>
+    <script th:src="@{/ajax/libs/bootstrap-table/extensions/editable/bootstrap-table-editable.js?v=1.18.3}"></script>
+</div>
+
+<!-- 表格导出插件 -->
+<div th:fragment="bootstrap-table-export-js">
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/export/bootstrap-table-export.js?v=1.18.3}"></script>
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/export/tableExport.min.js?v=1.10.24}"></script>
+</div>
+
+<!-- 表格冻结列插件 -->
+<div th:fragment="bootstrap-table-fixed-columns-js">
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js?v=1.18.3}"></script>
+</div>
+
+<!-- 表格自动刷新插件 -->
+<div th:fragment="bootstrap-table-auto-refresh-js">
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/auto-refresh/bootstrap-table-auto-refresh.js?v=1.18.3}"></script>
+</div>
+
+<!-- 表格打印插件 -->
+<div th:fragment="bootstrap-table-print-js">
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/print/bootstrap-table-print.js?v=1.18.3}"></script>
+</div>
+
+<!-- 表格视图分页插件 -->
+<div th:fragment="bootstrap-table-custom-view-js">
+	<script th:src="@{/ajax/libs/bootstrap-table/extensions/custom-view/bootstrap-table-custom-view.js?v=1.18.3}"></script>
+</div>

ruoyi-system/src/main/resources/templates/system/app/add.html

@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增编码申请')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-app-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">申请编码：</label>
+                <div class="col-sm-8">
+                    <input name="appCode" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">编码体系ID：</label>
+                <div class="col-sm-8">
+                    <input name="categoryId" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">申请名称：</label>
+                <div class="col-sm-8">
+                    <input name="appName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">状态：</label>
+                <div class="col-sm-8">
+                    <select name="status" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/app"
+        $("#form-app-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-app-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/app/app.html

@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('编码申请列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>申请编码：</label>
+                                <input type="text" name="appCode"/>
+                            </li>
+                            <li>
+                                <label>编码体系ID：</label>
+                                <input type="text" name="categoryId"/>
+                            </li>
+                            <li>
+                                <label>申请名称：</label>
+                                <input type="text" name="appName"/>
+                            </li>
+                            <li>
+                                <label>状态：</label>
+                                <select name="status">
+                                    <option value="">所有</option>
+                                    <option value="-1">代码生成请选择字典属性</option>
+                                </select>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:app:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:app:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:app:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:app:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:app:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:app:remove')}]];
+        var listFlag = [[${@permission.hasPermi('system:dict:list')}]];
+        var prefix = ctx + "system/app";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "编码申请",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'appId',
+                    title: '编码申请单主键seq_sys_app.nextval',
+                    visible: false
+                },
+                {
+                    field: 'appCode',
+                    title: '申请编码'
+                },
+                {
+                    field: 'categoryId',
+                    title: '编码体系ID'
+                },
+                {
+                    field: 'appName',
+                    title: '申请名称'
+                },
+                {
+                    field: 'status',
+                    title: '状态'
+                },
+                {
+                    field: 'remark',
+                    title: '备注'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.appId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-info btn-xs ' + listFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.appId + '\')"><i class="fa fa-list-ul"></i>列表</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.appId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+        /*字典详细*/
+        function detail(dictId) {
+            var url = prefix + '/detail/' + dictId;
+            $.modal.openTab("申请单数据", url);
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/app/edit.html

@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改编码申请')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-app-edit" th:object="${sysApp}">
+            <input name="appId" th:field="*{appId}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">申请编码：</label>
+                <div class="col-sm-8">
+                    <input name="appCode" th:field="*{appCode}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">编码体系ID：</label>
+                <div class="col-sm-8">
+                    <input name="categoryId" th:field="*{categoryId}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">申请名称：</label>
+                <div class="col-sm-8">
+                    <input name="appName" th:field="*{appName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">状态：</label>
+                <div class="col-sm-8">
+                    <select name="status" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/app";
+        $("#form-app-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-app-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/app/fuwenben.html

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <script src="/static/ueditor/ueditor.config.js"></script>
+    <script src="/static/ueditor/ueditor.all.js"></script>
+    <script src="/static/ueditor/lang/zh-cn/zh-cn.js"></script>
+</head>
+<body class="white-bg">
+<textarea id="container" name="content" type="text/plain">这里写你的初始化内容</textarea>
+
+
+
+
+
+<script type="text/javascript">
+    var editor = UE.getEditor('container');
+    alert(editor);
+</script>
+
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/data/add.html

@@ -0,0 +1,146 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('新增编码申请数据')" />
+    <th:block th:include="include :: select2-css" />
+    <th:block th:include="include :: ztree-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-data-add">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">材料分类：</label>
+                <div class="col-sm-8">
+                    <select id="classs" name="type" class="form-control m-b classs"  th:onchange="selectAttribListByClasss(this)">
+                        <option></option>
+                    </select>
+                </div>
+            </div>
+            <div  id ="attr" class="form-group">
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">CC代码：</label>
+                <div class="col-sm-8">
+                    <input id="code"name="code"  readonly="true" class="form-control" type="text">
+                </div>
+            </div>
+            <div id="formula" class="form-group">
+            </div>
+        </form>
+    </div>
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    </div>
+    <div class="row">
+        <div class="col-sm-offset-5 col-sm-10">
+            <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
+            <button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: layout-latest-js" />
+    <th:block th:include="include :: select2-js" />
+</body>
+<script th:inline="javascript">
+    var prefix = ctx + "system/data";
+    var prefix_attrib = ctx + "system/attrib";
+    var prefix_value = ctx + "system/value";
+    //加载材料分类
+    $.post(prefix + "/selectApprovalClasss","", function(result) {
+        for(var i=0;i<result.data.length;i++){
+            $("#classs").append($("<option/>").text(result.data[i].classId).attr("value",result.data[i].classNo).attr("code",result.data[i].commodityCodePref));
+        }
+    });
+    $("#form-data-add").validate({
+        focusCleanup: true
+    });
+    function selectAttribListByClasss(attr){
+        var classId = $("#classs").val();
+
+        let commodityCodePref =  $("#classs").find("option:selected").attr("code");
+        $("#code").val(commodityCodePref);
+        //获取分类对应CC属性
+        $.post(prefix_attrib + "/selectAttribListByClasss/"+classId,"", function(result) {
+            var str='';
+            for(var i = 0; i<result.data.length; i++){
+                str +=" <div class=\"form-group\">";
+                str +="                <label class=\"col-sm-3 control-label\">"+result.data[i].descr+"：</label>";
+                str +="                <div class=\"col-sm-8\">";
+                // var attrib_id=result.data[i].class_attrib_id;  key=\""+attrib_id+"\"
+                str +="                    <select id=\""+result.data[i].attribNo+"\" name=\""+result.data[i].attribNo+"\" onchange=\"selectFormul(this)\" class=\"form-control\">";
+                str +="                     <option ></option>";
+                str +="                    </select>";
+                str +="                </div>";
+                str +="            </div>";
+            }
+            document.getElementById('attr').innerHTML=str;
+            for(i = 0; i<result.data.length; i++) {//填充属性值
+                var attribNo = result.data[i].attribNo;
+                var attrib_id=result.data[i].class_attrib_id;
+                $.ajaxSettings.async = false;
+                $.post(prefix_value + "/selectByAttrib/" + attribNo, "", function (result1) {
+                    for ( j = 0; j < result1.data.length; j++) {
+                        var value=result1.data[j].VALUE;
+                        var ids=result1.data[j].IDS;
+                        $("#"+attribNo).append($("<option/>").text(value.split("@@@")[1].split("@")[1]).attr("value",ids).attr("values",value).attr("key",attrib_id));
+                    }
+                });
+                $.ajaxSettings.async = true;
+            }
+        });
+        setTimeout(function () {
+            $("select").select2()
+        },3000);
+        //获取描述规则
+        $.post(prefix_value + "/selectPropertyFormulaByTypeId/"+classId,"", function(result) {
+            var str='';
+            for(var i=0;i<result.data.length;i++){
+                //获取某一个描述规则
+                var FREE_TEXT=result.data[i].FREE_TEXT;
+                $.ajaxSettings.async = false;
+                $.post(prefix_value + "/selectPropertyFormulaByTypeAndProperty/"+classId+","+result.data[i].ENTITY_PROPERTY_NO,"", function(result2) {
+                    for (let j = 0; j < result2.data.length; j++) {
+                        var CLASS_ATTRIB_ID=result2.data[j].CLASS_ATTRIB_ID;
+                        var REPRESENT_TYPE_ID=result2.data[j].REPRESENT_TYPE_ID;
+                        var num=j+1;
+                        FREE_TEXT=FREE_TEXT.replaceAll("{"+num+"}",CLASS_ATTRIB_ID+"."+REPRESENT_TYPE_ID);
+                    }
+                });
+                $.ajaxSettings.async = true;
+                str +=" <div class=\"form-group\">";
+                str +="                <label class=\"col-sm-3 control-label\">"+result.data[i].DESCR+"：</label>";
+                str +="                <div class=\"col-sm-9\">";
+                str +="                   <span><!--描述规则：--></span> <span id=\"Formula"+result.data[i].ENTITY_PROPERTY_NO+"\" name=\"" ;
+                str +=""+result.data[i].ENTITY_PROPERTY_ID+"\" class=\"form-control\"readonly=\"true\" >";
+                 str +=FREE_TEXT;
+                str +="                    </span>";
+                str +="                </div>";
+                str +="            </div>";
+            }
+            document.getElementById('formula').innerHTML=str;
+        });
+    }
+    function selectFormul(res){
+        // console.log(res.options[res.selectedIndex].value); // 选中的值
+        // console.log(res.options[res.selectedIndex].text); // 选中的value
+        var shuxing=$("#"+res.id).find("option:selected").attr("key");
+        var values=$("#"+res.id).find("option:selected").attr("values");
+        // console.log(shuxing);
+        // console.log(values);
+        var arr=values.split("@@@");
+        for (let i = 0; i < arr.length; i++) {
+            if(arr[i].indexOf("ATTR_CODE")>-1){
+                $("#code").val($("#code").val()+arr[i].split("@")[1]);
+            }
+
+
+
+        }
+
+    }
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.saveTab(prefix + "/add", $('#form-data-add').serialize());
+        }
+    }
+</script>
+</html>

ruoyi-system/src/main/resources/templates/system/data/data.html

@@ -0,0 +1,224 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('编码申请数据列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>申请单ID：</label>
+                                <input type="text" name="appId"/>
+                            </li>
+                            <li>
+                                <label>CC或者ID：</label>
+                                <select name="type">
+                                    <option value="">所有</option>
+                                    <option value="-1">代码生成请选择字典属性</option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>CC代码或ID代码：</label>
+                                <input type="text" name="code"/>
+                            </li>
+                            <li>
+                                <label>设计描述：</label>
+                                <input type="text" name="designDesc"/>
+                            </li>
+                            <li>
+                                <label>中文公制短描述：</label>
+                                <input type="text" name="zhCnShortDesc"/>
+                            </li>
+                            <li>
+                                <label>中文公制长描述：</label>
+                                <input type="text" name="zhCnLongDesc"/>
+                            </li>
+                            <li>
+                                <label>中文英制短描述：</label>
+                                <input type="text" name="zhEnShortDesc"/>
+                            </li>
+                            <li>
+                                <label>中文英制长描述：</label>
+                                <input type="text" name="zhEnLongDesc"/>
+                            </li>
+                            <li>
+                                <label>俄文公制短描述：</label>
+                                <input type="text" name="ruCnShortDesc"/>
+                            </li>
+                            <li>
+                                <label>俄文公制长描述：</label>
+                                <input type="text" name="ruCnLongDesc"/>
+                            </li>
+                            <li>
+                                <label>俄文英制短描述：</label>
+                                <input type="text" name="ruEnShortDesc"/>
+                            </li>
+                            <li>
+                                <label>俄文英制长描述：</label>
+                                <input type="text" name="ruEnLongDesc"/>
+                            </li>
+                            <li>
+                                <label>英文公制短描述：</label>
+                                <input type="text" name="enCnShortDesc"/>
+                            </li>
+                            <li>
+                                <label>英文公制长描述：</label>
+                                <input type="text" name="enCnLongDesc"/>
+                            </li>
+                            <li>
+                                <label>英文英制短描述：</label>
+                                <input type="text" name="enEnShortDesc"/>
+                            </li>
+                            <li>
+                                <label>英文英制长描述：</label>
+                                <input type="text" name="enEnLongDesc"/>
+                            </li>
+                            <li>
+                                <label>状态：</label>
+                                <select name="status">
+                                    <option value="">所有</option>
+                                    <option value="-1">代码生成请选择字典属性</option>
+                                </select>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.addTab()" shiro:hasPermission="system:data:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:data:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:data:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:data:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:data:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:data:remove')}]];
+        var prefix = ctx + "system/data";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "编码申请数据",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'appDataId',
+                    title: '申请单明细主键seq_sys_app_data.nextval',
+                    visible: false
+                },
+                {
+                    field: 'appId',
+                    title: '申请单ID'
+                },
+                {
+                    field: 'type',
+                    title: 'CC或者ID'
+                },
+                {
+                    field: 'code',
+                    title: 'CC代码或ID代码'
+                },
+                {
+                    field: 'designDesc',
+                    title: '设计描述'
+                },
+                {
+                    field: 'zhCnShortDesc',
+                    title: '中文公制短描述'
+                },
+                {
+                    field: 'zhCnLongDesc',
+                    title: '中文公制长描述'
+                },
+                {
+                    field: 'zhEnShortDesc',
+                    title: '中文英制短描述'
+                },
+                {
+                    field: 'zhEnLongDesc',
+                    title: '中文英制长描述'
+                },
+                {
+                    field: 'ruCnShortDesc',
+                    title: '俄文公制短描述'
+                },
+                {
+                    field: 'ruCnLongDesc',
+                    title: '俄文公制长描述'
+                },
+                {
+                    field: 'ruEnShortDesc',
+                    title: '俄文英制短描述'
+                },
+                {
+                    field: 'ruEnLongDesc',
+                    title: '俄文英制长描述'
+                },
+                {
+                    field: 'enCnShortDesc',
+                    title: '英文公制短描述'
+                },
+                {
+                    field: 'enCnLongDesc',
+                    title: '英文公制长描述'
+                },
+                {
+                    field: 'enEnShortDesc',
+                    title: '英文英制短描述'
+                },
+                {
+                    field: 'enEnLongDesc',
+                    title: '英文英制长描述'
+                },
+                {
+                    field: 'status',
+                    title: '状态'
+                },
+                {
+                    field: 'remark',
+                    title: '备注'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.appDataId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.appDataId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-system/src/main/resources/templates/system/data/edit.html

@@ -0,0 +1,125 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改编码申请数据')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-data-edit" th:object="${sysAppData}">
+            <input name="appDataId" th:field="*{appDataId}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">CC或者ID：</label>
+                <div class="col-sm-8">
+                    <select name="type" class="form-control m-b">
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">CC代码或ID代码：</label>
+                <div class="col-sm-8">
+                    <input name="code" th:field="*{code}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">设计描述：</label>
+                <div class="col-sm-8">
+                    <input name="designDesc" th:field="*{designDesc}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">中文公制短描述：</label>
+                <div class="col-sm-8">
+                    <input name="zhCnShortDesc" th:field="*{zhCnShortDesc}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">中文公制长描述：</label>
+                <div class="col-sm-8">
+                    <input name="zhCnLongDesc" th:field="*{zhCnLongDesc}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">中文英制短描述：</label>
+                <div class="col-sm-8">
+                    <input name="zhEnShortDesc" th:field="*{zhEnShortDesc}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">中文英制长描述：</label>
+                <div class="col-sm-8">
+                    <input name="zhEnLongDesc" th:field="*{zhEnLongDesc}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">俄文公制短描述：</label>
+                <div class="col-sm-8">
+                    <input name="ruCnShortDesc" th:field="*{ruCnShortDesc}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">俄文公制长描述：</label>
+                <div class="col-sm-8">
+                    <input name="ruCnLongDesc" th:field="*{ruCnLongDesc}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">俄文英制短描述：</label>
+                <div class="col-sm-8">
+                    <input name="ruEnShortDesc" th:field="*{ruEnShortDesc}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">俄文英制长描述：</label>
+                <div class="col-sm-8">
+                    <input name="ruEnLongDesc" th:field="*{ruEnLongDesc}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">英文公制短描述：</label>
+                <div class="col-sm-8">
+                    <input name="enCnShortDesc" th:field="*{enCnShortDesc}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">英文公制长描述：</label>
+                <div class="col-sm-8">
+                    <input name="enCnLongDesc" th:field="*{enCnLongDesc}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">英文英制短描述：</label>
+                <div class="col-sm-8">
+                    <input name="enEnShortDesc" th:field="*{enEnShortDesc}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">英文英制长描述：</label>
+                <div class="col-sm-8">
+                    <input name="enEnLongDesc" th:field="*{enEnLongDesc}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/data";
+        $("#form-data-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-data-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

sql/ry_20220111.sql

@@ -0,0 +1,185 @@
+
+create sequence seq_SYS_APP
+    increment by 1
+    start with 100
+    nomaxvalue
+ nominvalue
+ cache 20;
+-- Create table
+create table SYS_APP
+(
+    app_id      NUMBER(20) not null,
+    app_code    VARCHAR2(64) not null,
+    category_id NUMBER(20),
+    app_name    VARCHAR2(50) not null,
+    status      CHAR(1) default 0,
+    create_by   VARCHAR2(64) default '',
+    create_time DATE,
+    update_by   VARCHAR2(64) default '',
+    update_time DATE,
+    remark      VARCHAR2(500)
+)
+    tablespace ERM_DATA
+  pctfree 10
+  initrans 1
+  maxtrans 255
+  storage
+  (
+    initial 64K
+    next 1M
+    minextents 1
+    maxextents unlimited
+  );
+-- Add comments to the table
+comment on table SYS_APP
+  is '编码申请表';
+-- Add comments to the columns
+comment on column SYS_APP.app_id
+  is '编码申请单主键seq_sys_app.nextval';
+comment on column SYS_APP.app_code
+  is '申请编码';
+comment on column SYS_APP.category_id
+  is '编码体系ID';
+comment on column SYS_APP.app_name
+  is '申请名称';
+comment on column SYS_APP.status
+  is '状态（0正常 1通过2驳回）';
+comment on column SYS_APP.create_by
+  is '创建者';
+comment on column SYS_APP.create_time
+  is '创建时间';
+comment on column SYS_APP.update_by
+  is '更新者';
+comment on column SYS_APP.update_time
+  is '更新时间';
+comment on column SYS_APP.remark
+  is '备注';
+-- Create/Recreate primary, unique and foreign key constraints
+alter table SYS_APP
+    add constraint PK_SYS_APP primary key (APP_ID)
+    using index
+  tablespace ERM_DATA
+  pctfree 10
+  initrans 2
+  maxtrans 255
+  storage
+  (
+    initial 64K
+    next 1M
+    minextents 1
+    maxextents unlimited
+  );
+-- 菜单 SQL
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values(2004, '编码申请', '2001', '1', '/system/app', 'C', '0', 'system:app:view', '#', 'admin', sysdate, '', null, '编码申请菜单');
+
+-- 按钮 SQL
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values(seq_sys_menu.nextval, '编码申请查询', 2004, '1',  '#',  'F', '0', 'system:app:list',         '#', 'admin', sysdate, '', null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values(seq_sys_menu.nextval, '编码申请新增', 2004, '2',  '#',  'F', '0', 'system:app:add',          '#', 'admin', sysdate, '', null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values(seq_sys_menu.nextval, '编码申请修改', 2004, '3',  '#',  'F', '0', 'system:app:edit',         '#', 'admin', sysdate, '', null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values(seq_sys_menu.nextval, '编码申请删除', 2004, '4',  '#',  'F', '0', 'system:app:remove',       '#', 'admin', sysdate, '', null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark)
+values(seq_sys_menu.nextval, '编码申请导出', 2004, '5',  '#',  'F', '0', 'system:app:export',       '#', 'admin', sysdate, '', null, '');
+
+
+---20210929
+create sequence seq_SYS_APP_DATA
+    increment by 1
+    start with 100
+    nomaxvalue
+ nominvalue
+ cache 20;
+-- Create table
+create table SYS_APP_DATA
+(
+    app_data_id      NUMBER(20) not null,
+    app_id           number(20),
+    type             CHAR(1),
+    cc_code          varchar2(500),
+    design_desc      varchar2(4000),
+    zh_cn_short_desc varchar2(4000),
+    zh_cn_long_desc  varchar2(4000),
+    zh_en_short_desc varchar2(4000),
+    zh_en_long_desc  varchar2(4000),
+    ru_cn_short_desc varchar2(4000),
+    ru_cn_long_desc  varchar2(4000),
+    ru_en_short_desc varchar2(4000),
+    ru_en_long_desc  varchar2(4000),
+    en_cn_short_desc varchar2(4000),
+    en_cn_long_desc  varchar2(4000),
+    en_en_short_desc varchar2(4000),
+    en_en_long_desc  varchar2(4000),
+    status           CHAR(1) default '0',
+    create_by        VARCHAR2(64) default '',
+    create_time      DATE,
+    update_by        VARCHAR2(64) default '',
+    update_time      DATE,
+    remark           VARCHAR2(500)
+)
+    tablespace ERM_DATA
+  pctfree 10
+  initrans 1
+  maxtrans 255
+  storage
+  (
+    initial 64K
+    next 1M
+    minextents 1
+    maxextents unlimited
+  );
+-- Add comments to the table
+comment on table SYS_APP_DATA  is '编码申请数据表';
+-- Add comments to the columns
+comment on column SYS_APP_DATA.app_data_id  is '申请单明细主键seq_sys_app_data.nextval';
+comment on column SYS_APP_DATA.app_id  is '申请单ID';
+comment on column SYS_APP_DATA.type  is 'CC或者ID（0:CC,1:ID）';
+comment on column SYS_APP_DATA.cc_code  is 'CC代码';
+comment on column SYS_APP_DATA.design_desc  is '设计描述';
+comment on column SYS_APP_DATA.zh_cn_short_desc  is '中文公制短描述';
+comment on column SYS_APP_DATA.zh_cn_long_desc  is '中文公制长描述';
+comment on column SYS_APP_DATA.zh_en_short_desc  is '中文英制短描述';
+comment on column SYS_APP_DATA.zh_en_long_desc  is '中文英制长描述';
+comment on column SYS_APP_DATA.ru_cn_short_desc  is '俄文公制短描述';
+comment on column SYS_APP_DATA.ru_cn_long_desc  is '俄文公制长描述';
+comment on column SYS_APP_DATA.ru_en_short_desc  is '俄文英制短描述';
+comment on column SYS_APP_DATA.ru_en_long_desc  is '俄文英制长描述';
+comment on column SYS_APP_DATA.en_cn_short_desc  is '英文公制短描述';
+comment on column SYS_APP_DATA.en_cn_long_desc  is '英文公制长描述';
+comment on column SYS_APP_DATA.en_en_short_desc  is '英文英制短描述';
+comment on column SYS_APP_DATA.en_en_long_desc  is '英文英制长描述';
+comment on column SYS_APP_DATA.status  is '状态（0正常 1停用）';
+comment on column SYS_APP_DATA.create_by  is '创建者';
+comment on column SYS_APP_DATA.create_time  is '创建时间';
+comment on column SYS_APP_DATA.update_by  is '更新者';
+comment on column SYS_APP_DATA.update_time  is '更新时间';
+comment on column SYS_APP_DATA.remark  is '备注';
+-- Create/Recreate primary, unique and foreign key constraints
+alter table SYS_APP_DATA
+    add constraint PK_SYS_APP_DATA primary key (APP_DATA_ID)
+    using index
+  tablespace ERM_DATA
+  pctfree 10
+  initrans 2
+  maxtrans 255
+  storage
+  (
+    initial 64K
+    next 1M
+    minextents 1
+    maxextents unlimited
+  );
+alter table SYS_APP_DATA
+    add constraint FK_SYS_APP_DATA foreign key (APP_ID)
+        references sys_app (APP_ID) on delete cascade;
+alter table SYS_APP_DATA rename column cc_code to CODE;
+comment on column SYS_APP_DATA.code  is 'CC代码或ID代码';
+alter table SYS_OPER_LOG modify oper_param VARCHAR2(4000);
+alter table SYS_OPER_LOG modify json_result VARCHAR2(4000);