修改采购推送预期到货通知单

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());