From c319747b03cdf71afb96f2ed1f7d111abd2dd3a6 Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Mon, 4 Mar 2024 13:47:39 +0800 Subject: [PATCH] '20240304' --- pom.xml | 8 +++---- .../ruoyi/web/core/config/SwaggerConfig.java | 4 ++-- .../src/main/resources/application-druid.yml | 2 +- .../com/ruoyi/factory/domain/CFactory.java | 6 ++--- ...ialType.java => CMaterialTypeFactory.java} | 24 +++++++++---------- .../ruoyi/factory/mapper/CFactoryMapper.java | 8 +++---- .../service/impl/CFactoryServiceImpl.java | 20 ++++++++-------- .../com/ruoyi/material/domain/CMaterial.java | 8 +++---- .../materialType/domain/CMaterialType.java | 14 ----------- .../mapper/factory/CFactoryMapper.xml | 16 ++++++------- .../mapper/material/CMaterialMapper.xml | 2 +- .../materialType/CMaterialTypeMapper.xml | 8 ++----- ruoyi-ui/.env.development | 4 ++-- ruoyi-ui/.env.production | 4 ++-- ruoyi-ui/.env.staging | 4 ++-- ruoyi-ui/package.json | 4 ++-- ruoyi-ui/src/layout/components/Navbar.vue | 4 ++-- .../src/views/clMaterial/clMaterial/index.vue | 2 +- ruoyi-ui/src/views/factory/factory/index.vue | 19 ++++++++------- ruoyi-ui/src/views/index.vue | 4 ++-- ruoyi-ui/src/views/login.vue | 4 ++-- .../src/views/material/material/index.vue | 22 ++++++++--------- ruoyi-ui/vue.config.js | 2 +- 23 files changed, 89 insertions(+), 104 deletions(-) rename ruoyi-system/src/main/java/com/ruoyi/factory/domain/{CMaterialType.java => CMaterialTypeFactory.java} (74%) 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"> 4.0.0 - + com.ruoyi ruoyi 3.8.7 ruoyi http://www.ruoyi.vip - 若依管理系统 - + 江南业务系统 + 3.8.7 UTF-8 @@ -253,4 +253,4 @@ - \ No newline at end of file + 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 cMaterialTypeList; + private List 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 getCMaterialTypeList() + public List getCMaterialTypeList() { return cMaterialTypeList; } - public void setCMaterialTypeList(List cMaterialTypeList){this.cMaterialTypeList = cMaterialTypeList;} + public void setCMaterialTypeList(List 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 cMaterialTypeList); + public int batchCMaterialType(List cMaterialTypeList); /** @@ -83,10 +83,10 @@ public interface CFactoryMapper * @param factoryId 车间管理ID * @return 结果 */ - public int deleteCMaterialTypeByFactoryId(Long factoryId); + public int deleteCMaterialTypeByFactoryId(String factoryId); /*物料类别列表*/ - List selectCTypelist(); + List 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 selectCTypelist() { + public List 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 cMaterialTypeList = cFactory.getCMaterialTypeList(); - Long factoryId = cFactory.getFactoryId(); + List cMaterialTypeList = cFactory.getCMaterialTypeList(); + String factoryNo = cFactory.getFactoryNo(); if (StringUtils.isNotNull(cMaterialTypeList)) { - List list = new ArrayList(); - for (CMaterialType cMaterialType : cMaterialTypeList) + List list = new ArrayList(); + 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" - + @@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select type_no as typeNo,type_name as typeName from c_material_type @@ -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} @@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from c_factory where factory_id = #{factoryId} - + delete from c_factory where factory_id in #{factoryId} @@ -112,18 +112,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from c_material_type where factory_id in + delete from c_material_type_factory where factory_id in #{factoryId} - - delete from c_material_type where factory_id = #{factoryId} + + delete from c_material_type_factory where factory_id = #{factoryId} - 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 (#{item.typeNo}, #{item.typeName}, #{item.factoryId}) 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" 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 @@ -34,12 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" type_no, type_name, - factory_id, #{typeNo}, #{typeName}, - #{factoryId}, @@ -48,7 +45,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" type_no = #{typeNo}, type_name = #{typeName}, - factory_id = #{factoryId}, where type_id = #{typeId} 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 @@