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 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 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 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); } //保险信息