diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java index 985da5a..302be40 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java @@ -898,7 +898,9 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService { } log.info("【销项发票】【大象发票】打印机查询请求结果{}", skDyjList.toString()); List skDyjVO = BeanUtil.copyToList(skDyjList, SkDyjVO.class); - return new HXResponse("0000", "操作完成", skDyjList); + + + return new HXResponse("0000", "操作完成", skDyjVO); } @Override diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java index 521cc8a..6071868 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java @@ -1055,6 +1055,11 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer for (DownloadJdcVO downloadJdcVO : downloadJdcVOList) { RedinfoCopyAisinoVO redinfoCopyAisinoVO = BeanUtil.copyProperties(downloadJdcVO, RedinfoCopyAisinoVO.class); + // 含税金额赋值 + if(StrUtil.isNotEmpty(downloadJdcVO.getAmount()) && StrUtil.isNotEmpty(downloadJdcVO.getTax())){ + redinfoCopyAisinoVO.setTaxamt(NumberUtil.add(downloadJdcVO.getAmount(),downloadJdcVO.getTax())); + } + // 明细处理 if (!CollectionUtils.isEmpty(downloadJdcVO.getRedInvReqBillMx()) && !CollectionUtils.isEmpty(downloadJdcVO.getRedInvReqBillMx().get(0).getGoodsMx())) { List downloadJdcDetailItemVOS = downloadJdcVO.getRedInvReqBillMx().get(0).getGoodsMx();