From 302195fbe14de6518a887dce0e289b3c67ad1e05 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 2 Dec 2024 11:10:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=BA=A6=E5=8D=95?=
 =?UTF-8?q?=E8=BD=AC=E7=BB=B4=E4=BF=AE=E5=8D=95=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AsBillSettelApplyRest.java                |  2 +-
 .../AsBusrepairBillService.java               | 33 +++++++++++--------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyRest.java
index f5110c320b..1d553326f7 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyRest.java
@@ -111,7 +111,7 @@ public class AsBillSettelApplyRest {
 	}
 
 	@ApiOperation("销售单初始化")
-	@GetMapping("/salesbillInit")
+	@PostMapping("/salesbillInit")
 	public ResultBean<AsBillSettelApplyDetailsVo> salesbillInit(@RequestParam("sid") String sid,
 																	@RequestParam("userSid") String userSid,
 																	@RequestParam("orgPath") String orgPath
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
index 24f4cd75d8..eb9514a75c 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
@@ -394,24 +394,29 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 AsBusrepairBillInvoice invoice = new AsBusrepairBillInvoice();
                 BeanUtil.copyProperties(dto.getInvoiceVo(), invoice, "id", "sid");
                 invoice.setBillSid(sid);
-                if (dto.getInvoiceVo().getIsInvoicing().equals("1")) {
-                    List<String> taxItems = dto.getInvoiceVo().getTaxItems();
-                    if (!taxItems.isEmpty()) {
-                        StringBuffer sb = new StringBuffer();
-                        for (String taxItem : taxItems) {
-                            if (StringUtils.isNotBlank(taxItem)) {
-                                sb.append(taxItem).append(",");
+                if (null != dto.getInvoiceVo().getIsInvoicing()) {
+                    if (dto.getInvoiceVo().getIsInvoicing().equals("1")) {
+                        List<String> taxItems = dto.getInvoiceVo().getTaxItems();
+                        if (!taxItems.isEmpty()) {
+                            StringBuffer sb = new StringBuffer();
+                            for (String taxItem : taxItems) {
+                                if (StringUtils.isNotBlank(taxItem)) {
+                                    sb.append(taxItem).append(",");
+                                }
+                            }
+                            if (sb.length() > 0) {
+                                sb.delete(sb.length() - 1, sb.length());
+                            }
+                            if (StringUtils.isNotBlank(sb)) {
+                                invoice.setTaxItems(sb.toString());
                             }
                         }
-                        if (sb.length() > 0) {
-                            sb.delete(sb.length() - 1, sb.length());
-                        }
-                        if (StringUtils.isNotBlank(sb)) {
-                            invoice.setTaxItems(sb.toString());
-                        }
+                    }  else {
+                        invoice.setTaxItems(null);
                     }
+                } else {
+                    invoice.setTaxItems(null);
                 }
-
                 asBusrepairBillInvoiceService.insert(invoice);
             }
             //保险信息