修改预约单转维修单报错

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

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -394,6 +394,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 AsBusrepairBillInvoice invoice = new AsBusrepairBillInvoice();
                 BeanUtil.copyProperties(dto.getInvoiceVo(), invoice, "id", "sid");
                 invoice.setBillSid(sid);
+                if (null != dto.getInvoiceVo().getIsInvoicing()) {
                     if (dto.getInvoiceVo().getIsInvoicing().equals("1")) {
                         List<String> taxItems = dto.getInvoiceVo().getTaxItems();
                         if (!taxItems.isEmpty()) {
@@ -410,8 +411,12 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                                 invoice.setTaxItems(sb.toString());
                             }
                         }
+                    }  else {
+                        invoice.setTaxItems(null);
+                    }
+                } else {
+                    invoice.setTaxItems(null);
                 }
-
                 asBusrepairBillInvoiceService.insert(invoice);
             }
             //保险信息