From 9a2f6a5a8945de1cea7d4783b60c1f4cdae903a6 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 29 Oct 2024 10:58:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E9=A2=84=E6=9C=9F=E5=88=B0=E8=B4=A7=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/pmspurchasebill/PmsPurchaseBillService.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
index debb235000..95130a676d 100644
--- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
+++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
@@ -464,10 +464,12 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
                 wmsAnsBillDto.setReviewStatus("");
                 wmsAnsBillDto.setRefuseReason("");
                 wmsAnsBillDto.setSourceBillSid(pmsPurchaseBill.getSid());
+                String taxRate = "";
                 PmsPurchaseBillInvoiceDetailsVo invoiceDetailsVo = pmsPurchaseBillInvoiceService.selByMainSid(businessSid);
                 if (null != invoiceDetailsVo) {
                     if (null != invoiceDetailsVo.getTaxRate()) {
                         wmsAnsBillDto.setTaxRate(invoiceDetailsVo.getTaxRate().toString());
+                        taxRate = invoiceDetailsVo.getTaxRate().toString();
                     }
                 }
                 if (StringUtils.isNotBlank(pmsPurchaseBill.getManufacturersOrderTypeKey())) {
@@ -500,12 +502,12 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
                     wmsAnsBillDetailDto.setGoodsSkuCode(pmsPurchaseBillDetailDetailsVo.getGoodsSkuCode());
                     wmsAnsBillDetailDto.setGoodsSkuOwnSpec(pmsPurchaseBillDetailDetailsVo.getGoodsSkuOwnSpec());
                     wmsAnsBillDetailDto.setUnit(pmsPurchaseBillDetailDetailsVo.getUnit());
-                    if (null != pmsPurchaseBillDetailDetailsVo.getCost()) {
-                        wmsAnsBillDetailDto.setCost(pmsPurchaseBillDetailDetailsVo.getCost().toString());
+                    if (null != pmsPurchaseBillDetailDetailsVo.getTaxPrice()) {
+                        wmsAnsBillDetailDto.setCost(pmsPurchaseBillDetailDetailsVo.getTaxPrice().toString());
                     }
                     wmsAnsBillDetailDto.setOrderCount(pmsPurchaseBillDetailDetailsVo.getCount().toString());
-                    if (null != pmsPurchaseBillDetailDetailsVo.getTaxAmount()) {
-                        wmsAnsBillDetailDto.setTaxAmount(pmsPurchaseBillDetailDetailsVo.getTaxAmount().toString());
+                    if (StringUtils.isNotBlank(taxRate)) {
+                        wmsAnsBillDetailDto.setTaxAmount(taxRate);
                     }
                     wmsAnsBillDetailDto.setTaxPrice(pmsPurchaseBillDetailDetailsVo.getTaxPrice().toString());
                     wmsAnsBillDetailDto.setAmount(pmsPurchaseBillDetailDetailsVo.getAmount().toString());