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 1/3] '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"
-
@@ -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
@@ -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 @@
-
+
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 @@
-
+
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 @@
删除
-
+
@@ -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 @@
-
+
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 @@
- 若依后台管理系统
+ 江南业务管理系统
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"
/>
@@ -167,7 +167,7 @@
删除
-
+
@@ -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 // 端口
From e83c618251f656bda8149e6194256014c107217f Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Mon, 4 Mar 2024 15:51:13 +0800
Subject: [PATCH 2/3] '11'
---
.../java/com/ruoyi/web/Utils/batchInsert.java | 3 +-
.../controller/system/SysUserController.java | 54 +++-
.../com/ruoyi/system/domain/material.java | 9 +
.../java/com/ruoyi/system/domain/temp.java | 94 ++++++
.../resources/mapper/system/TestMapper.xml | 288 +++++++++---------
.../src/views/material/material/index.vue | 4 +-
6 files changed, 294 insertions(+), 158 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/Utils/batchInsert.java b/ruoyi-admin/src/main/java/com/ruoyi/web/Utils/batchInsert.java
index 8b2a162..fc4fddc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/Utils/batchInsert.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/Utils/batchInsert.java
@@ -26,7 +26,7 @@ public class batchInsert extends JFrame {
/*stmt = conn.prepareStatement(
"insert into [dbo].[sapcontract_test](uid,bh,type,custom,salesman,project,htje,startdate,enddate,remark,htzt) values (?,?,?,?,?,?,?,?,?,?,?)");*/
stmt = conn.prepareStatement(
- "insert into c_material(material_id, material_xingh, material_guig, material_diany, material_dw) values (?,?,?,?,?)");
+ "insert into c_material(material_id, material_xingh, material_guig, material_diany, material_dw,material_type_id) values (?,?,?,?,?,?)");
int count = 0;
System.err.println("Start");
for (material pay : list) {
@@ -36,6 +36,7 @@ public class batchInsert extends JFrame {
stmt.setString(3, pay.getMaterial_guig());
stmt.setString(4, pay.getMaterial_diany());
stmt.setString(5, pay.getMaterial_dw());
+ stmt.setString(6, pay.getMaterial_type_id());
stmt.addBatch();
if (count % 5000 == 0) {// 当增加了500个批处理的时候再提交
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index e230008..4f5af34 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -86,7 +86,7 @@ public class SysUserController extends BaseController
return getDataTable(list);
}
- @Log(title = "用户管理", businessType = BusinessType.EXPORT)
+ /* @Log(title = "用户管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:user:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, SysUser user)
@@ -94,7 +94,7 @@ public class SysUserController extends BaseController
List list = userService.selectUserList(user);
ExcelUtil util = new ExcelUtil(SysUser.class);
util.exportExcel(response, list, "用户数据");
- }
+ }*/
@Log(title = "用户管理", businessType = BusinessType.IMPORT)
@PreAuthorize("@ss.hasPermi('system:user:import')")
@@ -313,7 +313,7 @@ public class SysUserController extends BaseController
}
/*===============================================测试====================================================*/
- /*@DataSource(DataSourceType.QUOT)
+ @DataSource(DataSourceType.QUOT)
@Log(title = "用户管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:user:export')")
@PostMapping("/export")
@@ -328,8 +328,6 @@ public class SysUserController extends BaseController
List> averageAssign = ListUtils.partition(templist, 5000);
- *//*List list = averageAssign.get(0);*//*
-
int num = 1;
int num2 = 1;
for(List list:averageAssign){
@@ -340,13 +338,10 @@ public class SysUserController extends BaseController
m.setMaterial_guig(t.getSpec_1());
m.setMaterial_diany(t.getVoltage_1());
m.setMaterial_dw(t.getUnit_0());
+ m.setMaterial_type_id(t.getType_no());
materials.add(m);
num++;
-*//*
- for(int i=1;i<63;i++){
-*//*
-
if("M001".equals(t.getM_id_M001())){
c = new cost();
c.setCost_id(num2);
@@ -386,6 +381,7 @@ public class SysUserController extends BaseController
c.setCost_material_id(m.getMaterial_id());
c.setCost_cl_id(t.getM_id_M005());
c.setCost_cl_qty(t.getName_qty_M005());
+ c.setCost_cl_qty_2(t.getName_qty_M005_1());
costs.add(c);num2++;
}
if("M006".equals(t.getM_id_M006())){
@@ -848,22 +844,48 @@ public class SysUserController extends BaseController
c.setCost_cl_qty(t.getName_qty_M064());
costs.add(c);num2++;
}
-
- *//* }*//*
-
+ if("M065".equals(t.getM_id_M065())){
+ c = new cost();
+ c.setCost_id(num2);
+ c.setCost_material_id(m.getMaterial_id());
+ c.setCost_cl_id(t.getM_id_M065());
+ c.setCost_cl_qty(t.getName_qty_M065());
+ costs.add(c);num2++;
+ }
+ if("M066".equals(t.getM_id_M066())){
+ c = new cost();
+ c.setCost_id(num2);
+ c.setCost_material_id(m.getMaterial_id());
+ c.setCost_cl_id(t.getM_id_M066());
+ c.setCost_cl_qty(t.getName_qty_M066());
+ costs.add(c);num2++;
+ }
+ if("M067".equals(t.getM_id_M067())){
+ c = new cost();
+ c.setCost_id(num2);
+ c.setCost_material_id(m.getMaterial_id());
+ c.setCost_cl_id(t.getM_id_M067());
+ c.setCost_cl_qty(t.getName_qty_M067());
+ costs.add(c);num2++;
+ }
+ if("M068".equals(t.getM_id_M068())){
+ c = new cost();
+ c.setCost_id(num2);
+ c.setCost_material_id(m.getMaterial_id());
+ c.setCost_cl_id(t.getM_id_M068());
+ c.setCost_cl_qty(t.getName_qty_M068());
+ costs.add(c);num2++;
+ }
}
}
-
System.out.println("materials===================="+materials.size());
System.out.println("costs======================="+costs.size());
- *//*insertMaterialBatch(materials);
- insertCostBatch(costs);*//*
batchInsert.insertMaterialBatch(materials);
batchInsert.insertCostBatch(costs);
- }*/
+ }
@DataSource(DataSourceType.QUOT)
public void insertMaterialBatch(List temp) {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/material.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/material.java
index 2228af2..e4c8044 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/material.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/material.java
@@ -6,6 +6,7 @@ public class material {
private String material_guig;
private String material_diany;
private String material_dw;
+ private String material_type_id;
public String getMaterial_xingh() {
return material_xingh;
@@ -46,4 +47,12 @@ public class material {
public void setMaterial_id(Integer material_id) {
this.material_id = material_id;
}
+
+ public String getMaterial_type_id() {
+ return material_type_id;
+ }
+
+ public void setMaterial_type_id(String material_type_id) {
+ this.material_type_id = material_type_id;
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/temp.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/temp.java
index cc0cf30..4a3d67c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/temp.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/temp.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.domain;
public class temp {
+ private String type_no;
private String model_0;
private String model_1;
private String spec_0;
@@ -20,6 +21,7 @@ public class temp {
private String name_qty_M004_1;
private String m_id_M005;
private String name_qty_M005;
+ private String name_qty_M005_1;
private String m_id_M006;
private String name_qty_M006;
private String m_id_M007;
@@ -148,6 +150,26 @@ public class temp {
private String m_id_M064;
private String name_qty_M064;
+ private String m_id_M065;
+ private String name_qty_M065;
+
+ private String m_id_M066;
+ private String name_qty_M066;
+
+ private String m_id_M067;
+ private String name_qty_M067;
+
+ private String m_id_M068;
+ private String name_qty_M068;
+
+ public String getType_no() {
+ return type_no;
+ }
+
+ public void setType_no(String type_no) {
+ this.type_no = type_no;
+ }
+
public String getModel_0() {
return model_0;
}
@@ -292,6 +314,14 @@ public class temp {
this.name_qty_M005 = name_qty_M005;
}
+ public String getName_qty_M005_1() {
+ return name_qty_M005_1;
+ }
+
+ public void setName_qty_M005_1(String name_qty_M005_1) {
+ this.name_qty_M005_1 = name_qty_M005_1;
+ }
+
public String getM_id_M006() {
return m_id_M006;
}
@@ -1299,4 +1329,68 @@ public class temp {
public void setName_qty_M048_1(String name_qty_M048_1) {
this.name_qty_M048_1 = name_qty_M048_1;
}
+
+ public String getM_id_M065() {
+ return m_id_M065;
+ }
+
+ public void setM_id_M065(String m_id_M065) {
+ this.m_id_M065 = m_id_M065;
+ }
+
+ public String getName_qty_M065() {
+ return name_qty_M065;
+ }
+
+ public void setName_qty_M065(String name_qty_M065) {
+ this.name_qty_M065 = name_qty_M065;
+ }
+
+ public String getM_id_M066() {
+ return m_id_M066;
+ }
+
+ public void setM_id_M066(String m_id_M066) {
+ this.m_id_M066 = m_id_M066;
+ }
+
+ public String getName_qty_M066() {
+ return name_qty_M066;
+ }
+
+ public void setName_qty_M066(String name_qty_M066) {
+ this.name_qty_M066 = name_qty_M066;
+ }
+
+ public String getM_id_M067() {
+ return m_id_M067;
+ }
+
+ public void setM_id_M067(String m_id_M067) {
+ this.m_id_M067 = m_id_M067;
+ }
+
+ public String getName_qty_M067() {
+ return name_qty_M067;
+ }
+
+ public void setName_qty_M067(String name_qty_M067) {
+ this.name_qty_M067 = name_qty_M067;
+ }
+
+ public String getM_id_M068() {
+ return m_id_M068;
+ }
+
+ public void setM_id_M068(String m_id_M068) {
+ this.m_id_M068 = m_id_M068;
+ }
+
+ public String getName_qty_M068() {
+ return name_qty_M068;
+ }
+
+ public void setName_qty_M068(String name_qty_M068) {
+ this.name_qty_M068 = name_qty_M068;
+ }
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TestMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TestMapper.xml
index 611bf46..102abbb 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TestMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TestMapper.xml
@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
diff --git a/ruoyi-ui/src/views/material/material/index.vue b/ruoyi-ui/src/views/material/material/index.vue
index 2e973b2..6af022b 100644
--- a/ruoyi-ui/src/views/material/material/index.vue
+++ b/ruoyi-ui/src/views/material/material/index.vue
@@ -280,10 +280,10 @@ export default {
{ required: true, message: "类别不能为空", trigger: "blur" }
],
costClQty: [
- { pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,3})?$/, message: '格式有误',trigger: "blur"}
+ { pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,5})?$/, message: '格式有误',trigger: "blur"}
],
costClQty2: [
- { pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,3})?$/, message: '格式有误',trigger: "blur"}
+ { pattern: /^(([1-9]{1}\d{0,9})|(0{1}))(\.\d{1,5})?$/, message: '格式有误',trigger: "blur"}
],
}
};
From abb83cdf7e543cb3cfe9023c4226481f3389c25b Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Mon, 4 Mar 2024 15:53:28 +0800
Subject: [PATCH 3/3] '2024-03-04-15:53'
---
.../ruoyi/web/controller/system/SysUserController.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 4f5af34..89990ec 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -86,7 +86,7 @@ public class SysUserController extends BaseController
return getDataTable(list);
}
- /* @Log(title = "用户管理", businessType = BusinessType.EXPORT)
+ @Log(title = "用户管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:user:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, SysUser user)
@@ -94,7 +94,7 @@ public class SysUserController extends BaseController
List list = userService.selectUserList(user);
ExcelUtil util = new ExcelUtil(SysUser.class);
util.exportExcel(response, list, "用户数据");
- }*/
+ }
@Log(title = "用户管理", businessType = BusinessType.IMPORT)
@PreAuthorize("@ss.hasPermi('system:user:import')")
@@ -313,7 +313,7 @@ public class SysUserController extends BaseController
}
/*===============================================测试====================================================*/
- @DataSource(DataSourceType.QUOT)
+ /*@DataSource(DataSourceType.QUOT)
@Log(title = "用户管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:user:export')")
@PostMapping("/export")
@@ -885,7 +885,7 @@ public class SysUserController extends BaseController
batchInsert.insertMaterialBatch(materials);
batchInsert.insertCostBatch(costs);
- }
+ }*/
@DataSource(DataSourceType.QUOT)
public void insertMaterialBatch(List temp) {