From e2b02a2ccd03c42923fed7e114a8e7882bd8f356 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Fri, 18 Jul 2025 15:00:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/core/ims/domain/InspectGoods.java | 4 +++ .../ims/domain/param/InspectGoodsAdd.java | 4 +++ .../ims/domain/param/InspectGoodsUpdate.java | 4 +++ .../core/ims/domain/vo/InspectGoodsVO.java | 7 ++++ .../service/impl/InspectGoodsServiceImpl.java | 32 ++++++++++++++++++- .../mapper/ims/InspectGoodsMapper.xml | 6 +++- .../mapper/ims/OrderGoodsDetailMapper.xml | 1 + 7 files changed, 56 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InspectGoods.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InspectGoods.java index 47201fb..940e95e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InspectGoods.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InspectGoods.java @@ -124,6 +124,10 @@ public class InspectGoods extends BaseEntity { @ApiModelProperty(value = "备注") private String remark; + @Excel(name = "附件，多个则逗号分隔") + @ApiModelProperty(value = "附件，多个则逗号分隔") + private String inspectAttachment; + private List inspectGoodsDetails; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsAdd.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsAdd.java index e1f3909..431d905 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsAdd.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsAdd.java @@ -115,6 +115,10 @@ public class InspectGoodsAdd implements Serializable { @ApiModelProperty(value = "备注") private String remark; + @Excel(name = "附件，多个则逗号分隔") + @ApiModelProperty(value = "附件，多个则逗号分隔") + private String inspectAttachment; + private List inspectGoodsDetails; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsUpdate.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsUpdate.java index ed2f41f..b865ea1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsUpdate.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsUpdate.java @@ -110,6 +110,10 @@ public class InspectGoodsUpdate implements Serializable { @ApiModelProperty(value = "备注") private String remark; + @Excel(name = "附件，多个则逗号分隔") + @ApiModelProperty(value = "附件，多个则逗号分隔") + private String inspectAttachment; + private List inspectGoodsDetails; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/InspectGoodsVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/InspectGoodsVO.java index 01ef4cd..0a62846 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/InspectGoodsVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/InspectGoodsVO.java @@ -126,6 +126,13 @@ public class InspectGoodsVO extends BaseEntity { @ApiModelProperty(value = "区域名称") private String areaName; + @Excel(name = "附件，多个则逗号分隔") + @ApiModelProperty(value = "附件，多个则逗号分隔") + private String inspectAttachment; + + @ApiModelProperty(value = "附件") + private List inspectAttachmentList; + private List inspectGoodsDetails; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsServiceImpl.java index ba1b710..2408b39 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsServiceImpl.java @@ -8,6 +8,7 @@ import java.util.Objects; import java.util.stream.Collectors; import cn.hutool.core.collection.CollUtil; +import com.bonus.canteen.core.common.utils.FileUrlUtil; import com.bonus.canteen.core.ims.domain.InspectGoodsDetail; import com.bonus.canteen.core.ims.domain.OrderGoods; import com.bonus.canteen.core.ims.domain.ProductionPurchaseOrder; @@ -65,6 +66,18 @@ public class InspectGoodsServiceImpl implements IInspectGoodsService { inspectGoodsDetail.setInspectGoodsId(inspectGoodsId); List inspectGoodsDetails = inspectGoodsDetailService.selectInspectGoodsDetailList(inspectGoodsDetail); inspectGoodsVO.setInspectGoodsDetails(inspectGoodsDetails); + String inspectAttachments = inspectGoodsVO.getInspectAttachment(); + List finalAttachmentList = new ArrayList<>(); + if(StringUtils.isNotBlank(inspectAttachments)) { + String[] inspectAttachmentList = StringUtils.split(inspectAttachments, ","); + if(Objects.nonNull(inspectAttachmentList)) { + for(String inspectAttachment : inspectAttachmentList) { + String finalAttachment = FileUrlUtil.getFileUrl(inspectAttachment); + finalAttachmentList.add(finalAttachment); + } + } + } + inspectGoodsVO.setInspectAttachmentList(finalAttachmentList); } return inspectGoodsVO; } @@ -77,7 +90,24 @@ public class InspectGoodsServiceImpl implements IInspectGoodsService { */ @Override public List selectInspectGoodsList(InspectGoods inspectGoods) { - return inspectGoodsMapper.selectInspectGoodsList(inspectGoods); + List inspectGoodsVOList = inspectGoodsMapper.selectInspectGoodsList(inspectGoods); + if(CollUtil.isNotEmpty(inspectGoodsVOList)) { + inspectGoodsVOList.forEach(inspectGoodsVO -> { + String inspectAttachments = inspectGoodsVO.getInspectAttachment(); + List finalAttachmentList = new ArrayList<>(); + if(StringUtils.isNotBlank(inspectAttachments)) { + String[] inspectAttachmentList = StringUtils.split(inspectAttachments, ","); + if(Objects.nonNull(inspectAttachmentList)) { + for(String inspectAttachment : inspectAttachmentList) { + String finalAttachment = FileUrlUtil.getFileUrl(inspectAttachment); + finalAttachmentList.add(finalAttachment); + } + } + } + inspectGoodsVO.setInspectAttachmentList(finalAttachmentList); + }); + } + return inspectGoodsVOList; } /** diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsMapper.xml index 3343f0e..e4d89e9 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsMapper.xml @@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" total_qualified_num, relate_order_goods_id, if_into, signature_pic_url, iig.create_by, iig.create_time, iig.update_by, iig.update_time, iwi.area_id, isr.supplier_name as delivery_supplier_name, iig.remark, iwi.warehouse_name, - ba.area_name + ba.area_name, iig.inspect_attachment from ims_inspect_goods iig left join ims_supplier isr on isr.supplier_id = iig.delivery_supplier_id left join ims_warehouse_info iwi on iwi.warehouse_id = iig.delivery_warehouse_id @@ -101,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" relate_order_goods_id, if_into, signature_pic_url, + inspect_attachment, remark, create_by, create_time, @@ -124,6 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{relateOrderGoodsId}, #{ifInto}, #{signaturePicUrl}, + #{inspectAttachment}, #{remark}, #{createBy}, #{createTime}, @@ -151,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" relate_order_goods_id = #{relateOrderGoodsId}, if_into = #{ifInto}, signature_pic_url = #{signaturePicUrl}, + inspect_attachment = #{inspectAttachment}, remark = #{remark}, diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsDetailMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsDetailMapper.xml index 5b698ee..9238981 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsDetailMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsDetailMapper.xml @@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" iogd.del_flag = '0' + and iogd.order_goods_code = #{orderGoodsCode} and iogd.order_goods_id = #{orderGoodsId} and iogd.material_id = #{materialId} and iogd.unit_id = #{unitId}