From 3f135345dd1b723b00b7628a096a99785e97a96e Mon Sep 17 00:00:00 2001
From: mzr <mengzhaorui@qq.com>
Date: Fri, 6 Jun 2025 11:25:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(so):=20=E4=BF=AE=E5=A4=8D=E7=BA=A2=E5=AD=97?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=94=9F=E6=88=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operator/IAPISaleInvMaitainImpl.java         | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/so/src/public/nccloud/api/so/saleinvoice/operator/IAPISaleInvMaitainImpl.java b/so/src/public/nccloud/api/so/saleinvoice/operator/IAPISaleInvMaitainImpl.java
index d9c2071..283af1c 100644
--- a/so/src/public/nccloud/api/so/saleinvoice/operator/IAPISaleInvMaitainImpl.java
+++ b/so/src/public/nccloud/api/so/saleinvoice/operator/IAPISaleInvMaitainImpl.java
@@ -204,7 +204,7 @@ public class IAPISaleInvMaitainImpl {
         Logger.error("=====================inv-red-audit-end===============");
 
         // 查询新生成红冲发票的信息
-        String newPk = returnApproveSaleInvoiceVOs[0].getParentVO().getCsaleinvoiceid();
+        String newPk = returnSaveSaleInvoiceVOs[0].getParentVO().getCsaleinvoiceid();
         String[] idsNew = {newPk};
         // String[] idsNew = {"1001A11000000FSB45YA"};
         SaleInvoiceVO[] redVos = querySaleInvoiceByIds(idsNew);
@@ -503,8 +503,10 @@ public class IAPISaleInvMaitainImpl {
                 }
                 // BIP合同平台的数量对应BIP2312的主数量，BIP2312的 数量=主数量*换算关系
                 UFDouble nnum = new UFDouble(bipBvoJson.getString("nnum"));
-                newInvBVO.setNastnum(nnum.multiply(vchangerateNum).setScale(2, 4)); // 数量
+                UFDouble nastnum = nnum.multiply(vchangerateNum).setScale(2, 4);
+                newInvBVO.setNastnum(nastnum); // 数量
                 newInvBVO.setNnum(nnum); // 主数量
+                newInvBVO.setNqtunitnum(nastnum); // 报价数量
                 newInvBVO.setNqtorigtaxprice(new UFDouble(bipBvoJson.getString("nqtorigtaxprice"))); // 含税单价
                 newInvBVO.setNqtorigprice(new UFDouble(bipBvoJson.getString("nqtorigprice"))); // 无税单价
                 newInvBVO.setNorigtaxprice(new UFDouble(bipBvoJson.getString("norigtaxprice"))); // 主含税单价
@@ -528,11 +530,17 @@ public class IAPISaleInvMaitainImpl {
                 newInvBVO.setNtaxmny(new UFDouble(bipBvoJson.getString("ntaxmny"))); // 本币价税合计
                 newInvBVO.setNcaltaxmny(new UFDouble(bipBvoJson.getString("nmny"))); // 计税金额=本币无税金额
                 newInvBVO.setCopposesrcbid(bipBvoJson.getString("vbdef15")); // 对冲来源子表id
-                newInvBVO.setNqtunitnum(null); // 报价数量
+                newInvBVO.setCunitid(bipBvoJson.getString("castunitid"));// 主单位
+                newInvBVO.setCqtunitid(bipBvoJson.getString("castunitid"));// 报价单位
+                // 通过 ntaxrate 获取 taxcode
+                String taxcodeStr = getTaxcode(bipBvoJson.getString("ntaxrate"));
+                newInvBVO.setCtaxcodeid(taxcodeStr);// 税码
+
                 newInvBVO.setCsaleinvoiceid(null); // 发票关联主表id
                 newInvBVO.setNtotalcostnum(null); // 累计成本结算数量
                 newInvBVO.setNtotalincomemny(null); // 累计确认应收金额
                 newInvBVO.setNtotalincomenum(null); // 累计确认应收数量
+
                 newSaleInvoiceBVOs[i++] = newInvBVO;
                 sumNum = sumNum.add(new UFDouble(bipBvoJson.getString("nnum")));
                 sumNtax = sumNtax.add(new UFDouble(bipBvoJson.getString("ntax")));
@@ -558,6 +566,8 @@ public class IAPISaleInvMaitainImpl {
             newSaleInvoiceHVO.setCopposesrcid(saleInvoiceHVO.getCsaleinvoiceid());  // 对冲来源发票id
             newSaleInvoiceHVO.setApprover(null);  // 审批人
             newSaleInvoiceHVO.setTaudittime(null);  // 审批日期
+            newSaleInvoiceHVO.setVdef13(null);  // 发票号码
+            newSaleInvoiceHVO.setVdef17(bject.getString("vdef17"));  // BIP申请单号
 
             // 组装VO
             saleInvoiceVO.setParentVO(newSaleInvoiceHVO);