diff --git a/pom.xml b/pom.xml
index 904c518..9646f35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,15 +3,15 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	
+
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
     <version>3.8.7</version>
 
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
-    <description>若依管理系统</description>
-    
+    <description>江南业务系统</description>
+
     <properties>
         <ruoyi.version>3.8.7</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -253,4 +253,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
index ae1c3ec..a5e32b7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
@@ -24,7 +24,7 @@ import springfox.documentation.spring.web.plugins.Docket;
 
 /**
  * Swagger2的接口配置
- * 
+ *
  * @author ruoyi
  */
 @Configuration
@@ -113,7 +113,7 @@ public class SwaggerConfig
         // 用ApiInfoBuilder进行定制
         return new ApiInfoBuilder()
                 // 设置标题
-                .title("标题：若依管理系统_接口文档")
+                .title("标题：江南业务系统_接口文档")
                 // 描述
                 .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
                 // 作者信息
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 779f50f..b962313 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,7 +6,7 @@ spring:
             # 主库数据源
             master:
                 driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-                url: jdbc:sqlserver://192.168.9.99:1433;DatabaseName=ry-vue
+                url: jdbc:sqlserver://192.168.9.66:1433;DatabaseName=ry-vue
                 username: sa
                 password: Itcenter110-
             # 红本数据库数据源
diff --git a/ruoyi-system/src/main/java/com/ruoyi/factory/domain/CFactory.java b/ruoyi-system/src/main/java/com/ruoyi/factory/domain/CFactory.java
index f1db242..4adbe54 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/factory/domain/CFactory.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/factory/domain/CFactory.java
@@ -61,7 +61,7 @@ public class CFactory extends BaseEntity
     private BigDecimal factoryTotalRatio;
 
     /** 物料类别信息 */
-    private List<CMaterialType> cMaterialTypeList;
+    private List<CMaterialTypeFactory> cMaterialTypeList;
 
     public void setFactoryId(Long factoryId)
     {
@@ -158,12 +158,12 @@ public class CFactory extends BaseEntity
 
     public void setFactoryPjRatio(BigDecimal factoryPjRatio) {this.factoryPjRatio = factoryPjRatio;}
 
-    public List<CMaterialType> getCMaterialTypeList()
+    public List<CMaterialTypeFactory> getCMaterialTypeList()
     {
         return cMaterialTypeList;
     }
 
-    public void setCMaterialTypeList(List<CMaterialType> cMaterialTypeList){this.cMaterialTypeList = cMaterialTypeList;}
+    public void setCMaterialTypeList(List<CMaterialTypeFactory> cMaterialTypeList){this.cMaterialTypeList = cMaterialTypeList;}
 
     @Override
     public String toString() {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/factory/domain/CMaterialType.java b/ruoyi-system/src/main/java/com/ruoyi/factory/domain/CMaterialTypeFactory.java
similarity index 74%
rename from ruoyi-system/src/main/java/com/ruoyi/factory/domain/CMaterialType.java
rename to ruoyi-system/src/main/java/com/ruoyi/factory/domain/CMaterialTypeFactory.java
index 5f92437..1862e0b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/factory/domain/CMaterialType.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/factory/domain/CMaterialTypeFactory.java
@@ -7,11 +7,11 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 物料类别对象 c_material_type
- * 
+ *
  * @author ruoyi
  * @date 2024-02-29
  */
-public class CMaterialType extends BaseEntity
+public class CMaterialTypeFactory extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
@@ -26,42 +26,42 @@ public class CMaterialType extends BaseEntity
     @Excel(name = "名称")
     private String typeName;
 
-    /** 关联车间id */
-    private Long factoryId;
+    /** 关联车间编码 */
+    private String factoryId;
 
-    public void setTypeId(Long typeId) 
+    public void setTypeId(Long typeId)
     {
         this.typeId = typeId;
     }
 
-    public Long getTypeId() 
+    public Long getTypeId()
     {
         return typeId;
     }
-    public void setTypeNo(String typeNo) 
+    public void setTypeNo(String typeNo)
     {
         this.typeNo = typeNo;
     }
 
-    public String getTypeNo() 
+    public String getTypeNo()
     {
         return typeNo;
     }
-    public void setTypeName(String typeName) 
+    public void setTypeName(String typeName)
     {
         this.typeName = typeName;
     }
 
-    public String getTypeName() 
+    public String getTypeName()
     {
         return typeName;
     }
-    public void setFactoryId(Long factoryId) 
+    public void setFactoryId(String factoryId)
     {
         this.factoryId = factoryId;
     }
 
-    public Long getFactoryId() 
+    public String getFactoryId()
     {
         return factoryId;
     }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/factory/mapper/CFactoryMapper.java b/ruoyi-system/src/main/java/com/ruoyi/factory/mapper/CFactoryMapper.java
index 439dce2..d256089 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/factory/mapper/CFactoryMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/factory/mapper/CFactoryMapper.java
@@ -2,7 +2,7 @@ package com.ruoyi.factory.mapper;
 
 import java.util.List;
 import com.ruoyi.factory.domain.CFactory;
-import com.ruoyi.factory.domain.CMaterialType;
+import com.ruoyi.factory.domain.CMaterialTypeFactory;
 
 /**
  * 车间管理Mapper接口
@@ -74,7 +74,7 @@ public interface CFactoryMapper
      * @param cMaterialTypeList 物料类别列表
      * @return 结果
      */
-    public int batchCMaterialType(List<CMaterialType> cMaterialTypeList);
+    public int batchCMaterialType(List<CMaterialTypeFactory> cMaterialTypeList);
 
 
     /**
@@ -83,10 +83,10 @@ public interface CFactoryMapper
      * @param factoryId 车间管理ID
      * @return 结果
      */
-    public int deleteCMaterialTypeByFactoryId(Long factoryId);
+    public int deleteCMaterialTypeByFactoryId(String factoryId);
 
     /*物料类别列表*/
-    List<CMaterialType> selectCTypelist();
+    List<CMaterialTypeFactory> selectCTypelist();
 
     /**
      * 校验车间编码是否存在
diff --git a/ruoyi-system/src/main/java/com/ruoyi/factory/service/impl/CFactoryServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/factory/service/impl/CFactoryServiceImpl.java
index dea76ed..a582fd6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/factory/service/impl/CFactoryServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/factory/service/impl/CFactoryServiceImpl.java
@@ -2,14 +2,13 @@ package com.ruoyi.factory.service.impl;
 
 import java.util.List;
 
-import com.ruoyi.clMaterial.domain.CYlMaterial;
 import com.ruoyi.common.constant.UserConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
-import com.ruoyi.factory.domain.CMaterialType;
+import com.ruoyi.factory.domain.CMaterialTypeFactory;
 import com.ruoyi.factory.mapper.CFactoryMapper;
 import com.ruoyi.factory.domain.CFactory;
 import com.ruoyi.factory.service.ICFactoryService;
@@ -52,7 +51,7 @@ public class CFactoryServiceImpl implements ICFactoryService
 
     /*物料类别列表*/
     @Override
-    public List<CMaterialType> selectCTypelist() {
+    public List<CMaterialTypeFactory> selectCTypelist() {
         return cFactoryMapper.selectCTypelist();
     }
 
@@ -81,7 +80,7 @@ public class CFactoryServiceImpl implements ICFactoryService
     @Override
     public int updateCFactory(CFactory cFactory)
     {
-        cFactoryMapper.deleteCMaterialTypeByFactoryId(cFactory.getFactoryId());
+        cFactoryMapper.deleteCMaterialTypeByFactoryId(cFactory.getFactoryNo());
         insertCMaterialType(cFactory);
         return cFactoryMapper.updateCFactory(cFactory);
     }
@@ -110,7 +109,8 @@ public class CFactoryServiceImpl implements ICFactoryService
     @Override
     public int deleteCFactoryByFactoryId(Long factoryId)
     {
-        cFactoryMapper.deleteCMaterialTypeByFactoryId(factoryId);
+        CFactory f = cFactoryMapper.selectCFactoryByFactoryId(factoryId);
+        cFactoryMapper.deleteCMaterialTypeByFactoryId(f.getFactoryNo());
         return cFactoryMapper.deleteCFactoryByFactoryId(factoryId);
     }
 
@@ -121,14 +121,14 @@ public class CFactoryServiceImpl implements ICFactoryService
      */
     public void insertCMaterialType(CFactory cFactory)
     {
-        List<CMaterialType> cMaterialTypeList = cFactory.getCMaterialTypeList();
-        Long factoryId = cFactory.getFactoryId();
+        List<CMaterialTypeFactory> cMaterialTypeList = cFactory.getCMaterialTypeList();
+        String factoryNo = cFactory.getFactoryNo();
         if (StringUtils.isNotNull(cMaterialTypeList))
         {
-            List<CMaterialType> list = new ArrayList<CMaterialType>();
-            for (CMaterialType cMaterialType : cMaterialTypeList)
+            List<CMaterialTypeFactory> list = new ArrayList<CMaterialTypeFactory>();
+            for (CMaterialTypeFactory cMaterialType : cMaterialTypeList)
             {
-                cMaterialType.setFactoryId(factoryId);
+                cMaterialType.setFactoryId(factoryNo);
                 list.add(cMaterialType);
             }
             if (list.size() > 0)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java b/ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java
index f20896e..56d2745 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java
@@ -20,8 +20,8 @@ public class CMaterial extends BaseEntity
     /** id */
     private Long materialId;
 
-    /** 关联物料类型id */
-    private Long materialTypeId;
+    /** 关联物料类型编码 */
+    private String materialTypeId;
 
     /** 型号 */
     @Excel(name = "型号")
@@ -56,11 +56,11 @@ public class CMaterial extends BaseEntity
         return materialId;
     }
 
-    public Long getMaterialTypeId() {
+    public String getMaterialTypeId() {
         return materialTypeId;
     }
 
-    public void setMaterialTypeId(Long materialTypeId) {
+    public void setMaterialTypeId(String materialTypeId) {
         this.materialTypeId = materialTypeId;
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/materialType/domain/CMaterialType.java b/ruoyi-system/src/main/java/com/ruoyi/materialType/domain/CMaterialType.java
index 506cd92..8dcac28 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/materialType/domain/CMaterialType.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/materialType/domain/CMaterialType.java
@@ -12,7 +12,6 @@ import org.apache.ibatis.type.Alias;
  * @author ruoyi
  * @date 2024-03-01
  */
-@Alias("c_mtype")
 public class CMaterialType extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -28,9 +27,6 @@ public class CMaterialType extends BaseEntity
     @Excel(name = "名称")
     private String typeName;
 
-    /** 关联车间id */
-    private Long factoryId;
-
     public void setTypeId(Long typeId)
     {
         this.typeId = typeId;
@@ -58,15 +54,6 @@ public class CMaterialType extends BaseEntity
     {
         return typeName;
     }
-    public void setFactoryId(Long factoryId)
-    {
-        this.factoryId = factoryId;
-    }
-
-    public Long getFactoryId()
-    {
-        return factoryId;
-    }
 
     @Override
     public String toString() {
@@ -74,7 +61,6 @@ public class CMaterialType extends BaseEntity
             .append("typeId", getTypeId())
             .append("typeNo", getTypeNo())
             .append("typeName", getTypeName())
-            .append("factoryId", getFactoryId())
             .toString();
     }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/factory/CFactoryMapper.xml b/ruoyi-system/src/main/resources/mapper/factory/CFactoryMapper.xml
index 622acab..46e0ab9 100644
--- a/ruoyi-system/src/main/resources/mapper/factory/CFactoryMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/factory/CFactoryMapper.xml
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <collection property="cMaterialTypeList" notNullColumn="sub_type_id" javaType="java.util.List" resultMap="CMaterialTypeResult" />
     </resultMap>
 
-    <resultMap type="CMaterialType" id="CMaterialTypeResult">
+    <resultMap type="CMaterialTypeFactory" id="CMaterialTypeResult">
         <result property="typeId"    column="sub_type_id"    />
         <result property="typeNo"    column="sub_type_no"    />
         <result property="typeName"    column="sub_type_name"    />
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectCTypelist" resultType="CMaterialType">
+    <select id="selectCTypelist" resultType="CMaterialTypeFactory">
         select type_no as typeNo,type_name as typeName from c_material_type
     </select>
 
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.factory_id, a.factory_no, a.factory_name, a.factory_rg_ratio, a.factory_wj_ratio, a.factory_fl_ratio, a.factory_df_ratio, a.factory_trq_ratio, a.factory_ys_ratio, a.factory_pj_ratio, a.factory_total_ratio,
  b.type_id as sub_type_id, b.type_no as sub_type_no, b.type_name as sub_type_name, b.factory_id as sub_factory_id
         from c_factory a
-        left join c_material_type b on b.factory_id = a.factory_id
+        left join c_material_type_factory b on b.factory_id = a.factory_no
         where a.factory_id = #{factoryId}
     </select>
 
@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from c_factory where factory_id = #{factoryId}
     </delete>
 
-    <delete id="deleteCFactoryByFactoryIds" parameterType="String">
+    <delete id="deleteCFactoryByFactoryIds" parameterType="Long">
         delete from c_factory where factory_id in
         <foreach item="factoryId" collection="array" open="(" separator="," close=")">
             #{factoryId}
@@ -112,18 +112,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCMaterialTypeByFactoryIds" parameterType="String">
-        delete from c_material_type where factory_id in
+        delete from c_material_type_factory where factory_id in
         <foreach item="factoryId" collection="array" open="(" separator="," close=")">
             #{factoryId}
         </foreach>
     </delete>
 
-    <delete id="deleteCMaterialTypeByFactoryId" parameterType="Long">
-        delete from c_material_type where factory_id = #{factoryId}
+    <delete id="deleteCMaterialTypeByFactoryId" parameterType="String">
+        delete from c_material_type_factory where factory_id = #{factoryId}
     </delete>
 
     <insert id="batchCMaterialType">
-        insert into c_material_type(type_no, type_name, factory_id) values
+        insert into c_material_type_factory(type_no, type_name, factory_id) values
 		<foreach item="item" index="index" collection="list" separator=",">
             (#{item.typeNo}, #{item.typeName}, #{item.factoryId})
         </foreach>
diff --git a/ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml b/ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml
index 996a715..25364c1 100644
--- a/ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml
@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectCMaterialVo">
         select a.material_id,a.material_type_id, a.material_xingh, a.material_guig, a.material_diany, a.material_dw,b.type_name
         from c_material a
-        left join c_material_type b on a.material_type_id = b.type_id
+        left join c_material_type b on a.material_type_id = b.type_no
     </sql>
 
     <select id="selectCMaterialList" parameterType="CMaterial" resultMap="CMaterialResult">
diff --git a/ruoyi-system/src/main/resources/mapper/materialType/CMaterialTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/materialType/CMaterialTypeMapper.xml
index 79c0bf6..356b2df 100644
--- a/ruoyi-system/src/main/resources/mapper/materialType/CMaterialTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/materialType/CMaterialTypeMapper.xml
@@ -4,15 +4,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.materialType.mapper.CMaterialTypeMapper">
 
-    <resultMap type="c_mtype" id="CMaterialTypeResult">
+    <resultMap type="CMaterialType" id="CMaterialTypeResult">
         <result property="typeId"    column="type_id"    />
         <result property="typeNo"    column="type_no"    />
         <result property="typeName"    column="type_name"    />
-        <result property="factoryId"    column="factory_id"    />
     </resultMap>
 
     <sql id="selectCMaterialTypeVo">
-        select type_id, type_no, type_name, factory_id from c_material_type
+        select type_id, type_no, type_name from c_material_type
     </sql>
 
     <select id="selectCMaterialTypeList" parameterType="CMaterialType" resultMap="CMaterialTypeResult">
@@ -34,12 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="typeNo != null and typeNo != ''">type_no,</if>
             <if test="typeName != null and typeName != ''">type_name,</if>
-            <if test="factoryId != null">factory_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="typeNo != null and typeNo != ''">#{typeNo},</if>
             <if test="typeName != null and typeName != ''">#{typeName},</if>
-            <if test="factoryId != null">#{factoryId},</if>
          </trim>
     </insert>
 
@@ -48,7 +45,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="typeNo != null and typeNo != ''">type_no = #{typeNo},</if>
             <if test="typeName != null and typeName != ''">type_name = #{typeName},</if>
-            <if test="factoryId != null">factory_id = #{factoryId},</if>
         </trim>
         where type_id = #{typeId}
     </update>
diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development
index 302ecd1..ceed7e3 100644
--- a/ruoyi-ui/.env.development
+++ b/ruoyi-ui/.env.development
@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 江南业务系统
 
 # 开发环境配置
 ENV = 'development'
 
-# 若依管理系统/开发环境
+# 江南业务系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index b4893b0..41e8cd8 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 江南业务系统
 
 # 生产环境配置
 ENV = 'production'
 
-# 若依管理系统/生产环境
+# 江南业务系统/生产环境
 VUE_APP_BASE_API = '/prod-api'
diff --git a/ruoyi-ui/.env.staging b/ruoyi-ui/.env.staging
index 361859f..2c628c7 100644
--- a/ruoyi-ui/.env.staging
+++ b/ruoyi-ui/.env.staging
@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 江南业务系统
 
 NODE_ENV = production
 
 # 测试环境配置
 ENV = 'staging'
 
-# 若依管理系统/测试环境
+# 江南业务系统/测试环境
 VUE_APP_BASE_API = '/stage-api'
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 3b419f6..425da91 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,8 +1,8 @@
 {
   "name": "ruoyi",
   "version": "3.8.7",
-  "description": "若依管理系统",
-  "author": "若依",
+  "description": "江南业务系统",
+  "author": "江南集团",
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 862c803..5039595 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -9,13 +9,13 @@
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
+        <!--<el-tooltip content="源码地址" effect="dark" placement="bottom">
           <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
         </el-tooltip>
 
         <el-tooltip content="文档地址" effect="dark" placement="bottom">
           <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip>-->
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
diff --git a/ruoyi-ui/src/views/clMaterial/clMaterial/index.vue b/ruoyi-ui/src/views/clMaterial/clMaterial/index.vue
index cfce4b6..56b326f 100644
--- a/ruoyi-ui/src/views/clMaterial/clMaterial/index.vue
+++ b/ruoyi-ui/src/views/clMaterial/clMaterial/index.vue
@@ -111,7 +111,7 @@
           <el-input v-model="form.materialNo" placeholder="请输入编码" :disabled="isDis"/>
         </el-form-item>
         <el-form-item label="名称" prop="materialName">
-          <el-input v-model="form.materialName" placeholder="请输入名称" :disabled="isDis" />
+          <el-input v-model="form.materialName" placeholder="请输入名称"/>
         </el-form-item>
         <el-form-item label="单价" prop="materialPrice">
           <el-input v-model="form.materialPrice" placeholder="请输入单价" />
diff --git a/ruoyi-ui/src/views/factory/factory/index.vue b/ruoyi-ui/src/views/factory/factory/index.vue
index e928d6d..39dc70b 100644
--- a/ruoyi-ui/src/views/factory/factory/index.vue
+++ b/ruoyi-ui/src/views/factory/factory/index.vue
@@ -182,7 +182,7 @@
             <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteCMaterialType">删除</el-button>
           </el-col>
         </el-row>
-        <el-table :data="cMaterialTypeList" width="100%" :row-class-name="rowCMaterialTypeIndex" @selection-change="handleCMaterialTypeSelectionChange" ref="cMaterialType">
+        <el-table :data="cmaterialTypeList" width="100%" :row-class-name="rowCMaterialTypeIndex" @selection-change="handleCMaterialTypeSelectionChange" ref="cMaterialType">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="序号" width="50" align="center" prop="index"/>
           <el-table-column label="编码" prop="typeNo">
@@ -243,7 +243,7 @@ export default {
       // 车间管理表格数据
       factoryList: [],
       // 物料类别表格数据
-      cMaterialTypeList: [],
+      cmaterialTypeList: [],
       cTypeList: [],
       cTypeMap: {},
 
@@ -364,7 +364,7 @@ export default {
         factoryPjRatio: null,
         factoryTotalRatio: null
       };
-      this.cMaterialTypeList = [];
+      this.cmaterialTypeList = [];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -396,7 +396,7 @@ export default {
       const factoryId = row.factoryId || this.ids
       getFactory(factoryId).then(response => {
         this.form = response.data;
-        this.cMaterialTypeList = response.data.cmaterialTypeList;
+        this.cmaterialTypeList = response.data.cmaterialTypeList;
         this.open = true;
         this.title = "修改车间管理";
         this.isDis = true;
@@ -406,7 +406,9 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.cMaterialTypeList = this.cMaterialTypeList;
+          this.form.cmaterialTypeList = this.cmaterialTypeList;
+
+          console.log(this.form)
           if (this.form.factoryId != null) {
             updateFactory(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -442,16 +444,17 @@ export default {
       let obj = {};
       obj.typeNo = "";
       obj.typeName = "";
-      this.cMaterialTypeList.push(obj);
+      this.cmaterialTypeList.push(obj);
     },
     /** 物料类别删除按钮操作 */
     handleDeleteCMaterialType() {
       if (this.checkedCMaterialType.length == 0) {
         this.$modal.msgError("请先选择要删除的物料类别数据");
       } else {
-        const cMaterialTypeList = this.cMaterialTypeList;
+        debugger
+        const cmaterialTypeList = this.cmaterialTypeList;
         const checkedCMaterialType = this.checkedCMaterialType;
-        this.cMaterialTypeList = cMaterialTypeList.filter(function(item) {
+        this.cmaterialTypeList = cmaterialTypeList.filter(function(item) {
           return checkedCMaterialType.indexOf(item.index) == -1
         });
       }
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 1769cce..1517336 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container home">
-    <el-row :gutter="20">
+    <!--<el-row :gutter="20">
       <el-col :sm="24" :lg="24">
         <blockquote class="text-warning" style="font-size: 14px">
           领取阿里云通用云产品1888优惠券
@@ -979,7 +979,7 @@
           </div>
         </el-card>
       </el-col>
-    </el-row>
+    </el-row>-->
   </div>
 </template>
 
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 5cc0773..0c850e0 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">江南业务管理系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -56,7 +56,7 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright © 2024 无锡江南电缆有限公司 All rights reserved.</span>
     </div>
   </div>
 </template>
diff --git a/ruoyi-ui/src/views/material/material/index.vue b/ruoyi-ui/src/views/material/material/index.vue
index 3d034cd..2e973b2 100644
--- a/ruoyi-ui/src/views/material/material/index.vue
+++ b/ruoyi-ui/src/views/material/material/index.vue
@@ -125,7 +125,7 @@
                   v-for="item in cTypeList"
                   :key="item.typeId"
                   :label="item.typeName"
-                  :value="item.typeId"
+                  :value="item.typeNo"
                 />
               </el-select>
             </el-form-item>
@@ -167,7 +167,7 @@
             <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteCMaterialCost">删除</el-button>
           </el-col>
         </el-row>
-        <el-table :data="cmaterialCostList" height="350" width="100%" :row-class-name="rowCMaterialCostIndex" @selection-change="handleCMaterialCostSelectionChange" ref="cMaterialCost" :show-summary="showSum" :summary-method="tableHJ">
+        <el-table :data="cMaterialCostList" height="350" width="100%" :row-class-name="rowCMaterialCostIndex" @selection-change="handleCMaterialCostSelectionChange" ref="cMaterialCost" :show-summary="showSum" :summary-method="tableHJ">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="序号" align="center" prop="index" width="50"/>
           <el-table-column label="关联用料" width="300" prop="costClId">
@@ -248,7 +248,7 @@ export default {
       // 物料管理表格数据
       materialList: [],
       // 物料成本表格数据
-      cmaterialCostList: [],
+      cMaterialCostList: [],
       //物料类型选项
       cTypeList: [],
       //材料选项
@@ -350,7 +350,7 @@ export default {
         materialDiany: null,
         materialDw: null
       };
-      this.cmaterialCostList = [];
+      this.cMaterialCostList = [];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -381,7 +381,7 @@ export default {
       const materialId = row.materialId || this.ids
       getMaterial(materialId).then(response => {
         this.form = response.data;
-        this.cmaterialCostList = response.data.cmaterialCostList;
+        this.cMaterialCostList = response.data.cmaterialCostList;
         this.open = true;
         this.title = "修改物料管理";
         this.sumPriceTotal()
@@ -391,7 +391,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.cmaterialCostList = this.cMaterialCostList;
+          this.form.cMaterialCostList = this.cMaterialCostList;
           if (this.form.materialId != null) {
             updateMaterial(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -429,16 +429,16 @@ export default {
       obj.costClQty = "";
       obj.costClQty2 = "";
       obj.materialPrice = "";
-      this.cmaterialCostList.push(obj);
+      this.cMaterialCostList.push(obj);
     },
     /** 物料成本删除按钮操作 */
     handleDeleteCMaterialCost() {
       if (this.checkedCMaterialCost.length == 0) {
         this.$modal.msgError("请先选择要删除的物料成本数据");
       } else {
-        const cmaterialCostList = this.cmaterialCostList;
+        const cMaterialCostList = this.cMaterialCostList;
         const checkedCMaterialCost = this.checkedCMaterialCost;
-        this.cmaterialCostList = cmaterialCostList.filter(function(item) {
+        this.cMaterialCostList = cMaterialCostList.filter(function(item) {
           return checkedCMaterialCost.indexOf(item.index) == -1
         });
       }
@@ -460,7 +460,7 @@ export default {
 
     //页面加载计算每行总价
     sumPriceTotal(){
-      this.cmaterialCostList.forEach((row, index) => {
+      this.cMaterialCostList.forEach((row, index) => {
         this.wat(index)
       })
     },
@@ -468,7 +468,7 @@ export default {
     //计算每行总价
     wat(index){
       this.showSum = false;
-      let tmpObj = this.cmaterialCostList[index];
+      let tmpObj = this.cMaterialCostList[index];
       var costClQty = tmpObj.costClQty?tmpObj.costClQty:0;
       var costClQty2 = tmpObj.costClQty2?tmpObj.costClQty2:0;
       var qty = numAdd(costClQty,costClQty2);
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 6fc7590..a84bde4 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '江南业务系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 3335 // 端口