diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java index b7317f65..aa5bc318 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java @@ -182,8 +182,13 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl recordWrapper = new QueryWrapper<>(); + recordWrapper.eq("image_id", imageId); + BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice(); + recordInvoice.setImageId(""); + recordInvoice.setCompCode(""); + baseTDxRecordInvoiceDao.update(recordInvoice, recordWrapper); + R data = new R(1000, "default success"); data.put("data", result); return ResponseEntity.ok(JSONObject.toJSONString(data)); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java index d531fa62..3641de70 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtAddTaxInvoice.java @@ -2,6 +2,7 @@ package com.dxhy.extend.entity; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; /** @@ -135,6 +136,7 @@ public class ExtAddTaxInvoice implements Serializable { private String snVoucherNumber; private String postingTime; + @TableField("image_id") private String imageNumber; private String accountPeriod; private String compCode; diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java index f7af08eb..c9ad1d03 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java @@ -2,6 +2,7 @@ package com.dxhy.extend.entity; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; /** @@ -64,7 +65,8 @@ public class ExtOtherInvoice implements Serializable { private String taxAmount; private String voucherNo; private String postingTime; - private String imageId; + @TableField("image_id") + private String imageNumber; private String accountPeriod; private String inAccountStatus; private String bzdh; diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java index 04634694..96761136 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/bb/impl/ExtFpzhcxServiceImpl.java @@ -123,8 +123,12 @@ public class ExtFpzhcxServiceImpl extends MpBaseServiceImpl{}",pageList.get(i).getInAccountStatus()); - pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus())); - log.info("入账状态====>{}",pageList.get(i).getInAccountStatus()); +// pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus())); +// log.info("入账状态====>{}",pageList.get(i).getInAccountStatus()); } } diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index 900c50bc..ef4d937a 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -49,12 +49,12 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl{}",pageList.get(i).getInAccountStatus()); pageList.get(i).setInvoiceType(InvoiceTypeUtils.invoiceTypeName(pageList.get(i).getInvoiceType())); pageList.get(i).setQsrq(pageList.get(i).getQsrq() == null ? "" : pageList.get(i).getQsrq()); @@ -218,8 +219,8 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl{}",pageList.get(i).getInAccountStatus()); - pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS, - pageList.get(i).getInAccountStatus())); + if (pageList.get(i).getInAccountStatus()!= null){ + if ("1".equals(pageList.get(i).getInAccountStatus())){ + pageList.get(i).setInAccountStatus("已入账"); + } + if ("0".equals(pageList.get(i).getInAccountStatus())) { + pageList.get(i).setInAccountStatus("未入账"); + } + } +// log.info("inAccountStatus=====>{}",pageList.get(i).getInAccountStatus()); +// pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS, +// pageList.get(i).getInAccountStatus())); } @@ -387,13 +396,13 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl #{item} - + and t.invoice_type = #{invoiceType} - + and t.invoice_status = #{invoiceStatus} @@ -126,8 +124,7 @@ and t.sn_voucher_number = #{snVoucherNumber} - + and DATE_FORMAT(t.payment_date,'%Y-%m') = #{inAccountMonth} @@ -163,7 +160,6 @@ t.qs_name qsr, DATE_FORMAT(t.payment_date,'%Y-%m') inAccountMonth, t.payment_status paymentStatus, - t.inaccount_status inAccountStatus, t.voucher_number voucherNo, t.sn_voucher_number snVoucherNumber, t.posting_time postingTime, @@ -180,6 +176,7 @@ t.account_period accountPeriod, t.inaccount_status inAccountStatus, t.bzdh bzdh, + t.posting_time postingTime, DATE_FORMAT(t.collect_date,'%Y-%m-%d') collectDate, t.collect_from collectFrom from t_dx_record_invoice t @@ -301,22 +298,22 @@ AND qs_type = #{qsfs} - and t.posting_time between #{postingTimeStart} and #{postingTimeEnd} + and posting_time between #{postingTimeStart} and #{postingTimeEnd} - and t.image_id = #{imageNumber} + and image_id = #{imageNumber} - and t.account_period = #{accountPeriod} + and account_period = #{accountPeriod} - and t.inaccount_status = #{inAccountStatus} + and inaccount_status = #{inAccountStatus} - and t.bzdh = #{bzdh} + and bzdh = #{bzdh} - and t.sn_voucher_number = #{snVoucherNumber} + and sn_voucher_number = #{snVoucherNumber} GROUP BY uuid having min(create_date) ) t @@ -339,9 +336,8 @@ scan_id scanId, business_document_number businessDocumentNumber, account_period accountPeriod, - image_id imageId, + image_id imageNumber, posting_time postingTime, - sn_voucher_number voucherNo, inaccount_status inAccountStatus, bzdh bzdh, sn_voucher_number snVoucherNumber diff --git a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml index a5b7ef80..6323d1c1 100644 --- a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml @@ -67,10 +67,10 @@ and t.inaccount_status = #{inAccountStatus} - t.bzdh = #{bzdh} + and t.bzdh = #{bzdh} - t.sn_voucher_number = #{snVoucherNumber} + and t.sn_voucher_number = #{snVoucherNumber} @@ -131,10 +131,10 @@ and t.inaccount_status = #{inAccountStatus} - t.bzdh = #{bzdh} + and t.bzdh = #{bzdh} - t.sn_voucher_number = #{snVoucherNumber} + and t.sn_voucher_number = #{snVoucherNumber} diff --git a/dxhy-operation-flow/src/main/resources/bootstrap-dev.yaml b/dxhy-operation-flow/src/main/resources/bootstrap-dev.yaml index 780b661c..88b7634e 100644 --- a/dxhy-operation-flow/src/main/resources/bootstrap-dev.yaml +++ b/dxhy-operation-flow/src/main/resources/bootstrap-dev.yaml @@ -4,22 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 10.1.2.202:8848 + server-addr: 172.31.36.147:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 # Nacos config 分组 group: dxhy-flow-group # Nacos config 登录用户名 - username: dxhy-jxpt + username: nacos # Nacos config 登录密码 - password: dxhy-jxpt + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 - prefix: dxhy-flow + prefix: dxhy-erp # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 10.1.2.202:8848 - username: dxhy-jxpt - password: dxhy-jxpt - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file + server-addr: 172.31.36.147:33000 + # Nacos config 登录用户名 + username: nacos + # Nacos config 登录密码 + password: Invoice.nacos.!1 + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 \ No newline at end of file diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignElecInvoiceController.java b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignElecInvoiceController.java index f4946192..44dd6b82 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignElecInvoiceController.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignElecInvoiceController.java @@ -355,6 +355,7 @@ public class SignElecInvoiceController extends AbstractController { @RequestMapping("/deleteElec") @SysLog("删除签收失败发票") public ResponseEntity deleteElec(@RequestBody Map pramsMap) { + log.info("删除签收失败发票参数{}",pramsMap); try { // 删除 扫描表信息 boolean deleteElec = signElecInvoiceService.deleteElec(pramsMap.get("scanId"), getUserInfo().getDbName());