diff --git a/jianshui-admin/src/main/java/com/jianshui/api/config/WebserviceResponseHandler.java b/jianshui-admin/src/main/java/com/jianshui/api/config/WebserviceResponseHandler.java index cd199ba..c28e752 100644 --- a/jianshui-admin/src/main/java/com/jianshui/api/config/WebserviceResponseHandler.java +++ b/jianshui-admin/src/main/java/com/jianshui/api/config/WebserviceResponseHandler.java @@ -77,7 +77,7 @@ public class WebserviceResponseHandler implements SOAPHandler getInvoiceSphVOList = new ArrayList<>(); List details = invoiceCheck.getInvoiceCheckDetail(); if (CollectionUtil.isNotEmpty(details)) { for (InvoiceCheckDetail detail : details) { GetInvoiceSphVO getInvoiceSphVO = new GetInvoiceSphVO(); if (InvoiceType.JUAN_PIAO.getCode().equals(invoiceCheck.getFpzl())){ + // 卷票详情 getInvoiceSphVO.setHwmc(detail.getHwmc()); getInvoiceSphVO.setGgxh(detail.getGgxh()); getInvoiceSphVO.setJldw(detail.getJldw()); getInvoiceSphVO.setSl(detail.getSl()); getInvoiceSphVO.setBhsdj(detail.getBhsdj()); - // 含税金额 - getInvoiceSphVO.setHsje(detail.getHsje()); - // 不含税金额 +// getInvoiceSphVO.setHsje(detail.getHsje()); +// getInvoiceSphVO.setLx(detail.getLx()); +// getInvoiceSphVO.setTxrqz(detail.getTxrqz()); +// getInvoiceSphVO.setTxrqq(detail.getTxrqq()); +// getInvoiceSphVO.setCph(detail.getCph()); getInvoiceSphVO.setBhsje(detail.getJe()); getInvoiceSphVO.setSe(detail.getSe()); getInvoiceSphVO.setSl(detail.getSl()); - getInvoiceSphVO.setLx(detail.getLx()); - getInvoiceSphVO.setTxrqz(detail.getTxrqz()); - getInvoiceSphVO.setTxrqq(detail.getTxrqq()); - getInvoiceSphVO.setCph(detail.getCph()); + getInvoiceSphVO.setSsflbm(detail.getSsflbm()); + getInvoiceSphVO.setSpsl(detail.getSpsl()); getInvoiceSphVOList.add(getInvoiceSphVO); }else if (InvoiceType.QUAN_DIAN_ZHUAN_PIAO.getCode().equals(invoiceCheck.getFpzl()) || InvoiceType.QUAN_DIAN_PU_PIAO.getCode().equals(invoiceCheck.getFpzl())){ + // 全电专票详情 getInvoiceSphVO.setHwmc(detail.getHwmc()); getInvoiceSphVO.setGgxh(detail.getGgxh()); getInvoiceSphVO.setJldw(detail.getJldw()); @@ -442,6 +553,36 @@ public class InvoiceCheckWebServiceImpl { getInvoiceSphVO.setSsflbm(detail.getSsflbm()); getInvoiceSphVO.setSpsl(detail.getSpsl()); getInvoiceSphVOList.add(getInvoiceSphVO); + }else if (InvoiceType.JI_DONG_CHE_PIAO.getCode().equals(invoiceCheck.getFpzl())){ + // 机动车没有详情 + getInvoiceSphVO.getLx(); + }else if (InvoiceType.TONG_XING_FEI_FA_PIAO.getCode().equals(invoiceCheck.getFpzl())){ + // 通行发票 + getInvoiceSphVO.setHwmc(detail.getHwmc()); + getInvoiceSphVO.setCph(detail.getCph()); + getInvoiceSphVO.setCllx(detail.getLx()); + getInvoiceSphVO.setTxrqq(detail.getTxrqq()); + getInvoiceSphVO.setTxrqz(detail.getTxrqz()); + getInvoiceSphVO.setBhsje(detail.getJe()); + getInvoiceSphVO.setSe(detail.getSe()); + getInvoiceSphVO.setSl(detail.getSl()); + getInvoiceSphVO.setSsflbm(detail.getSsflbm()); + getInvoiceSphVOList.add(getInvoiceSphVO); + }else if (InvoiceType.ER_SHOU_CHE_PIAO.getCode().equals(invoiceCheck.getFpzl())){ + // 二手车没有详情 + getInvoiceVO.getFplx(); + }else if (InvoiceType.ZHUAN_PIAO.getCode().equals(invoiceCheck.getFpzl())){ + // 专票详情 + getInvoiceSphVO.setHwmc(detail.getHwmc()); + getInvoiceSphVO.setGgxh(detail.getGgxh()); + getInvoiceSphVO.setJldw(detail.getJldw()); + getInvoiceSphVO.setSpsl(detail.getSpsl()); + getInvoiceSphVO.setBhsdj(detail.getBhsdj()); + getInvoiceSphVO.setBhsje(detail.getJe()); + getInvoiceSphVO.setSe(detail.getSe()); + getInvoiceSphVO.setSl(detail.getSl()); + getInvoiceSphVO.setSsflbm(detail.getSsflbm()); + getInvoiceSphVOList.add(getInvoiceSphVO); }else { getInvoiceSphVO.setSsflbm(detail.getSpbmjc()); BeanUtils.copyProperties(detail, getInvoiceSphVO); diff --git a/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceSphVO.java b/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceSphVO.java index 5c9f94e..81e0596 100644 --- a/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceSphVO.java +++ b/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceSphVO.java @@ -20,6 +20,7 @@ public class GetInvoiceSphVO { @JSONField(name = "Spmc") private String hwmc; // 不含税金额 + @JSONField(name = "Je") private String bhsje; // 数量 @JSONField(name = "Sl") @@ -33,7 +34,7 @@ public class GetInvoiceSphVO { // 含税单价 // private String hsdj; // 含税金额 - @JSONField(name = "Je") + @JSONField(name = "Hsje") private String hsje; // 不含税单价 @JSONField(name = "Dj") @@ -78,4 +79,8 @@ public class GetInvoiceSphVO { private String qfsj; //客票级别 private String kpjb; + + //通行费发票 + @JSONField(name = "Cllx") + private String cllx; } diff --git a/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceVO.java b/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceVO.java index 095aa34..9af6266 100644 --- a/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceVO.java +++ b/jianshui-income/src/main/java/com/jianshui/income/domain/vo/render/GetInvoiceVO.java @@ -216,7 +216,7 @@ public class GetInvoiceVO { // @JSONField(name = "escsckhyhzh") // private String escsckhyhzh; - @JSONField(name = "cjhj") + @JSONField(name = "Cjhj") private String cjhj; @JSONField(name = "xdpbz") @@ -265,7 +265,7 @@ public class GetInvoiceVO { @JSONField(name = "sl") private String sl; - + // 产地 机动车发票返回该信息` @JSONField(name = "cd") private String cd; @@ -284,7 +284,7 @@ public class GetInvoiceVO { @JSONField(name = "zgswjgmc") private String zgswjgmc; - @JSONField(name = "zgswjgdm") + @JSONField(name = "zgswjg") private String zgswjgdm; // @JSONField(name = "fdjhm") @@ -328,6 +328,10 @@ public class GetInvoiceVO { @JSONField(name = "Zh") private String zh; + //发票类型 + @JSONField(name = "Fplx") + private String fplx; + // 机动车发票end //航空 start diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/enums/InvoiceType.java b/jianshui-platform/src/main/java/com/jianshui/platform/enums/InvoiceType.java index be47416..7efcce4 100644 --- a/jianshui-platform/src/main/java/com/jianshui/platform/enums/InvoiceType.java +++ b/jianshui-platform/src/main/java/com/jianshui/platform/enums/InvoiceType.java @@ -12,7 +12,9 @@ public enum InvoiceType { JI_DONG_CHE_PIAO("03", "机动车票"), ER_SHOU_CHE_PIAO("15", "二手车票"), QUAN_DIAN_PU_PIAO("22", "全电普票"), - QUAN_DIAN_ZHUAN_PIAO("21", "全电专票"); + QUAN_DIAN_ZHUAN_PIAO("21", "全电专票"), + TONG_XING_FEI_FA_PIAO("14", "通行费发票"), + ZHUAN_PIAO("01", "专票"); private String code; diff --git a/jianshui-ui/src/views/platform/exportsetting/index.vue b/jianshui-ui/src/views/platform/exportsetting/index.vue index d9ff5a1..e060658 100644 --- a/jianshui-ui/src/views/platform/exportsetting/index.vue +++ b/jianshui-ui/src/views/platform/exportsetting/index.vue @@ -391,7 +391,7 @@ export default { radio4: '1', radio5: '1', //校验数组 - enteredLetters: [] + letterList: [] }; }, watch: { @@ -583,6 +583,48 @@ export default { this.form.isornotDiscounts = ''; } }, + checkInputAll() { + this.validateLetter(this.form.receiptNumber); + this.validateLetter(this.form.customerName); + this.validateLetter(this.form.customerTaxNumber); + this.validateLetter(this.form.customerAddress); + this.validateLetter(this.form.customerPhone); + this.validateLetter(this.form.bankName); + this.validateLetter(this.form.bankName); + this.validateLetter(this.form.phone); + this.validateLetter(this.form.email); + this.validateLetter(this.form.remark); + this.validateLetter(this.form.productName); + this.validateLetter(this.form.specification); + this.validateLetter(this.form.unit); + this.validateLetter(this.form.price); + this.validateLetter(this.form.num); + this.validateLetter(this.form.taxamt); + this.validateLetter(this.form.taxrate); + this.validateLetter(this.form.tax); + this.validateLetter(this.form.discount); + this.validateLetter(this.form.deduction); + this.validateLetter(this.form.zeroTaxRate); + this.validateLetter(this.form.encodingName); + this.validateLetter(this.form.encodingVersion); + this.validateLetter(this.form.discountsType); + this.validateLetter(this.form.taxClassificationCode); + this.validateLetter(this.form.isornotDiscounts); + }, + validateLetter(value) { + if (/^[A-Z]$/.test(value)) { + if (this.letterList.includes(value)) { + // 输入重复字母,提示用户重新输入 + this.$message.warning('输入值重复!'); + } else { + // 将合法的字母加入字母列表 + this.letterList.push(value); + } + } else { + // 输入非字母,提示用户重新输入 + this.$message.warning('请输入Excel列字母A-Z'); + } + }, // 取消按钮 cancel() { this.open = false;