From 53c49aaa32a2ec30715a1aa81f30eb40c8cf6eda Mon Sep 17 00:00:00 2001 From: wujianwei <wjw@11.com> Date: 星期二, 29 七月 2025 15:59:38 +0800 Subject: [PATCH] 新增查看附件 --- service/src/main/java/com/ruoyi/cwgl/service/IDispatchOrderService.java | 8 ++++ service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java | 7 +++ service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml | 29 ++++++++++++++ service/src/main/java/com/ruoyi/cwgl/mapper/DispatchOrderMapper.java | 3 + service/src/main/java/com/ruoyi/cwgl/controller/DispatchOrderController.java | 14 +++++++ service/src/main/java/com/ruoyi/cwgl/domain/vo/DispatchOrderAttachmentVo.java | 38 +++++++++++++++++++ 6 files changed, 99 insertions(+), 0 deletions(-) diff --git a/service/src/main/java/com/ruoyi/cwgl/controller/DispatchOrderController.java b/service/src/main/java/com/ruoyi/cwgl/controller/DispatchOrderController.java index 87fdbcc..f3c8f07 100644 --- a/service/src/main/java/com/ruoyi/cwgl/controller/DispatchOrderController.java +++ b/service/src/main/java/com/ruoyi/cwgl/controller/DispatchOrderController.java @@ -2,6 +2,7 @@ import java.util.List; +import com.ruoyi.cwgl.domain.vo.DispatchOrderAttachmentVo; import com.ruoyi.cwgl.domain.vo.DispatchOrderItemVo; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -60,6 +61,19 @@ } /** + * 鏌ヨ璋冨害鍗曞垪琛� + */ + @PreAuthorize("@ss.hasPermi('cwgl:dispatchOrder:item')") + @GetMapping("/attachment") + public TableDataInfo attachment(String no) + { + startPage(); + + List<DispatchOrderAttachmentVo> list = dispatchOrderService.selectDispatchOrderAttachment(no); + return getDataTable(list); + } + + /** * 瀵煎嚭璋冨害鍗曞垪琛� * @param dispatchOrder 鏌ヨ鏉′欢瀵硅薄 */ diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/vo/DispatchOrderAttachmentVo.java b/service/src/main/java/com/ruoyi/cwgl/domain/vo/DispatchOrderAttachmentVo.java new file mode 100644 index 0000000..777b986 --- /dev/null +++ b/service/src/main/java/com/ruoyi/cwgl/domain/vo/DispatchOrderAttachmentVo.java @@ -0,0 +1,38 @@ +package com.ruoyi.cwgl.domain.vo; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 闄勪欢vo + * + * @author ruoyi + * @date 2025-07-29 + */ +@Data +public class DispatchOrderAttachmentVo { + + + + /** 璐圭敤绫诲瀷 */ + private String feeItem; + + + + /** + * 閲戦 + */ + private BigDecimal account; + + + /** + * 甯佸埗 + */ + private String currency; + + /** + * 鍥剧墖璺緞 + */ + private String imageUrl; +} diff --git a/service/src/main/java/com/ruoyi/cwgl/mapper/DispatchOrderMapper.java b/service/src/main/java/com/ruoyi/cwgl/mapper/DispatchOrderMapper.java index 99d13c2..da39bdc 100644 --- a/service/src/main/java/com/ruoyi/cwgl/mapper/DispatchOrderMapper.java +++ b/service/src/main/java/com/ruoyi/cwgl/mapper/DispatchOrderMapper.java @@ -4,6 +4,7 @@ import com.ruoyi.cwgl.domain.DispatchOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.cwgl.domain.DispatchOrderItem; +import com.ruoyi.cwgl.domain.vo.DispatchOrderAttachmentVo; /** @@ -88,4 +89,6 @@ public int deleteDispatchOrderByIds(Integer[] ids); List<DispatchOrderItem> selectDispatchOrderItemByNo(String no); + + List<DispatchOrderAttachmentVo> selectDispatchOrderAttachment(String no); } diff --git a/service/src/main/java/com/ruoyi/cwgl/service/IDispatchOrderService.java b/service/src/main/java/com/ruoyi/cwgl/service/IDispatchOrderService.java index 96829a1..374c52c 100644 --- a/service/src/main/java/com/ruoyi/cwgl/service/IDispatchOrderService.java +++ b/service/src/main/java/com/ruoyi/cwgl/service/IDispatchOrderService.java @@ -3,6 +3,7 @@ import java.util.List; import com.ruoyi.cwgl.domain.DispatchOrder; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.cwgl.domain.vo.DispatchOrderAttachmentVo; import com.ruoyi.cwgl.domain.vo.DispatchOrderItemVo; /** @@ -109,4 +110,11 @@ * @return */ List<DispatchOrderItemVo> selectDispatchOrderItem(String no); + + /** + * 鏌ヨ闄勪欢 + * @param no + * @return + */ + List<DispatchOrderAttachmentVo> selectDispatchOrderAttachment(String no); } diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java index 405ba48..210d0af 100644 --- a/service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java +++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java @@ -8,6 +8,7 @@ import javax.annotation.Resource; import com.ruoyi.cwgl.domain.DispatchOrderItem; +import com.ruoyi.cwgl.domain.vo.DispatchOrderAttachmentVo; import com.ruoyi.cwgl.domain.vo.DispatchOrderItemVo; import org.springframework.transaction.annotation.Transactional; import org.springframework.stereotype.Service; @@ -263,4 +264,10 @@ return 0; } + + @DataSource(DataSourceType.CWSJ) + @Override + public List<DispatchOrderAttachmentVo> selectDispatchOrderAttachment(String no) { + return dispatchOrderMapper.selectDispatchOrderAttachment(no); + } } diff --git a/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml b/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml index 6884b7c..0569543 100644 --- a/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml +++ b/service/src/main/resources/mapper/cwgl/DispatchOrderMapper.xml @@ -256,6 +256,35 @@ bfd.ENTITY_ID = #{no} </select> + <select id="selectDispatchOrderAttachment" resultType="com.ruoyi.cwgl.domain.vo.DispatchOrderAttachmentVo"> + -- 鏌ヨ璋冨害鍗曞彿鎴栬�呰皟搴﹀崟ID鏌ラ檮浠� +SELECT +-- image.PATH, + CONCAT('https://tms.ygalogisticspark.com/ImageViewServlet?id=',image.id) as imageUrl, + -- tof.FEE_TYPE_ID '璐圭敤绫诲瀷ID', + bfi.FEE_TYPE as feeItem, + tof.account as account, + case tof.CURRENCY_ID + when 1 then '娓竵' + when 2 then '浜烘皯甯�' + else '鏈煡' + end as currency + +FROM +-- 鍏朵粬璐圭敤琛� + Tms_Other_Fee tof +-- 璋冨害鍗曡〃 + LEFT JOIN tms_shipment ts ON tof.dispatch_Order_Id = ts.id +-- 闄勪欢琛� + LEFT JOIN Thorn_Attachment image ON image.OBJ_ID = tof.id +-- 璐圭敤绫诲瀷琛� + left join base_fee_item bfi on bfi.id=tof.FEE_TYPE_ID +WHERE + ts.DISPATCH_NO = #{no} + AND image.biz_Type = 'com.vtradex.tms.core.model.entity.fee.TmsOtherFee'; + + + </select> <!-- 鏂板 --> <insert id="insertDispatchOrder" parameterType="com.ruoyi.cwgl.domain.DispatchOrder" useGeneratedKeys="true" keyProperty="id"> -- Gitblit v1.8.0