From bea406051f80856d8d5f2f762711875659d1bd48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Mon, 9 Feb 2026 13:16:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E6=8C=89?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storageLocation/StorageLocationMapper.xml | 2 ++ .../StorageLocationGroupMapper.xml | 1 + .../storageSection/StorageSectionMapper.xml | 1 + .../mapper/basic/warehouse/WarehouseMapper.xml | 1 + .../MaterialBaseInfoApplicationService.java | 18 ++++++++++++++++++ .../repository/po/MaterialBaseInfoPO.java | 10 ++++++++-- 6 files changed, 31 insertions(+), 2 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml index 27f39d600..4ff52f6cc 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml @@ -184,6 +184,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + order by a.create_time desc \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageSection/StorageSectionMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageSection/StorageSectionMapper.xml index 049f456da..ada404ef2 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageSection/StorageSectionMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/storageSection/StorageSectionMapper.xml @@ -100,5 +100,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml index e60d2da3c..586d81b9d 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/warehouse/WarehouseMapper.xml @@ -139,5 +139,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java index 8341063a2..1eff5f2c4 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialBaseInfo/MaterialBaseInfoApplicationService.java @@ -22,8 +22,11 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import java.util.List; +import java.util.stream.Collectors; /** * 物料基础信息ApplicationService @@ -73,6 +76,21 @@ public class MaterialBaseInfoApplicationService { BeanUtils.copyProperties(materialGoodsRules,materialGoodsRulePO); materialBaseInfoPO.setMaterialGoodsRule(materialGoodsRulePO); } + // 将物料分类的List转换为逗号分隔的字符串，用于导出 + if (!CollectionUtils.isEmpty(materialBaseInfoPO.getMaterialClassifyCode())) { + materialBaseInfoPO.setMaterialClassifyCodeStr( + materialBaseInfoPO.getMaterialClassifyCode().stream() + .filter(code -> !StringUtils.isEmpty(code)) + .collect(Collectors.joining(",")) + ); + } + if (!CollectionUtils.isEmpty(materialBaseInfoPO.getMaterialClassifyName())) { + materialBaseInfoPO.setMaterialClassifyNameStr( + materialBaseInfoPO.getMaterialClassifyName().stream() + .filter(name -> !StringUtils.isEmpty(name)) + .collect(Collectors.joining(",")) + ); + } } return materialBaseInfoPOS; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java index 9668285d5..f92066b5a 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java @@ -70,15 +70,21 @@ public class MaterialBaseInfoPO extends BaseVOEntity { private String barCode; @ApiModelProperty("物料分类编码") - @Excel(name = "物料分类编码") @TableField(typeHandler = ListTypeHandler.class) private List materialClassifyCode; @ApiModelProperty("物料分类名称") - @Excel(name = "物料分类名称") @TableField(typeHandler = ListTypeHandler.class) private List materialClassifyName; + @ApiModelProperty("物料分类编码（导出用，逗号分隔）") + @Excel(name = "物料分类编码") + private String materialClassifyCodeStr; + + @ApiModelProperty("物料分类名称（导出用，逗号分隔）") + @Excel(name = "物料分类名称") + private String materialClassifyNameStr; + @ApiModelProperty("物料种类编码 数据字典") @Excel(name = "物料种类编码 数据字典") private String materialType;