From 7e8b9812a472a59fdfa740c31f97dbafb7f5e343 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 27 Apr 2023 11:12:38 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/extend/entity/ExtOtherInvoice.java | 4 +++- .../extend/service/pool/ExtInvoicePoolServiceImpl.java | 4 ++-- dxhy-extend/src/main/resources/mapper/TicketMapper.xml | 8 ++++---- .../dxhy/sign/controller/SignElecInvoiceController.java | 1 + 4 files changed, 10 insertions(+), 7 deletions(-) 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/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index 900c50bc..b5f2d37c 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 @@ -218,8 +218,8 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl - 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-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()); From b2b55d4c6c26785e13ff4a8b1d3288940a54aaff Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 27 Apr 2023 14:00:44 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/extend/entity/ExtAddTaxInvoice.java | 2 ++ .../pool/ExtInvoicePoolServiceImpl.java | 31 ++++++++++++------- .../resources/mapper/ExtInvoicePoolMapper.xml | 2 +- 3 files changed, 23 insertions(+), 12 deletions(-) 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/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index b5f2d37c..4b5f73c4 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()); @@ -274,9 +275,17 @@ 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())); } diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 2faf90aa..d20ee4b2 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -163,7 +163,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 +179,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 From cd747003e88c3e0e3eb36fa417693848e8ea3b8b Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 27 Apr 2023 14:41:54 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/fpxxrz/BaseRzFpxxServiceImpl.java | 9 +++++++-- .../BaseInvoiceManualCheckServiceImpl.java | 16 ++++++++-------- .../impl/CustomsCustomsJkszhcxServiceImpl.java | 8 ++++++-- .../impl/CustomsRecordDkrzServiceImpl.java | 15 ++++++++++++--- .../service/bb/impl/ExtFpzhcxServiceImpl.java | 8 ++++++-- .../service/bb/impl/ExtYcfpcxServiceImpl.java | 6 +++++- .../service/companypool/TicketServiceImpl.java | 9 +++++++-- .../pool/ExtInvoicePoolServiceImpl.java | 18 +++++++++--------- 8 files changed, 60 insertions(+), 29 deletions(-) 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{}",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 4b5f73c4..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 @@ -396,13 +396,13 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl Date: Thu, 27 Apr 2023 15:06:40 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CustomsRecordDkrzServiceImpl.java | 3 +-- .../main/resources/mapper/ExtInvoicePoolMapper.xml | 11 ++++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java index f85de567..5eb3e5fe 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java +++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java @@ -134,8 +134,7 @@ public class CustomsRecordDkrzServiceImpl 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} @@ -179,7 +176,7 @@ t.account_period accountPeriod, t.inaccount_status inAccountStatus, t.bzdh bzdh, - t.posting_time postingTime + t.posting_time postingTime, DATE_FORMAT(t.collect_date,'%Y-%m-%d') collectDate, t.collect_from collectFrom from t_dx_record_invoice t From 7e290e2be5e341685aaa7f58e6294c3b86c0c549 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 27 Apr 2023 15:35:25 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/ExtInvoicePoolMapper.xml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 24827b64..03031871 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -298,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 @@ -336,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 From 8dbfe9877e0b597ec35ac6809e4941aa5596e375 Mon Sep 17 00:00:00 2001 From: yefei Date: Thu, 27 Apr 2023 15:55:25 +0800 Subject: [PATCH 6/7] =?UTF-8?q?ariesy=20=E6=9B=B4=E6=96=B0=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap-dev.yaml | 20 ++++++++++--------- .../controller/SDNYMainProcessController.java | 17 ++++++++++++---- .../src/main/resources/bootstrap-dev.yaml | 20 ++++++++++--------- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/dxhy-core/src/main/resources/bootstrap-dev.yaml b/dxhy-core/src/main/resources/bootstrap-dev.yaml index 1ccc7858..8b249614 100644 --- a/dxhy-core/src/main/resources/bootstrap-dev.yaml +++ b/dxhy-core/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-core-group # Nacos config 登录用户名 - username: dxhy-jxpt + username: nacos # Nacos config 登录密码 - password: dxhy-jxpt + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 - prefix: dxhy-core + 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-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index ebc31dca..799d86aa 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -16,10 +16,7 @@ import com.dxhy.common.utils.Base64Encoding; import com.dxhy.common.utils.R; import com.dxhy.common.vo.Tax; import com.dxhy.common.vo.TaxOrgCode; -import com.dxhy.erp.dao.CustomsRecordDao; -import com.dxhy.erp.dao.GsClientMapper; -import com.dxhy.erp.dao.RecordInvoiceDao; -import com.dxhy.erp.dao.TdxSaleRecordInvoiceDao; +import com.dxhy.erp.dao.*; import com.dxhy.erp.entity.*; import com.dxhy.erp.entity.sdny.*; import com.dxhy.erp.service.*; @@ -84,6 +81,9 @@ public class SDNYMainProcessController extends AbstractController { @Resource private CustomsRecordDao customsRecordDao; + @Resource + private BaseTDxRecordInvoiceDao baseTDxRecordInvoiceDao; + @Resource private RecordInvoiceDao recordInvoiceDao; @@ -480,6 +480,15 @@ public class SDNYMainProcessController extends AbstractController { return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY))); } } else { + DynamicContextHolder.push(dbName + DbConstant.BUSINESS_WRITE); + //删除对应的影像号 + QueryWrapper 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-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 From bf5e556c33fef4169650ecb10528629cf60e5723 Mon Sep 17 00:00:00 2001 From: wangzhikun Date: Thu, 27 Apr 2023 15:59:02 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=B5=B7=E5=85=B3=E7=BC=B4=E6=AC=BE?= =?UTF-8?q?=E4=B9=A6=E5=A1=AB=E5=8F=91=E6=97=A5=E6=9C=9F=E6=AF=94=E5=AF=B9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/customs/service/impl/CustomsSignServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java index 631ce669..9285755b 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java +++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java @@ -355,7 +355,9 @@ public class CustomsSignServiceImpl extends MpBaseServiceImpl