BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：系统调优；

pull/1121/head
liujiang 2025-11-18 10:53:12 +08:00
parent fdc81c8ff3
commit f77d15f4f5
8 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
View File

@ -337,8 +337,10 @@ public class Constants {
public static final String SHAFT_LINING_MATERIAL = "shaftLiningMaterial";
public static final String SHAFT_LINING_MATERIAL_NAME = "靴筒内里材质";
public static final String SHAFT_MATERIAL = "shaftMaterial";
public static final String SHAFT_MATERIAL_BUJU_NAME = "面料材质";
public static final String SHAFT_MATERIAL_NAME = "靴筒面材质";
public static final String SHOE_UPPER_LINING_MATERIAL = "shoeUpperLiningMaterial";
public static final String SHOE_UPPER_LINING_MATERIAL_BUJU_NAME = "内里材质";
public static final String SHOE_UPPER_LINING_MATERIAL_NAME = "鞋面内里材质";
public static final String SHOE_STYLE_NAME = "shoeStyleName";
public static final String SHOE_STYLE_NAME_NAME = "靴款品名";
@ -387,8 +389,8 @@ public class Constants {
public static final Map<String, String> CATE_RELATE_MAP = new ConcurrentHashMap<String, String>() {{
put(UPPER_MATERIAL, UPPER_MATERIAL_NAME);
put(SHAFT_LINING_MATERIAL, SHAFT_LINING_MATERIAL_NAME);
put(SHAFT_MATERIAL, SHAFT_MATERIAL_NAME);
put(SHOE_UPPER_LINING_MATERIAL, SHOE_UPPER_LINING_MATERIAL_NAME);
put(SHAFT_MATERIAL, SHAFT_MATERIAL_BUJU_NAME);
put(SHOE_UPPER_LINING_MATERIAL, SHOE_UPPER_LINING_MATERIAL_BUJU_NAME);
put(SHOE_STYLE_NAME, SHOE_STYLE_NAME_NAME);
put(SHAFT_HEIGHT, SHAFT_HEIGHT_NAME);
put(INSOLE_MATERIAL, INSOLE_MATERIAL_NAME);

5
sql/ry_20240629.sql
View File

@ -3500,8 +3500,7 @@ CREATE TABLE `store_product_category_attribute`
`store_prod_id` bigint UNSIGNED NOT NULL COMMENT '档口商品ID',
`upper_material` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '帮面材质',
`shaft_lining_material` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '靴筒内里材质',
`shaft_material` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '靴筒面材质',
`shoe_upper_lining_material` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '鞋面内里材质',
`shaft_material` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '面料材质',
`shoe_style_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '靴款品名',
`shaft_height` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '筒高',
`insole_material` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '鞋垫材质',
@ -4386,7 +4385,7 @@ CREATE TABLE `store_product_demand_template`
`select_prod_art_num` tinyint(3) UNSIGNED NULL DEFAULT NULL COMMENT '商品货号',
`select_color_name` tinyint(3) UNSIGNED NULL DEFAULT NULL COMMENT '颜色',
`select_shoe_upper_lining_material` tinyint(3) UNSIGNED NULL DEFAULT NULL COMMENT '内里材质',
`select_shaft_material` tinyint(3) UNSIGNED NULL DEFAULT NULL COMMENT '鞋面材质',
`select_shaft_material` tinyint(3) UNSIGNED NULL DEFAULT NULL COMMENT '面料材质',
`select_demand_status` tinyint(3) UNSIGNED NULL DEFAULT NULL COMMENT '生产状态',
`select_emergency` tinyint(3) UNSIGNED NULL DEFAULT NULL COMMENT '紧急程度',
`select_quantity` tinyint(3) UNSIGNED NULL DEFAULT NULL COMMENT '总数量',

2
xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java
View File

@ -41,7 +41,7 @@ public class StoreProductCategoryAttribute extends XktBaseEntity {
*/
private String shaftLiningMaterial;
/**
* 鞋面材质（靴筒面材质）
* 面料材质（靴筒面材质）
*/
private String shaftMaterial;
/**

2
xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandTemplate.java
View File

@ -114,7 +114,7 @@ public class StoreProductDemandTemplate extends XktBaseEntity {
*/
private Integer selectShoeUpperLiningMaterial;
/**
* 商品信息 鞋面材质
* 商品信息 面料材质
*/
private Integer selectShaftMaterial;
/**

6
xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java
View File

@ -14,8 +14,6 @@ import org.apache.poi.ss.usermodel.IndexedColors;
@Accessors(chain = true)
public class StoreProdDemandDownloadDTO {
@Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC, width = 3, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
private Integer orderNum;
@Excel(name = "客户", width = 10, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
private String partnerName;
@Excel(name = "商标", width = 10, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
@ -24,7 +22,7 @@ public class StoreProdDemandDownloadDTO {
private String facName;
@Excel(name = "需求单号", needMerge = true, width = 18, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
private String code;
@Excel(name = "创建日期", width = 10, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
@Excel(name = "日期", width = 4, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
private String createTime;
@Excel(name = "工厂货号", width = 10, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
private String factoryArtNum;
@ -36,7 +34,7 @@ public class StoreProdDemandDownloadDTO {
private String shoeUpperLiningMaterial;
@Excel(name = "面料", width = 10, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
private String shaftMaterial;
@Excel(name = "生产状态", readConverterExp = "1=待生产,2=生产中,3=生产完成", width = 10, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
@Excel(name = "状态", readConverterExp = "1=待生产,2=生产中,3=生产完成", width = 6, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
private Integer demandStatus;
@Excel(name = "紧急度", readConverterExp = "0=正常,1=紧急", width = 5, height = 24, headerBackgroundColor = IndexedColors.SKY_BLUE)
private Integer emergency;

3
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java
View File

@ -417,8 +417,7 @@ public class StoreProductDemandServiceImpl implements IStoreProductDemandService
Map<String, String> prodColorLiningMaterialMap = liningMaterialList.stream().collect(Collectors
.toMap(x -> x.getProdArtNum() + x.getColorName(), StoreProdDemandDownloadDTO::getShoeUpperLiningMaterial));
for (int i = 0; i < downloadList.size(); i++) {
downloadList.get(i).setOrderNum(i + 1)
.setShoeUpperLiningMaterial(prodColorLiningMaterialMap.get(downloadList.get(i).getProdArtNum() + downloadList.get(i).getColorName()));
downloadList.get(i).setShoeUpperLiningMaterial(prodColorLiningMaterialMap.get(downloadList.get(i).getProdArtNum() + downloadList.get(i).getColorName()));
}
return downloadList;
}

2
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
View File

@ -1458,7 +1458,7 @@ public class StoreProductServiceImpl implements IStoreProductService {
if (ObjectUtils.isNotEmpty(cateAttr.getShaftLiningMaterial())) {
cateAttrMap.put(Constants.CATE_RELATE_MAP.get(SHAFT_LINING_MATERIAL), cateAttr.getShaftLiningMaterial());
}
// 鞋面材质
// 面料材质
if (ObjectUtils.isNotEmpty(cateAttr.getShaftMaterial())) {
cateAttrMap.put(Constants.CATE_RELATE_MAP.get(SHAFT_MATERIAL), cateAttr.getShaftMaterial());
}

2
xkt/src/main/resources/mapper/StoreProductDemandDetailMapper.xml
View File

@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
spp.trademark,
sf.fac_name,
spd.`code`,
DATE_FORMAT( spd.create_time, '%Y-%m-%d' ) AS createTime,
DATE_FORMAT(spd.create_time, '%m.%d') AS createTime,
sp.factory_art_num,
sp.prod_art_num,
spdd.color_name,