From 5269c06d291f9f18d082983f63c4afb193a6bd80 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 29 七月 2025 17:29:56 +0800
Subject: [PATCH] 新增时间查询状态
---
service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
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 7ae20a3..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;
@@ -227,8 +228,11 @@
DispatchOrderItemVo summary = summaryMap.get(feeItem);
if ("R".equals(dispatchOrderItem.getBillType())) { // 搴旀敹
summary.setReceivableFee(summary.getReceivableFee().add(dispatchOrderItem.getSettleFee()));
+ summary.setReceivableFeeCurrency(dispatchOrderItem.getCurrencyType());
} else if ("P".equals(dispatchOrderItem.getBillType())) { // 搴斾粯
summary.setActualFee(summary.getActualFee().add(dispatchOrderItem.getSettleFee()));
+ summary.setActualFeeCurrency(dispatchOrderItem.getCurrencyType());
+
}
}
// 杞崲涓篖ist骞惰繃婊ゃ�佹帓搴�
@@ -260,4 +264,10 @@
return 0;
}
+
+ @DataSource(DataSourceType.CWSJ)
+ @Override
+ public List<DispatchOrderAttachmentVo> selectDispatchOrderAttachment(String no) {
+ return dispatchOrderMapper.selectDispatchOrderAttachment(no);
+ }
}
--
Gitblit v1.8.0