From a5dec647f7973f68ab67387dd2efb5b625c48c4d Mon Sep 17 00:00:00 2001 From: yefei Date: Fri, 28 Apr 2023 19:28:35 +0800 Subject: [PATCH 01/33] =?UTF-8?q?ariesy=20=E6=9B=B4=E6=AD=A3=E5=85=A8?= =?UTF-8?q?=E7=94=B5=E6=99=AE=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/service/SNPushCheckRecordService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index 1d3e7365..5b7b773a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -309,7 +309,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { invoiceType = invoiceData.get("fpzl").toString(); if ("22".equals(invoiceType)) { - invoiceType = "33"; + invoiceType = "32"; } if ("21".equals(invoiceType)) { invoiceType = "31"; From caf043cc7218a816b70875dd9c0ec56daaf286bd Mon Sep 17 00:00:00 2001 From: yefei Date: Fri, 28 Apr 2023 19:51:31 +0800 Subject: [PATCH 02/33] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E5=AE=9E?= =?UTF-8?q?=E5=90=8D=E5=AE=A2=E7=A5=A8=E6=B2=A1=E6=9C=89=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=A8=8E=E7=A0=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/core/model/InvoiceMainBodyVO.java | 1 + dxhy-core/src/main/resources/mapper/TicketMapper.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/InvoiceMainBodyVO.java b/dxhy-core/src/main/java/com/dxhy/core/model/InvoiceMainBodyVO.java index 1275a8f4..b4c27012 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/model/InvoiceMainBodyVO.java +++ b/dxhy-core/src/main/java/com/dxhy/core/model/InvoiceMainBodyVO.java @@ -52,6 +52,7 @@ public class InvoiceMainBodyVO { private String departureCity; private String reachingCity; private String taxRate; + private String taxCode; private String selectId; private Integer xh; private String remark; diff --git a/dxhy-core/src/main/resources/mapper/TicketMapper.xml b/dxhy-core/src/main/resources/mapper/TicketMapper.xml index 6fa26570..d2067372 100644 --- a/dxhy-core/src/main/resources/mapper/TicketMapper.xml +++ b/dxhy-core/src/main/resources/mapper/TicketMapper.xml @@ -133,6 +133,7 @@ tax_amount, total_amount, tax_rate, + tax_code, train_number, date_format(ticket_departure_time,'%Y-%m-%d %H:%i:%s') ticket_departure_time, date_format(ticket_arrival_time,'%Y-%m-%d %H:%i:%s') ticket_arrival_time, From cef076aa207f74c6687806caa77d968d4e77a673 Mon Sep 17 00:00:00 2001 From: yefei Date: Sat, 29 Apr 2023 09:10:08 +0800 Subject: [PATCH 03/33] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E5=AE=A2=E7=A5=A8=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ExtInvoicePoolMapper.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 03031871..7967bc4b 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -342,7 +342,7 @@ bzdh bzdh, sn_voucher_number snVoucherNumber FROM - t_dx_invoice_reimburse + t_dx_record_invoice where invoice_type in ('91','94','95','00','97','98','101','102','103','99') @@ -354,10 +354,6 @@ AND CONCAT(IFNULL(invoice_code,''),IFNULL(invoice_no,'')) like CONCAT('%',#{keyWord},'%') - AND gf_tax_no in - - #{item} - AND invoice_type = #{invoiceType} From ec011d019463f97d761e1590bc6e841504def8ae Mon Sep 17 00:00:00 2001 From: yefei Date: Sat, 29 Apr 2023 09:44:25 +0800 Subject: [PATCH 04/33] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E5=AE=A2=E7=A5=A8=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 7967bc4b..564dab46 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -332,7 +332,6 @@ qs_name qsr, source_system sourceSystem, uuid, - select_id selectId, scan_id scanId, business_document_number businessDocumentNumber, account_period accountPeriod, From cd86171148e869871a63c9dfffc9e924ca2c0915 Mon Sep 17 00:00:00 2001 From: yefei Date: Sat, 29 Apr 2023 09:58:28 +0800 Subject: [PATCH 05/33] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E5=AE=A2=E7=A5=A8=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 564dab46..e1f96b24 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -333,7 +333,6 @@ source_system sourceSystem, uuid, scan_id scanId, - business_document_number businessDocumentNumber, account_period accountPeriod, image_id imageNumber, posting_time postingTime, From 4f3dee13db4439b38e20fd0ec836a2a6561e22ed Mon Sep 17 00:00:00 2001 From: yefei Date: Sat, 29 Apr 2023 10:56:54 +0800 Subject: [PATCH 06/33] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E9=82=AE?= =?UTF-8?q?=E7=AE=B1=E5=8F=91=E9=80=81=E5=BA=95=E8=B4=A6=E5=BA=93=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=8F=91=E7=A5=A8=E4=B8=8D=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java index ef2f0e7e..1e75099f 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java @@ -3445,7 +3445,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl excelList = selectWqsfp(pramsMap); log.info("excelList {}",excelList); ExcelWriter excelWriter = null; - if(excelList != null){ + if(excelList != null && excelList.size() > 0){ // String fileName = "签收数据导出" + ".xlsx"; ByteArrayOutputStream outputStream = null; try { @@ -3474,6 +3474,11 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl Date: Sat, 29 Apr 2023 16:33:22 +0800 Subject: [PATCH 07/33] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E4=BB=AA=E7=AD=BE=E6=94=B6=E6=89=93=E5=8D=B0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java index 1e75099f..90fe541c 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java @@ -904,6 +904,9 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl pramsMapAll, UserInfo userInfo) { + + log.info("传入的参数为:{}",pramsMapAll); + JSONObject json; String company = pramsMapAll.get("company"); String menuId = pramsMapAll.get("menuId"); @@ -961,7 +964,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl Date: Sat, 29 Apr 2023 17:07:55 +0800 Subject: [PATCH 08/33] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3erp=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 60 +++++++------------ 1 file changed, 23 insertions(+), 37 deletions(-) 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 04f0a1fb..2265be7d 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 @@ -27,10 +27,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseEntity; import org.springframework.util.Base64Utils; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -48,6 +45,7 @@ import java.util.*; */ @SuppressWarnings({"AlibabaUndefineMagicConstant", "AlibabaMethodTooLong"}) @RestController +@RequestMapping("/sn") @Slf4j public class SDNYMainProcessController extends AbstractController { @@ -90,23 +88,22 @@ public class SDNYMainProcessController extends AbstractController { @Resource private MixedSignatureDao mixedSignatureDao; + @Resource + private SysDeptDao sysDeptDao; + /** * 查验发票 */ - @PostMapping("/sn/singleInvoiceCheck") + @PostMapping("/singleInvoiceCheck") @ResponseBody @SysLog("发票查验") public ResponseEntity singleInvoiceCheck(@RequestBody Map pramsMap) throws ParseException { log.info("传入的参数为:{}", pramsMap); String userid = "101833"; String dbName = "business"; - String company = "BIGB"; - // 入参统一在入口处理 -// String userid = getLoginName(); -// String dbName = getUserInfo().getDbName(); -// String company = getUserInfo().getCompany(); JSONObject checkInvoiceResult = null; + //挡板开关 if("1".equals(isPresure)){ String base64 = "ewoJImNvZGUiOiAxMDAwLAoJImRhdGEiOiB7CgkJImRyYXdlZU5hbWUiOiAiIiwKCQkiYnVzaW5lc3NVbml0IjogIiIsCgkJImxlbW9uTWFya2V0VGF4Tm8iOiAiOTEzNzAxMjVNQTNRQUtDMjhBIiwKCQkiYnJhbmRNb2RlbCI6ICLliKvlhYvniYxTR002NTIxVUJBMSIsCgkJInZlaGljbGVJZGVudGlmaWNhdGlvbk5vIjogIkxTR1VBODJMN01HMDgzODcwIiwKCQkiaWRjYXJkTm8iOiAiIiwKCQkic291cmNlIjogIiIsCgkJInRyYW5zcG9ydFJvdXRlIjogIiIsCgkJInRvdGFsVGF4IjogIiIsCgkJImJ1c2luZXNzVW5pdEFkZHJlc3MiOiAiIiwKCQkibGljZW5zZVBsYXRlIjogIuS6kUFFODVTNSIsCgkJInNlbGxlclVuaXRPckluZGl2aWR1YWwiOiAi5rWO5Y2X5YyX5p6B5pif5rG96L2m5pyN5Yqh5pyJ6ZmQ5YWs5Y+45LqR5Y2X5YiG5YWs5Y+4IiwKCQkiYWRtaW5pc3RyYXRpdmVEaXZpc2lvbk5vIjogIiIsCgkJImNhcnJpZXJOYW1lIjogIiIsCgkJInRheFJlY29yZHMiOiAiIiwKCQkic2FsZXNCYW5rIjogIiIsCgkJImxlbW9uTWFya2V0IjogIuWxseS4nOa2pumAmuS6jOaJi+i9puW4guWcuuacjeWKoeaciemZkOWFrOWPuCIsCgkJImludm9pY2VUeXBlIjogIjE1IiwKCQkibGltaXRQZW9wbGUiOiAiIiwKCQkibWFjaGluZU5vIjogIjU4OTkxNjQyNDc3MiIsCgkJInB1cmNoYXNlckFkZHJlc3NQaG9uZSI6ICIiLAoJCSJzdGF0ZSI6ICIwIiwKCQkiaW52b2ljZU5vIjogIjAwMzI3OTYyIiwKCQkidmVoaWNsZVR5cGUiOiAi5bCP5Z6L5pmu6YCa5a6i6L2mIiwKCQkiZW5naW5lTm8iOiAiIiwKCQkiaW5zcGVjdGlvbk51bSI6ICIiLAoJCSJtYWNoaW5lQ29kZSI6ICIiLAoJCSJidXNpbmVzc1VuaXRQaG9uZSI6ICIiLAoJCSJzZWxsZXJQaG9uZSI6ICIxNTkxMDA4NDM4NCIsCgkJInplcm9UYXhSYXRlU2lnbiI6ICIiLAoJCSJpbnZvaWNlQ29kZSI6ICIwMzcwMDIxMDA0MTciLAoJCSJjZXJ0aWZpY2F0ZU5vIjogIiIsCgkJInB1cmNoYXNlck5hbWUiOiAiIiwKCQkiY2hlY2tDb2RlIjogIiIsCgkJImJpbGxpbmdEYXRlIjogIjIwMjMtMDMtMTciLAoJCSJ0b3RhbEFtb3VudCI6ICIiLAoJCSJ2ZWhpY2xlTm8iOiAiTFNHVUE4Mkw3TUcwODM4NzAiLAoJCSJzYWxlc0FkZHJlc3NQaG9uZSI6ICIiLAoJCSJidXllclBob25lIjogIjE1Njg4ODg1MjA1IiwKCQkic2FsZXNOYW1lIjogIiIsCgkJInB1cmNoYXNlclRheE5vIjogIiIsCgkJInNlbGxlclVuaXRDb2RlT3JJZE5vIjogIjkxNTMwMTAyTUE3SzcyWVQ1QyIsCgkJImNhcnJpZXJUYXhObyI6ICIiLAoJCSJ0YXhBdXRob3JpdHlOYW1lIjogIiIsCgkJImluc3BlY3Rpb25MaXN0Tm8iOiAiIiwKCQkiYW1vdW50VGF4IjogIiIsCgkJIm9yaWdpblBsYWNlIjogIiIsCgkJImNlcnRpZmljYXRlIjogIiIsCgkJImJ1eWVySUROdW0iOiAiIiwKCQkicGF5bWVudFZvdWNoZXJObyI6ICIiLAoJCSJsZW1vbk1hcmtldEFkZHJlc3MiOiAi5bGx5Lic55yB5rWO5Y2X5biC5rWO5YyX5byA5Y+R5Yy65Lit5bCP5LyB5Lia5a215YyW5ZutIiwKCQkiZmFjdG9yeU1vZGVsIjogIuWIq+WFi+eJjFNHTTY1MjFVQkExIiwKCQkiYnV5ZXJVbml0T3JJbmRpdmlkdWFsIjogIua1juWNl+WMl+aegeaYn+axvei9puacjeWKoeaciemZkOWFrOWPuCIsCgkJImludm9pY2VOdW1iZXIiOiAiMDAzMjc5NjIiLAoJCSJ0b2xsU2lnbiI6ICIwNyIsCgkJInRheEJ1cmVhdUNvZGUiOiAiIiwKCQkidG9ubmFnZSI6ICIiLAoJCSJ0YXhBdXRob3JpdHlObyI6ICIiLAoJCSJjb21wYW55IjogIkJJR0IiLAoJCSJsZW1vbk1hcmtldFBob25lIjogIjEzODU0MTkzMDI1IiwKCQkicHVyY2hhc2VyQmFuayI6ICIiLAoJCSJhZG1pbmlzdHJhdGl2ZURpdmlzaW9uTmFtZSI6ICIiLAoJCSJwYXNzZW5nZXJzTGltaXRlZCI6ICIiLAoJCSJidXllclVuaXRPckluZGl2aWR1YWxBZGRyZXNzIjogIuWxseS4nOecgea1juWNl+W4guWkqeahpeWMuuWMl+WFs+WMl+i3rzblj7fmuZblhYnlsbHoibLlrrblm600LTMtMTAyIiwKCQkiaW52b2ljZUxpbmVMaXN0IjogW3sKCQkJInVuaXRQcmljZSI6ICIiLAoJCQkicm93Tm8iOiAiMSIsCgkJCSJhbW91bnQiOiAiIiwKCQkJInNwZWNpZmljYXRpb25Nb2RlbCI6ICIiLAoJCQkicXVhbnRpdHkiOiAiIiwKCQkJInRheCI6ICIiLAoJCQkidHlwZSI6ICIiLAoJCQkidW5pdCI6ICIiLAoJCQkibGljZW5zZVBsYXRlTnVtIjogIiIsCgkJCSJjdXJyZW50RGF0ZUVuZCI6ICIiLAoJCQkiY29tbW9kaXR5Q29kZSI6ICIiLAoJCQkiY3VycmVudERhdGVTdGFydCI6ICIiLAoJCQkiY29tbW9kaXR5TmFtZSI6ICIiCgkJfV0sCgkJImxlbW9uTWFya2V0QmFua0FuZEFjY291bnQiOiAi5Lit5Zu96ZO26KGM5rWO6Ziz5pSv6KGM6JCl5Lia6YOoMjMyNTQwNzQ2NjQ5IiwKCQkic2FsZXNUYXhObyI6ICIiLAoJCSJzZWxsZXJVbml0T3JJbmRpdmlkdWFsQWRkcmVzcyI6ICLkupHljZfnnIHmmIbmmI7luILkupTljY7ljLrpu5Hmnpfpk7rooZfpgZPlip7kuovlpITkurrmsJHopb/ot683MjDlj7dN5qCLTS0xMOWPtyIsCgkJImJ1c2luZXNzVW5pdEJhbmtBbmRBY2NvdW50IjogIiIsCgkJInZlaGljbGVBZG1pbk9mZmljZSI6ICLmtY7ljZfluIIiLAoJCSJhbW91bnRUYXhDTiI6ICIiLAoJCSJyZWdpc3RyYXRpb25ObyI6ICIzNzAwMzc1ODUzNTciLAoJCSJwcm9kdWN0UGxhY2UiOiAiIiwKCQkicmVtYXJrcyI6ICIiLAoJCSJ0YXhCdXJlYXVOYW1lIjogIiIKCX0sCgkibWVzc2FnZSI6ICJzdWNjZXNzIgp9"; String result = Base64Encoding.decodeToString(base64); @@ -216,7 +213,6 @@ public class SDNYMainProcessController extends AbstractController { if (!checkInvoiceResult.containsKey("cyjg")) { checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber")); - checkInvoiceResult.put("company", company); log.info("返回给影像系统的结果为:{}", checkInvoiceResult); signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, userid, "1", dbName); } @@ -234,7 +230,6 @@ public class SDNYMainProcessController extends AbstractController { if (insert > 0) { checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber")); - checkInvoiceResult.put("company", company); checkInvoiceResult.put("message", "入库成功"); log.info("返回给影像系统的结果为:{}", checkInvoiceResult); } @@ -391,30 +386,20 @@ public class SDNYMainProcessController extends AbstractController { /** * 查验发票 */ - @PostMapping("/sn/syncInvoiceInfo") + @PostMapping("/syncInvoiceInfo") @ResponseBody @SysLog("同步发票信息") public ResponseEntity syncInvoiceInfo(@RequestBody SNRequestObject snRequestObject) { log.info("影像系统同步数据:{}", JSONObject.toJSONString(snRequestObject)); - String userid = "101833"; String dbName = "business"; - String company = "BIGB"; - String taxNo = "9111112222333344DD"; - String orgCode = "1010"; - -// // 入参统一在入口处理 -// String userid = getLoginName(); -// String dbName = getUserInfo().getDbName(); -// String company = getUserInfo().getCompany(); -// List orgCodes = getUserInfo().getOrgCodes(); -// String orgCode = orgCodes.get(0).getOrgCode(); -// List gfshAll = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); -// String gfsh = ""; -// if (gfshAll.size() > 0) { -// gfsh = gfshAll.get(0); -// } + // 入参统一在入口处理 + String orgCode = snRequestObject.getCompCode(); + SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(orgCode); + log.info("查询的组织信息为:{}",JSONObject.toJSONString(orgByCompCode)); + String company = orgByCompCode.getCompany(); + String taxno = orgByCompCode.getTaxno(); String result = ""; @@ -439,20 +424,21 @@ public class SDNYMainProcessController extends AbstractController { object.setZFILED2(""); object.setZFILED3(""); object.setZFILED4(""); -// List gsClients = gsClientMapper.selectByGsdm(orgCode); -// if(gsClients != null && gsClients.size() > 0) { -// object.setZFILED5(gsClients.get(0).getClient()); -// }else{ -// object.setZFILED5(environment); -// } - object.setZFILED5(environment); + DynamicContextHolder.push(DbConstant.BASICS_READ); + List gsClients = gsClientMapper.selectByGsdm(orgCode); + if(gsClients != null && gsClients.size() > 0) { + object.setZFILED5(gsClients.get(0).getClient()); + }else{ + object.setZFILED5(environment); + } +// object.setZFILED5(environment); List sapInvoiceInfos = new ArrayList<>(); if (invoiceInfoList != null && invoiceInfoList.size() > 0) { for (SNInvoice invoice : invoiceInfoList) { String fplxdm = ""; String snFplx = ""; - result = snPushCheckRecordService.updateInvoicePoll(company, taxNo, reimburse, invoice, fplxdm, imageId, compCode); + result = snPushCheckRecordService.updateInvoicePoll(company, taxno, reimburse, invoice, fplxdm, imageId, compCode); //价税分离判断 if (!"ok".equals(result) && !"0000".equals(result)) { From ceb844262ec541dd39b766b5f552f1f53b737d8f Mon Sep 17 00:00:00 2001 From: yefei Date: Sat, 29 Apr 2023 19:38:34 +0800 Subject: [PATCH 09/33] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E8=BF=9B?= =?UTF-8?q?=E9=A1=B9=E5=A2=9E=E5=80=BC=E7=A8=8E=E5=AF=BC=E5=87=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/core/thread/PoolAddTaxThread.java | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java index 07ce17d1..01e5c099 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java @@ -66,16 +66,16 @@ public class PoolAddTaxThread extends BaseThread { * 导出excel的列名 */ private final String[] titleColumns = {"序号", "发票类型", "发票代码", "发票号码", "发票状态", "开票日期", "销方名称", "销方税号", "金额", "税额", - "有效税额", "价税合计", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人", + "有效税额", "价税合计", "认证状态", "认证类型", "认证日期", "认证方式", "认证人", "采集状态", "底账库采集时间", "采集来源", "签收方式", "签收状态", "签收日期", "签收人", "入账月份", "入账状态", "凭证号", "是否末次摊销", "摊销金额", "剩余金额", "业务单号", "入池时间","凭证号","过账时间","账期","影像id"}; /** * 导出excel的列名 */ private final String[] detailTitleColumns = - {"序号", "发票代码", "发票号码", "货物或应税劳务名称", "规格型号", "单位", "数量", "单价", "金额", "税额", "税率", "车牌号", "类型", "通行日期起", "通行日期止"}; + {"序号", "发票代码", "发票号码", "货物或应税劳务名称", "规格型号", "单位", "数量", "单价", "金额", "税额", "税率", "车牌号", "类型", "通行日期起", "通行日期止"}; -// private Sheet sheet; + // private Sheet sheet; // private Table table; private WriteSheet writeSheet; private WriteTable writeTable; @@ -95,8 +95,8 @@ public class PoolAddTaxThread extends BaseThread { private final TabulateRedisServiceImpl tabulateRedisService; public PoolAddTaxThread(IExcelExportlogService exportLogService, List exportLogs, - PoolPaperService poolPaperService, FileService fileService, Sender sender, IFeginWebsocket feginWebsocket, - TabulateRedisServiceImpl tabulateRedisService) { + PoolPaperService poolPaperService, FileService fileService, Sender sender, IFeginWebsocket feginWebsocket, + TabulateRedisServiceImpl tabulateRedisService) { this.exportLogService = exportLogService; this.exportLogs = exportLogs; this.poolPaperService = poolPaperService; @@ -164,7 +164,7 @@ public class PoolAddTaxThread extends BaseThread { } if (prams.get("kpksrq") != null && !"".equals(prams.get("kpksrq"))) { pramsMap.put("kpksrq", - DateUtils.getMorning(DateUtils.strToDate(prams.get("kpksrq").toString()))); + DateUtils.getMorning(DateUtils.strToDate(prams.get("kpksrq").toString()))); } if (prams.get("kpjsrq") != null && !"".equals(prams.get("kpjsrq"))) { pramsMap.put("kpjsrq", DateUtils.getNight(DateUtils.strToDate(prams.get("kpjsrq").toString()))); @@ -180,7 +180,7 @@ public class PoolAddTaxThread extends BaseThread { pramsMap.put("qsyf", prams.get("qsyf")); } if (prams.get("inAccountMonth") == null && "".equals(prams.get("inAccountMonth")) - && !"1".equals(prams.get("inAccountStatus"))) { + && !"1".equals(prams.get("inAccountStatus"))) { pramsMap.put("inAccountMonth", ""); }else { pramsMap.put("inAccountMonth", inAccountMonth); @@ -197,7 +197,6 @@ public class PoolAddTaxThread extends BaseThread { pramsMap.put("inAccountStatus", inAccountStatus); pramsMap.put("company", company); pramsMap.put("invoiceSource",prams.getString("invoiceSource")); - log.info("传入的参数为:{}",pramsMap); // 导出文件名 StringBuilder ftpFileName = new StringBuilder(); ftpFileName.append(fileNamePrefix); @@ -225,7 +224,6 @@ public class PoolAddTaxThread extends BaseThread { StringBuilder excelFile = new StringBuilder(); excelFile.append(fileService.getLocalPathDefault()); excelFile.append(ftpFileName.toString()); - log.info("导出的文件名字为:{}",excelFile.toString()); File filePath = new File(getFilePath(excelFile.toString())); if (!filePath.exists()) { filePath.mkdirs(); @@ -247,12 +245,12 @@ public class PoolAddTaxThread extends BaseThread { // 递归导出数据到excel 发票信息 this.cicleExport(pramsMap, default_curr, excelFile.toString(), out, writer); -// this.detailCicleExport(pramsMap, default_curr, excelFile.toString(), out, writer); -// writer.finish(); + this.detailCicleExport(pramsMap, default_curr, excelFile.toString(), out, writer); + writer.finish(); // FTP文件存储路径 String[] toDay = DateUtil.today().split("-"); String ftpFilePath = fileService.getPathPrefix() + userName + "/" + "excelFile/" + toDay[0] + "/" - + toDay[1] + "/" + toDay[2] + "/" + ftpFileName.toString(); + + toDay[1] + "/" + toDay[2] + "/" + ftpFileName.toString(); // 文件上传ftp fileService.uploadFile(ftpFilePath, excelFile.toString()); @@ -277,7 +275,6 @@ public class PoolAddTaxThread extends BaseThread { // 记录导出出错状态 exportLogService.updateFail(id, errmsg, dbName); } finally { - writer.finish(); // 发送导出消息到mq String responseResult = JsonResponseUtils.responseResult(msg); sender.sendToMsg(responseResult); @@ -303,7 +300,7 @@ public class PoolAddTaxThread extends BaseThread { */ private boolean cicleExport(Map pramsMap, int curr, String excelFile, OutputStream out, - ExcelWriter writer) throws Exception { + ExcelWriter writer) throws Exception { // 查询指定页数的数据 JSONObject pageData = poolPaperService.listAddTaxInvoice(pramsMap, curr, default_size); boolean hasNext = pageData.getBooleanValue("hasNext"); @@ -343,7 +340,7 @@ public class PoolAddTaxThread extends BaseThread { */ private boolean detailCicleExport(Map pramsMap, int curr, String excelFile, OutputStream out, - ExcelWriter writer) throws Exception { + ExcelWriter writer) throws Exception { // 查询指定页数的数据 JSONObject pageData = poolPaperService.listAddTaxInvoiceDetail(pramsMap, curr, default_size); boolean hasNext = pageData.getBooleanValue("hasNext"); @@ -358,20 +355,20 @@ public class PoolAddTaxThread extends BaseThread { int nextPage = pageData.getIntValue("nextPage"); // 写入当前页数据 exportListArrayToExcel(excelFile, title, detailTitleColumns, dataList, firstPage, false, 2, "货物信息", out, - writer); + writer); // 更新页数 return detailCicleExport(pramsMap, nextPage, excelFile, out, writer); } else { // 写入最后一页数据 exportListArrayToExcel(excelFile, title, detailTitleColumns, dataList, firstPage, true, 2, "货物信息", out, - writer); + writer); return hasNext; } } public void exportListArrayToExcel(String excelFile, String title, String[] titleColumns, List dataList, - boolean firstPage, boolean lastPage, int sheetNo, String sheetName, OutputStream out, ExcelWriter writer) { + boolean firstPage, boolean lastPage, int sheetNo, String sheetName, OutputStream out, ExcelWriter writer) { String[] datas; if (firstPage) { @@ -388,9 +385,8 @@ public class PoolAddTaxThread extends BaseThread { String titleColumn = datas[var12]; titles.add(Collections.singletonList(titleColumn)); } - log.info("导出文件的标头为:{}",titles); - writeTable.setHead(titles); + writeTable.setHead(titles); List> list = new ArrayList<>(); for (String[] strings : dataList) { From e3fa093c694de406a6f1607a028869cd5c2657ce Mon Sep 17 00:00:00 2001 From: yefei Date: Sat, 29 Apr 2023 19:57:49 +0800 Subject: [PATCH 10/33] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E8=BF=9B?= =?UTF-8?q?=E9=A1=B9=E5=A2=9E=E5=80=BC=E7=A8=8E=E5=AF=BC=E5=87=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-common/src/main/java/com/dxhy/common/util/ExcelPoiUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-common/src/main/java/com/dxhy/common/util/ExcelPoiUtil.java b/dxhy-common/src/main/java/com/dxhy/common/util/ExcelPoiUtil.java index 642a7f99..bfbe7f44 100644 --- a/dxhy-common/src/main/java/com/dxhy/common/util/ExcelPoiUtil.java +++ b/dxhy-common/src/main/java/com/dxhy/common/util/ExcelPoiUtil.java @@ -137,6 +137,7 @@ public class ExcelPoiUtil { } cn.hutool.poi.excel.ExcelWriter writer1 = ExcelUtil.getWriter(true); writer = EasyExcel.write(excelFile).registerWriteHandler(new CustomCellWriteHandler()).build(); + log.info("title={}",title); writeSheet = EasyExcel.writerSheet(1).sheetName(title).build(); writeTable = EasyExcel.writerTable().head(titles).build(); writer.write(list, writeSheet, writeTable); From dab7a91cdf86bb41d5f55a3249d05b7d7e39bb24 Mon Sep 17 00:00:00 2001 From: yefei Date: Sat, 29 Apr 2023 19:59:56 +0800 Subject: [PATCH 11/33] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E8=BF=9B?= =?UTF-8?q?=E9=A1=B9=E5=A2=9E=E5=80=BC=E7=A8=8E=E5=AF=BC=E5=87=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/core/thread/QypcsmkpExportThread.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java index e88cdb68..58339824 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java @@ -142,7 +142,7 @@ public class QypcsmkpExportThread extends BaseThread { } ftpFileName.append(DateUtils.getNowTimeStamp()); - title = ftpFileName.toString(); +// title = ftpFileName.toString(); ftpFileName.append(fileNameSurfix); // 本地文件存储路径 From 4519038cbe7ce5f36736c4ce81f97fb7c01eb9d5 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 1 May 2023 10:12:28 +0800 Subject: [PATCH 12/33] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E5=88=87=E6=8D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/controller/SDNYMainProcessController.java | 1 + 1 file changed, 1 insertion(+) 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 2265be7d..f99c1ef7 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 @@ -396,6 +396,7 @@ public class SDNYMainProcessController extends AbstractController { String dbName = "business"; // 入参统一在入口处理 String orgCode = snRequestObject.getCompCode(); + DynamicContextHolder.push(DbConstant.BASICS_READ); SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(orgCode); log.info("查询的组织信息为:{}",JSONObject.toJSONString(orgByCompCode)); String company = orgByCompCode.getCompany(); From 8cfa5d9d8cf9403e9b414152d77a9f563ae3c730 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 1 May 2023 10:39:11 +0800 Subject: [PATCH 13/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/SDNYMainProcessController.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 f99c1ef7..4b8bb024 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 @@ -474,8 +474,10 @@ public class SDNYMainProcessController extends AbstractController { //删除对应的影像号 QueryWrapper recordWrapper = new QueryWrapper<>(); recordWrapper.eq("image_id", imageId); - BaseTDxRecordInvoice baseTDxRecordInvoice = baseTDxRecordInvoiceDao.selectOne(recordWrapper); - if(baseTDxRecordInvoice != null){ +// BaseTDxRecordInvoice baseTDxRecordInvoice = baseTDxRecordInvoiceDao.selectOne(recordWrapper); + List baseTDxRecordInvoices = baseTDxRecordInvoiceDao.selectList(recordWrapper); +// if(baseTDxRecordInvoice != null){ + if(baseTDxRecordInvoices != null && baseTDxRecordInvoices.size() > 0){ log.info("TDxRecordInvoice表中匹配到数据"); BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice(); recordInvoice.setImageId(""); @@ -490,8 +492,9 @@ public class SDNYMainProcessController extends AbstractController { QueryWrapper reimburseWrapper = new QueryWrapper<>(); reimburseWrapper.eq("image_id", imageId); - TDxInvoiceReimburse reimburse1 = mixedSignatureDao.selectOne(reimburseWrapper); - if(reimburse1 != null){ +// TDxInvoiceReimburse reimburse1 = mixedSignatureDao.selectOne(reimburseWrapper); + List tDxInvoiceReimburses = mixedSignatureDao.selectList(reimburseWrapper); + if(tDxInvoiceReimburses != null && tDxInvoiceReimburses.size() > 0){ log.info("TDxInvoiceReimburse表中匹配到数据"); TDxInvoiceReimburse tDxInvoiceReimburse = new TDxInvoiceReimburse(); tDxInvoiceReimburse.setImageId(""); From a6196703b5276653962ef8e68e08dd2c21ad2db8 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 1 May 2023 10:56:06 +0800 Subject: [PATCH 14/33] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0select=5Fid?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/service/SNPushCheckRecordService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index 5b7b773a..f5edb29a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -676,7 +676,9 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { reimburse.setXfTaxNo(invoice.getSalesTaxNo()); reimburse.setXfAddressAndPhone(invoice.getSalesAddressPhone()); reimburse.setXfBankAndNo(invoice.getSalesBank()); - reimburse.setSelectId(UUID.randomUUID().toString().replace("-", "")); + String uuid = UUID.randomUUID().toString().replace("-", ""); + log.info("uuid={}",uuid); + reimburse.setSelectId(uuid); reimburse.setTaxRate(invoice.getTaxRate()); reimburse.setTaxCode(getTaxCode(invoice.getTaxRate())); From a0644f20cc2ac8dbd9be3142d8d965aad2d7b276 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 1 May 2023 11:43:06 +0800 Subject: [PATCH 15/33] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0select=5Fid?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/service/openservice/model/ocr/OcrDataTypeEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/openservice/model/ocr/OcrDataTypeEnum.java b/dxhy-core/src/main/java/com/dxhy/core/service/openservice/model/ocr/OcrDataTypeEnum.java index 9a5cfbe1..b9c352a7 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/openservice/model/ocr/OcrDataTypeEnum.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/openservice/model/ocr/OcrDataTypeEnum.java @@ -33,7 +33,7 @@ public enum OcrDataTypeEnum { VAT_INVOICE_GOODS_LIST ("vat_invoice_goods_list","货物或服务名称"), VAT_INVOICE_GOODS("vat_invoice_goods","货物或服务名称"), VAT_INVOICE_PRICE_LIST ("vat_invoice_price_list","金额明细"), - VAT_INVOICE_PRICE ("vat_invoice_price","金额明细"), + VAT_INVOICE_PRICE ("vat_invoice_price","合计"), VAT_INVOICE_TAX_RATE_LIST ("vat_invoice_tax_rate_list","税率明细"), VAT_INVOICE_TAX_LIST ("vat_invoice_tax_list","税额明细"), VAT_INVOICE_TAX ("vat_invoice_tax","税额明细"), From 7cd11c1f6f736e554150120adde423d20a238284 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 1 May 2023 15:10:07 +0800 Subject: [PATCH 16/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/core/controller/DictDataController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/DictDataController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/DictDataController.java index 951a9484..b7adb0ca 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/DictDataController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/DictDataController.java @@ -32,6 +32,7 @@ public class DictDataController extends AbstractController { @PostMapping("/getDict") public ResponseEntity getDict(@RequestBody Map map) { + log.info("查询字典接收到的参数====>{}",map); String dictType = (String)map.get("dictType"); if (StringUtils.isBlank(dictType)) { return ResponseEntity.ok(R.error().put("data", "字典编码不能为空")); @@ -41,6 +42,8 @@ public class DictDataController extends AbstractController { for (String code : codes) { List models = dictdetaServcice.selectDictdeta(code); json.put(code, models); + log.info("在redis中查询参数为{}",code); + log.info("redis返回的值为{}",models); } return ResponseEntity.ok(R.ok().put("data", json)); From 8170330168bf4fcc89dbc08f4f7821bd22dc7b49 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 1 May 2023 15:12:16 +0800 Subject: [PATCH 17/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/core/controller/DictDataController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/DictDataController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/DictDataController.java index b7adb0ca..d4dc4da9 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/DictDataController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/DictDataController.java @@ -38,6 +38,7 @@ public class DictDataController extends AbstractController { return ResponseEntity.ok(R.error().put("data", "字典编码不能为空")); } String[] codes = dictType.split(";"); + log.info("codes数组的值{}",codes); JSONObject json = new JSONObject(); for (String code : codes) { List models = dictdetaServcice.selectDictdeta(code); From fde3cda0a2cb286a3b3cfe260c3d02d2073e6abd Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 1 May 2023 21:35:46 +0800 Subject: [PATCH 18/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/controller/mailGather/EmailMaintainController.java | 2 +- .../com/dxhy/customs/service/impl/CustomsSignServiceImpl.java | 2 ++ .../src/main/resources/mapper/ExtInvoicePoolMapper.xml | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java index a4e1480e..c470b937 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java @@ -290,7 +290,7 @@ public class EmailMaintainController extends AbstractController { String jsonString = Base64.encode(json.toJSONString()); return ResponseEntity.ok(R.ok().put("data",jsonString)); }else{ - return ResponseEntity.ok(R.ok().put("data","未查询到用户名为"+userName+"数据")); + return ResponseEntity.ok(R.error().put("data","未查询到用户名为"+userName+"数据")); } } 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 9285755b..94d4daf2 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 @@ -466,6 +466,8 @@ public class CustomsSignServiceImpl extends MpBaseServiceImpl(); JSONObject tabulateMenu = tabulateRedisService.getTabulateMenu(company, menuId); resultData.putTabulateMenu(tabulateMenu); + resultData.setNumberSerial(false); + resultData.setTotal(returnList.size()); return resultData.setDataList(returnList).toJsonBase(); } diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index e1f96b24..284e7cce 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -346,6 +346,10 @@ AND create_date between #{cjksyf} and #{cjjsyf} + AND gf_tax_no in + + #{item} + AND invoice_date between #{kpksrq} and #{kpjsrq} From 9c107dad954aa39a7e42b13eaeb41c1fd162d2b7 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 1 May 2023 22:26:45 +0800 Subject: [PATCH 19/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/controller/mailGather/EmailMaintainController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java index c470b937..df46e08c 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java @@ -18,6 +18,7 @@ import com.google.common.collect.Lists; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -290,7 +291,9 @@ public class EmailMaintainController extends AbstractController { String jsonString = Base64.encode(json.toJSONString()); return ResponseEntity.ok(R.ok().put("data",jsonString)); }else{ - return ResponseEntity.ok(R.error().put("data","未查询到用户名为"+userName+"数据")); + R result = new R(500,"未查询到用户名为"+userName+"数据"); +// return ResponseEntity.ok(R.error().put("data","未查询到用户名为"+userName+"数据")); + return ResponseEntity.ok(result); } } From 4fe983a7e8a2961d83b0939ce872591c37571ddd Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 1 May 2023 22:51:44 +0800 Subject: [PATCH 20/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/controller/mailGather/EmailMaintainController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java index df46e08c..084cec95 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java @@ -291,7 +291,7 @@ public class EmailMaintainController extends AbstractController { String jsonString = Base64.encode(json.toJSONString()); return ResponseEntity.ok(R.ok().put("data",jsonString)); }else{ - R result = new R(500,"未查询到用户名为"+userName+"数据"); + R result = new R(500,"未查询到该用户"); // return ResponseEntity.ok(R.error().put("data","未查询到用户名为"+userName+"数据")); return ResponseEntity.ok(result); } From c8a4ae23a0ef72fc000e81cf8de3bef1a59cba38 Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 2 May 2023 09:36:41 +0800 Subject: [PATCH 21/33] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3OCR=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openservice/impl/OpenServicePlatformServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/openservice/impl/OpenServicePlatformServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/openservice/impl/OpenServicePlatformServiceImpl.java index 1e44ea59..92dcb2bf 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/openservice/impl/OpenServicePlatformServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/openservice/impl/OpenServicePlatformServiceImpl.java @@ -294,7 +294,7 @@ public class OpenServicePlatformServiceImpl implements IOpenServicePlatformServi invoiceOcrData.setGMFDZDH(itemData.get(OcrDataTypeEnum.VAT_INVOICE_PAYER_ADDR_TELL.getKey())); invoiceOcrData.setGMFYHZH(itemData.get(OcrDataTypeEnum.VAT_INVOICE_PAYER_BANK_ACCOUNT.getKey())); - invoiceOcrData.setHJJE(itemData.get(OcrDataTypeEnum.VAT_INVOICE_PRICE_LIST.getKey())); + invoiceOcrData.setHJJE(itemData.get(OcrDataTypeEnum.VAT_INVOICE_PRICE.getKey())); //是否代开 vat_invoice_zhuan_yong_flag TODO From a2526d265fff7faaf8035e6fd2c2e56ad2ad8bcc Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 2 May 2023 09:57:06 +0800 Subject: [PATCH 22/33] =?UTF-8?q?ariesy=20=E8=AE=BE=E7=BD=AE=E6=89=80?= =?UTF-8?q?=E6=9C=89=E5=85=AC=E5=8F=B8=E6=89=AB=E6=8F=8F=E4=BB=AA=E8=B0=83?= =?UTF-8?q?=E7=94=A8OCR=E6=96=B9=E5=BC=8F=E4=B8=BA=E4=BA=91=E7=AB=AF?= =?UTF-8?q?=E8=AF=86=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java index 880ae096..f7a78858 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java @@ -117,6 +117,7 @@ public class SysUserServiceImpl extends ServiceImpl i user.setCreateTime(new Date()); String salt = RandomStringUtils.randomAlphanumeric(20); user.setSalt(salt); + user.setScanType("5"); user.setPlpassword(Base64.encode(user.getPassword())); user.setPassword(new BCryptPasswordEncoder(UserConstant.PW_ENCORDER_SALT).encode(user.getPassword())); this.saveOrUpdate(user); From 80ded3e53bded4c352bcfc7b335005e125fe9cfe Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 2 May 2023 14:12:50 +0800 Subject: [PATCH 23/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/index/ExtIndexStatisticsMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml b/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml index f7b09135..a8e1631c 100644 --- a/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml @@ -1628,8 +1628,8 @@ and invoice_status != 0 - and DATE_FORMAT( status_update_date, '%Y-%m' ) = DATE_FORMAT( now( ), '%Y-%m' ) + + + + From 94118d7882cc7007d2fb7cb22f8f2b61616fc5b7 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 2 May 2023 17:03:24 +0800 Subject: [PATCH 24/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java index bf07e630..83d746af 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java @@ -303,7 +303,9 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl Date: Tue, 2 May 2023 17:22:49 +0800 Subject: [PATCH 25/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java index 83d746af..212c67aa 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java @@ -300,7 +300,7 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl Date: Tue, 2 May 2023 17:27:36 +0800 Subject: [PATCH 26/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java index 212c67aa..ffad0269 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java @@ -127,6 +127,7 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl Date: Tue, 2 May 2023 17:31:54 +0800 Subject: [PATCH 27/33] =?UTF-8?q?ariesy=20=E8=AE=BE=E7=BD=AE=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=A8=8E=E6=AC=BE=E6=89=80=E5=B1=9E=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/service/SNPushCheckRecordService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index f5edb29a..979f455a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -169,7 +169,13 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { recordInvoice.setGfName(gfmc); recordInvoice.setRzlx("5"); recordInvoice.setYqsqStatus("1"); - recordInvoice.setYqCurrentPeriod(current.getCurrentTaxPeriod()); + if(current != null) { + recordInvoice.setYqCurrentPeriod(current.getCurrentTaxPeriod()); + }else{ + SimpleDateFormat format = new SimpleDateFormat("yyyyMM"); + String month = format.format(new Date()); + recordInvoice.setYqCurrentPeriod(month); + } recordInvoice.setCreateDate(new Date()); recordInvoice.setYqsqDate(new Date()); recordInvoice.setSourceSystem("2"); From a5fc7cec0eaddae361d14131ced4abb9c4c7c9c2 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 2 May 2023 19:50:27 +0800 Subject: [PATCH 28/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java index ffad0269..cef73746 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java @@ -305,8 +305,8 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl Date: Wed, 3 May 2023 09:29:25 +0800 Subject: [PATCH 29/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseReceiptInvoiceServiceImpl.java | 68 ++++++++++++------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptInvoiceServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptInvoiceServiceImpl.java index 0fcc0348..04fcb0f5 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptInvoiceServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptInvoiceServiceImpl.java @@ -64,14 +64,15 @@ public class BaseReceiptInvoiceServiceImpl extends MpBaseServiceImpl voList = new ArrayList<>(); int index = 1; - for (BaseTDxRecordInvoice record : pageInfo.getRecords()) { - BaseInvoiceRespVO vo = convertToInvoiceView(record); - // 序号计算 = (当前页-1)*每页条数+1 - vo.setXh((page.getCurrent() - 1) * page.getSize() + index); - index++; - voList.add(vo); + if (pageInfo.getRecords() != null && pageInfo.getRecords().size() > 0){ + for (BaseTDxRecordInvoice record : pageInfo.getRecords()) { + BaseInvoiceRespVO vo = convertToInvoiceView(record); + // 序号计算 = (当前页-1)*每页条数+1 + vo.setXh((page.getCurrent() - 1) * page.getSize() + index); + index++; + voList.add(vo); + } } - // 设置记录总数 json.put("total", pageInfo.getTotal()); json.put("datalist", voList); @@ -84,13 +85,17 @@ public class BaseReceiptInvoiceServiceImpl extends MpBaseServiceImpl Date: Wed, 3 May 2023 10:09:01 +0800 Subject: [PATCH 30/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/service/SNPushCheckRecordService.java | 1 + .../service/impl/SignSaveInvoiceInfoServiceImpl.java | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index 979f455a..65278b6a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -483,6 +483,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { snDetailMap.put("commodityName", detail.getString("hwmc")); snDetailMap.put("specificationModel", detail.getString("ggxh")); snDetailMap.put("unit", detail.getString("jldw")); + snDetailMap.put("detailNo",detail.getString("mxbh")); String quantity = detail.getString("spsl"); // if (quantity.length() > 3) { // int index = quantity.indexOf("."); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java index cef73746..f1e19343 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java @@ -308,19 +308,19 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl Date: Wed, 3 May 2023 11:22:41 +0800 Subject: [PATCH 31/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 284e7cce..e580e82a 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -325,7 +325,7 @@ invoice_no invoiceNo, DATE_FORMAT(invoice_date,'%Y-%m-%d') invoiceDate, DATE_FORMAT(create_date,'%Y-%m-%d') createDate, - total_amount invoiceAmount, + invoice_amount invoiceAmount, qs_status qszt, DATE_FORMAT(qs_date,'%Y-%m-%d') qsrq, qs_type qsfs, From 811eb10f96ae98d263012e62de9fd668bdd37538 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 3 May 2023 14:32:11 +0800 Subject: [PATCH 32/33] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E9=9D=9E?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=A8=8E=E5=8F=B7=E6=9F=A5=E9=AA=8C=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/core/util/InvoiceQueryUtil.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/util/InvoiceQueryUtil.java b/dxhy-core/src/main/java/com/dxhy/core/util/InvoiceQueryUtil.java index f0aa057e..b2472ff8 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/util/InvoiceQueryUtil.java +++ b/dxhy-core/src/main/java/com/dxhy/core/util/InvoiceQueryUtil.java @@ -152,9 +152,11 @@ public class InvoiceQueryUtil { // 通过税号获取id和key log.info("查验一张发票信息税号为 taxNo{}",taxNo); TAcOrg tacOrg = confirmDao.findIdAndKeyByTaxno(taxNo); - if(enterprisePermissionFlag){ - secretId = tacOrg.getAceId(); - secretKey = tacOrg.getAceKey(); + if(tacOrg != null) { + if (enterprisePermissionFlag) { + secretId = tacOrg.getAceId(); + secretKey = tacOrg.getAceKey(); + } } try { InvoiceUtil iu = new InvoiceUtil(invoiceCode); From 427e105de96e80ff85f82b6112575cebb3fe2be5 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 3 May 2023 14:41:46 +0800 Subject: [PATCH 33/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/controller/SDNYMainProcessController.java | 8 ++++++++ .../com/dxhy/erp/service/SNPushCheckRecordService.java | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) 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 4b8bb024..a84f03b8 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 @@ -401,6 +401,7 @@ public class SDNYMainProcessController extends AbstractController { log.info("查询的组织信息为:{}",JSONObject.toJSONString(orgByCompCode)); String company = orgByCompCode.getCompany(); String taxno = orgByCompCode.getTaxno(); + String taxname = orgByCompCode.getTaxname(); String result = ""; @@ -414,6 +415,7 @@ public class SDNYMainProcessController extends AbstractController { TDxInvoiceReimburse reimburse = new TDxInvoiceReimburse(); reimburse.setImageId(imageId); reimburse.setCompCode(compCode); + reimburse.setGfName(taxname); SNSAPObject object = new SNSAPObject(); object.setSYSID("FPXT"); @@ -439,6 +441,12 @@ public class SDNYMainProcessController extends AbstractController { for (SNInvoice invoice : invoiceInfoList) { String fplxdm = ""; String snFplx = ""; + if (invoice.getPurchaserTaxNo() == null || "".equals(invoice.getPurchaserTaxNo())){ + invoice.setPurchaserTaxNo(taxno); + } + if (invoice.getPurchaserName() == null || "".equals(invoice.getPurchaserName())){ + invoice.setPurchaserName(taxname); + } result = snPushCheckRecordService.updateInvoicePoll(company, taxno, reimburse, invoice, fplxdm, imageId, compCode); //价税分离判断 diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index 65278b6a..046eb4ba 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -165,8 +165,8 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { } recordInvoice.setXfTaxNo(xfsh); - recordInvoice.setGfTaxNo(gfsbh); - recordInvoice.setGfName(gfmc); +// recordInvoice.setGfTaxNo(gfsbh); +// recordInvoice.setGfName(gfmc); recordInvoice.setRzlx("5"); recordInvoice.setYqsqStatus("1"); if(current != null) { @@ -206,6 +206,8 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice(); recordInvoice.setImageId(imageId); recordInvoice.setCompCode(compCode); + recordInvoice.setGfTaxNo(snInvoice.getPurchaserTaxNo()); + recordInvoice.setGfName(snInvoice.getPurchaserName()); update = baseTDxRecordInvoiceDao.update(recordInvoice, recordWrapper);