From c337a7ed49fb7d0157e1fa63d47a3ad3122032ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Sat, 10 Jan 2026 20:39:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E6=96=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E7=BB=93=E7=AE=97=E5=B8=81?= =?UTF-8?q?=E7=A7=8D;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interfaces/vo/QueryAllShipperInfoVo.java | 4 +++- .../src/main/resources/mapper/UserMapper.xml | 5 +++-- .../ReconciliationApplicationService.java | 11 +++------- .../domain/tmsReceipt/entity/TmsReceipt.java | 21 ++++++++++--------- .../inBoundOrder/InboundOrderService.java | 19 ++++++----------- 5 files changed, 26 insertions(+), 34 deletions(-) diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/vo/QueryAllShipperInfoVo.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/vo/QueryAllShipperInfoVo.java index ff04245f6..c8fd037d3 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/vo/QueryAllShipperInfoVo.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/vo/QueryAllShipperInfoVo.java @@ -70,4 +70,6 @@ public class QueryAllShipperInfoVo { @ApiModelProperty(name = "一级组织ID") private Long topOrganizationId; -} + @ApiModelProperty("结算币种") + private String settlementCurrency; +} \ No newline at end of file diff --git a/mhd-user-center/src/main/resources/mapper/UserMapper.xml b/mhd-user-center/src/main/resources/mapper/UserMapper.xml index 83e4066e9..29083a291 100644 --- a/mhd-user-center/src/main/resources/mapper/UserMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserMapper.xml @@ -716,7 +716,8 @@ - + \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java b/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java index bb23cf74e..53f508732 100644 --- a/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java +++ b/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java @@ -1,12 +1,10 @@ package com.linke.finance.application.server.reconciliation; -import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.aliyun.dingtalkworkflow_1_0.models.StartProcessInstanceResponse; import com.linke.finance.domain.businessDocument.entity.BusinessDocument; import com.linke.finance.domain.businessDocument.service.BusinessDocumentDomainService; import com.linke.finance.domain.reconciliation.entity.Reconciliation; -import com.linke.finance.domain.reconciliation.entity.ReconciliationBusinessDocument; import com.linke.finance.domain.reconciliation.entity.ReconciliationOrderDetail; import com.linke.finance.domain.reconciliation.repository.po.FinacialReconciliationListVO; import com.linke.finance.domain.reconciliation.repository.po.ReconciliationOrderDetailPO; @@ -15,7 +13,6 @@ import com.linke.finance.domain.reconciliation.repository.todo.ReconciliationDO; import com.linke.finance.domain.reconciliation.service.ReconciliationDomainService; import com.linke.finance.domain.revenueExpensesRecord.entity.RevenueExpensesRecord; import com.linke.finance.domain.revenueExpensesRecord.service.RevenueExpensesRecordDomainService; -import com.linke.finance.domain.tmsReceipt.entity.TmsReceipt; import com.linke.finance.domain.tmsReceipt.repository.mapper.TmsReceiptMapper; import com.linke.finance.domain.tmsReceipt.repository.po.TmsReceiptPO; import com.linke.finance.domain.tmsReceipt.service.TmsReceiptDomainService; @@ -39,7 +36,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; import java.math.BigDecimal; @@ -47,7 +43,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; /** @@ -146,7 +141,7 @@ public class ReconciliationApplicationService { } } } - List reconciliationPOS = reconciliationDomainService.queryList(reconciliationDO); + /* List reconciliationPOS = reconciliationDomainService.queryList(reconciliationDO); for (ReconciliationPO reconciliationPO : reconciliationPOS) { Long reconciliationId = reconciliationPO.getReconciliationId(); AjaxResult tmsOrderSettlementDetails = wlhyServiceFeign.getById(reconciliationId); @@ -160,7 +155,7 @@ public class ReconciliationApplicationService { } } } - return reconciliationPOS; + return reconciliationPOS;*/ return reconciliationDomainService.queryList(reconciliationDO); } @@ -699,4 +694,4 @@ public class ReconciliationApplicationService { { return reconciliationDomainService.editIsInvoice(innerNumber,isInvoice,invoiceId,invoiceMakeTime,applyNumber); } -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/entity/TmsReceipt.java b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/entity/TmsReceipt.java index 51d7de86f..989f9148b 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/entity/TmsReceipt.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/entity/TmsReceipt.java @@ -2,15 +2,16 @@ package com.linke.finance.domain.tmsReceipt.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.mhd.common.core.annotation.Excel; -import io.swagger.annotations.ApiModelProperty; -import com.mhd.common.core.web.domain.BaseVOEntity; -import java.math.BigDecimal; -import lombok.Data; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.mhd.common.core.annotation.Excel; +import com.mhd.common.core.web.domain.BaseVOEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; +import java.util.Date; + /** * 收款单对象 tms_receipt @@ -43,9 +44,9 @@ public class TmsReceipt extends BaseVOEntity{ @Excel(name = "收款单号") private String receivePaymentNumber; -// @ApiModelProperty("结算方id") -// @Excel(name = "结算方id") -// private String settlementPartyId; + @ApiModelProperty("结算方id") + @Excel(name = "结算方id") + private String settlementPartyId; @ApiModelProperty("结算方名称") @Excel(name = "结算方名称") private String settlementPartyName; @@ -118,4 +119,4 @@ public class TmsReceipt extends BaseVOEntity{ @ApiModelProperty("结算币种") private String settlementCurrency; -} +} \ No newline at end of file diff --git a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/inBoundOrder/InboundOrderService.java b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/inBoundOrder/InboundOrderService.java index 83a01c4a7..75bc941a2 100644 --- a/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/inBoundOrder/InboundOrderService.java +++ b/mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/inBoundOrder/InboundOrderService.java @@ -22,18 +22,6 @@ import com.linke.transport.interfaces.dto.warehouse.inBoundOrder.InboundOrderDTO import com.linke.transport.interfaces.dto.warehouse.inBoundOrder.InboundOrderDTO.Create; import com.mhd.common.core.utils.OrderSequence; import com.mhd.common.security.utils.SecurityUtils; -import com.mhd.system.api.model.LoginUser; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Objects; -import java.util.Optional; -import java.util.function.Function; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -43,6 +31,11 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; +import java.math.BigDecimal; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; + /** *

* 入库单 服务实现类 @@ -471,4 +464,4 @@ public class InboundOrderService extends ServiceImpl