From f77d15f4f58868dbe3ba6bde4676f65348460a4e Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Tue, 18 Nov 2025 10:53:12 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E8=B0=83?= =?UTF-8?q?=E4=BC=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/common/constant/Constants.java | 6 ++++-- sql/ry_20240629.sql | 5 ++--- .../com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java | 2 +- .../com/ruoyi/xkt/domain/StoreProductDemandTemplate.java | 2 +- .../dto/storeProductDemand/StoreProdDemandDownloadDTO.java | 6 ++---- .../xkt/service/impl/StoreProductDemandServiceImpl.java | 3 +-- .../com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java | 2 +- .../resources/mapper/StoreProductDemandDetailMapper.xml | 2 +- 8 files changed, 13 insertions(+), 15 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java index e2866aeff..a43dce491 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -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 CATE_RELATE_MAP = new ConcurrentHashMap() {{ 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); diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql index d4154f1b7..61e7945ef 100644 --- a/sql/ry_20240629.sql +++ b/sql/ry_20240629.sql @@ -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 '总数量', diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java index 3e4c1118a..893e5df31 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductCategoryAttribute.java @@ -41,7 +41,7 @@ public class StoreProductCategoryAttribute extends XktBaseEntity { */ private String shaftLiningMaterial; /** - * 鞋面材质（靴筒面材质） + * 面料材质（靴筒面材质） */ private String shaftMaterial; /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandTemplate.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandTemplate.java index 10291a24f..ca7357a54 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandTemplate.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandTemplate.java @@ -114,7 +114,7 @@ public class StoreProductDemandTemplate extends XktBaseEntity { */ private Integer selectShoeUpperLiningMaterial; /** - * 商品信息 鞋面材质 + * 商品信息 面料材质 */ private Integer selectShaftMaterial; /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java index 05d1e97f3..acf3c5efe 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDownloadDTO.java @@ -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; diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java index 17456f0d0..3d19f2850 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java @@ -417,8 +417,7 @@ public class StoreProductDemandServiceImpl implements IStoreProductDemandService Map 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; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java index f150099b4..374a8c5b6 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java @@ -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()); } diff --git a/xkt/src/main/resources/mapper/StoreProductDemandDetailMapper.xml b/xkt/src/main/resources/mapper/StoreProductDemandDetailMapper.xml index e6491ae18..a92d47265 100644 --- a/xkt/src/main/resources/mapper/StoreProductDemandDetailMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductDemandDetailMapper.xml @@ -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,