From 41e1e2c7dc3f7ac538a8dd7a75d84adbd6aaeb95 Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 30 May 2023 19:31:29 +0800 Subject: [PATCH 01/21] =?UTF-8?q?ariesy=20=E5=AF=BC=E5=87=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E8=83=BD=E8=B6=85=E8=BF=875000=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/core/thread/FpcjhzExportThread.java | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/FpcjhzExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/FpcjhzExportThread.java index c2b775a8..9c0c6796 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/FpcjhzExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/FpcjhzExportThread.java @@ -169,14 +169,18 @@ public class FpcjhzExportThread extends BaseThread { excelFile.append(ftpFileName.toString()); // 递归导出数据到excel - this.cicleExport(pramsMap, default_curr, excelFile.toString(), jsonObject); - - // FTP文件存储路径 - String[] toDay = DateUtil.today().split("-"); - String ftpFilePath = fileService.getPathPrefix() + userName + "/" + "excelFile/" + toDay[0] + "/" - + toDay[1] + "/" + toDay[2] + "/" + ftpFileName.toString(); - // 文件上传ftp - fileService.uploadFile(ftpFilePath, excelFile.toString()); + String ftpFilePath = ""; + String rtnMsg = this.cicleExport(pramsMap, default_curr, excelFile.toString(), jsonObject); + if("ok".equals(rtnMsg)) { + // FTP文件存储路径 + String[] toDay = DateUtil.today().split("-"); + ftpFilePath = fileService.getPathPrefix() + userName + "/" + "excelFile/" + toDay[0] + "/" + + toDay[1] + "/" + toDay[2] + "/" + ftpFileName.toString(); + // 文件上传ftp + fileService.uploadFile(ftpFilePath, excelFile.toString()); + }else{ + ftpFilePath = rtnMsg; + } // 设置成功消息内容 msg.put("title", super.getSuccTitle(title)); @@ -222,12 +226,15 @@ public class FpcjhzExportThread extends BaseThread { * */ - private boolean cicleExport(Map pramsMap, int curr, String excelFile, JSONObject jsonObject) + private String cicleExport(Map pramsMap, int curr, String excelFile, JSONObject jsonObject) throws Exception { // 查询指定页数的数据 JSONObject pageData = fpcjService.selectByGfshAndCjrq(pramsMap, curr, default_size); boolean hasNext = pageData.getBooleanValue("hasNext"); List dataList = (List)pageData.get("datalist"); + if(dataList.size() > 5000){ + return "数据不能超过5000条"; + } boolean firstPage = false; if (curr == default_curr) { @@ -243,7 +250,7 @@ public class FpcjhzExportThread extends BaseThread { // 写入当前页数据 ExcelPoiUtil.exportListArrayToExcel1(excelFile, title, jsonObject, dataList, firstPage, false); // 更新页数 - return cicleExport(pramsMap, nextPage, excelFile, jsonObject); + cicleExport(pramsMap, nextPage, excelFile, jsonObject); } else { // 写入最后一页数据 FpcjCjhzRespVO vo = new FpcjCjhzRespVO(); @@ -253,7 +260,7 @@ public class FpcjhzExportThread extends BaseThread { vo.setSe(hjse); dataList.add(vo); ExcelPoiUtil.exportListArrayToExcel1(excelFile, title, jsonObject, dataList, firstPage, true); - return hasNext; } + return "ok"; } } From 46bb8bcdeef3a398457fd2b6ad4653b52f268843 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 31 May 2023 08:48:18 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E7=9B=B8=E5=8F=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/base/controller/BaseInvoiceController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index ac966283..6e78530b 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -840,11 +840,11 @@ public class BaseInvoiceController extends AbstractController { String menuId = (String)map.get("menuId"); String company = (String)map.get("company"); - if (StringUtils.isNotBlank(inAccountStatus)){ + if (StringUtils.isBlank(inAccountStatus)){ return ResponseEntity.ok(R.error("入账状态不能为空")); } - if (StringUtils.isNotBlank(maxTax)){ + if (StringUtils.isBlank(maxTax)){ return ResponseEntity.ok(R.error("税额上限不能为空")); } From 09fa33b0a3761c3b061be31f6641c07caa6c02ce Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 31 May 2023 17:35:49 +0800 Subject: [PATCH 03/21] =?UTF-8?q?F1847=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/erp/model/ZDATA.java | 2 ++ .../service/impl/InvoiceAuthServiceImpl.java | 32 ++++++++++++------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/model/ZDATA.java b/dxhy-erp/src/main/java/com/dxhy/erp/model/ZDATA.java index 03cc5312..ca2c0887 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/model/ZDATA.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/model/ZDATA.java @@ -36,4 +36,6 @@ public class ZDATA { private String BELNR; @JsonProperty(value = "BUDAT") private String BUDAT; + @JsonProperty(value = "XXBS") + private String XXBS; } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java index f80d945f..dc16e642 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java @@ -19,6 +19,7 @@ import com.dxhy.erp.model.auth.InterfaceCode; import com.dxhy.erp.service.InvoiceAuthService; import com.dxhy.erp.service.TDxInvoiceReimburseService; import com.dxhy.erp.utils.CheckUtils; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; @@ -34,6 +35,7 @@ import java.util.*; */ @SuppressWarnings({"AlibabaMethodTooLong", "AlibabaUndefineMagicConstant"}) @Service +@Slf4j public class InvoiceAuthServiceImpl extends MpBaseServiceImpl implements InvoiceAuthService { @@ -362,8 +364,11 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl{}",xxbs); DynamicContextHolder.push("business"+DbConstant.BUSINESS_READ); - if(fplxList.contains(zdata1.getZFPLX())){ + if(fplxList.contains(zdata1.getZFPLX()) && !"X".equals(xxbs)){ TdxRecordInvoice recordInvoiceByUuid = tDxrecordInvoiceDao.getRecordInvoiceByUuid(uuid); if(recordInvoiceByUuid!=null){ UpdateWrapper updateWrapper = new UpdateWrapper(); @@ -419,17 +424,20 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl Date: Wed, 31 May 2023 18:34:30 +0800 Subject: [PATCH 04/21] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=99=BB=E9=99=86?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=9C=89=E6=97=A0=E8=B4=A6=E5=8F=B7=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/base/controller/BaseInvoiceController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index ac966283..91c4a375 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -565,6 +565,10 @@ public class BaseInvoiceController extends AbstractController { log.info("手工认证无税号{}",UserInfoUtil.getGfshAll(getUserInfo().getOrg())); } pramsMap.put("gfsh", gfshList); + if (gfshList == null || gfshList.size() == 0){ + pramsMap.put("sign","88"); + log.info("登陆账号无税号"); + } //所属组织 // List companyCodeList = new ArrayList<>(); From 0689ecf5162a4551af202efaf3807533ec9bb3ba Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 31 May 2023 19:01:39 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=99=BB=E9=99=86?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=9C=89=E6=97=A0=E8=B4=A6=E5=8F=B7=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/base/controller/BaseInvoiceController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index 91c4a375..958a4053 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -565,7 +565,8 @@ public class BaseInvoiceController extends AbstractController { log.info("手工认证无税号{}",UserInfoUtil.getGfshAll(getUserInfo().getOrg())); } pramsMap.put("gfsh", gfshList); - if (gfshList == null || gfshList.size() == 0){ + if (gfshList == null || gfshList.isEmpty()){ + log.info("gfshList.size(){}",gfshList.size()); pramsMap.put("sign","88"); log.info("登陆账号无税号"); } From 8a36240df0bfcc604f57bf63302e3f97f5036dde Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 31 May 2023 19:11:45 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E5=88=A4=E6=96=ADlist=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/base/controller/BaseInvoiceController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index 958a4053..aac1691b 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -565,8 +565,9 @@ public class BaseInvoiceController extends AbstractController { log.info("手工认证无税号{}",UserInfoUtil.getGfshAll(getUserInfo().getOrg())); } pramsMap.put("gfsh", gfshList); + log.info("gfshList.size(){}",gfshList.size()); if (gfshList == null || gfshList.isEmpty()){ - log.info("gfshList.size(){}",gfshList.size()); + pramsMap.put("sign","88"); log.info("登陆账号无税号"); } From 63cf3e3247740ecb86c23dee0c01c4f8e3b2519a Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 31 May 2023 19:30:55 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E5=88=A4=E6=96=ADlist=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/BaseInvoiceController.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index aac1691b..8b7cba2e 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -565,8 +565,20 @@ public class BaseInvoiceController extends AbstractController { log.info("手工认证无税号{}",UserInfoUtil.getGfshAll(getUserInfo().getOrg())); } pramsMap.put("gfsh", gfshList); - log.info("gfshList.size(){}",gfshList.size()); + + boolean flag = false; + if (gfshList == null || gfshList.isEmpty()){ + flag = true; + }else { + String s = gfshList.toString().replace("[","").replace("]",""); + if (StringHelper.isBlank(s)){ + flag = true; + } + } + + log.info("gfshList.size(){}",gfshList.size()); + if (flag){ pramsMap.put("sign","88"); log.info("登陆账号无税号"); From 44ae9a3b7ceec3fe1f56bb885d574e735380e9e1 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 31 May 2023 19:35:34 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E5=88=A4=E6=96=ADlist=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/base/controller/BaseInvoiceController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index 8b7cba2e..26992e0c 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -575,6 +575,12 @@ public class BaseInvoiceController extends AbstractController { if (StringHelper.isBlank(s)){ flag = true; } + if (StringHelper.isNotBlank(s) && s.contains(",")){ + String replace = s.replace(",", ""); + if (StringHelper.isBlank(replace)){ + flag = true; + } + } } log.info("gfshList.size(){}",gfshList.size()); From 596a8ef30473b8ddd254a9e0ecda830e17f45a38 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 31 May 2023 20:15:41 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E8=BF=9B=E9=A1=B9=E5=92=8C=E9=94=80?= =?UTF-8?q?=E9=A1=B9=E7=A5=A8=E6=B1=A0=E4=B8=8D=E9=9C=80=E8=A6=81=E4=B8=8A?= =?UTF-8?q?=E7=BA=A7=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseInvoiceController.java | 44 ++++++++++++------- .../controller/ExtInvoicePoolController.java | 39 +++++++++++++--- .../resources/mapper/ExtInvoicePoolMapper.xml | 44 ++++++++++++------- 3 files changed, 89 insertions(+), 38 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index 26992e0c..cc819f60 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -199,6 +199,13 @@ public class BaseInvoiceController extends AbstractController { gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); } pramsMap.put("gfsh", gfshList); + + boolean flag = checkList(gfshList); + + if (flag){ + pramsMap.put("sign","88"); + log.info("登陆账号无税号"); + } //所属组织 // List companyCodeList = new ArrayList<>(); // if (StringUtils.isNotBlank(companyCode)){ @@ -566,26 +573,10 @@ public class BaseInvoiceController extends AbstractController { } pramsMap.put("gfsh", gfshList); - boolean flag = false; - - if (gfshList == null || gfshList.isEmpty()){ - flag = true; - }else { - String s = gfshList.toString().replace("[","").replace("]",""); - if (StringHelper.isBlank(s)){ - flag = true; - } - if (StringHelper.isNotBlank(s) && s.contains(",")){ - String replace = s.replace(",", ""); - if (StringHelper.isBlank(replace)){ - flag = true; - } - } - } + boolean flag = checkList(gfshList); log.info("gfshList.size(){}",gfshList.size()); if (flag){ - pramsMap.put("sign","88"); log.info("登陆账号无税号"); } @@ -699,6 +690,25 @@ public class BaseInvoiceController extends AbstractController { } + public boolean checkList(List list) { + boolean flag =false; + if (list == null || list.isEmpty()){ + flag = true; + }else { + String s = list.toString().replace("[","").replace("]",""); + if (StringHelper.isBlank(s)){ + flag = true; + } + if (StringHelper.isNotBlank(s) && s.contains(",")){ + String replace = s.replace(",", ""); + if (StringHelper.isBlank(replace)){ + flag = true; + } + } + } + return flag; + } + /** * 智能勾选查询 qsfs 默认传9 * diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java index 881ce31f..d82b57e1 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java @@ -66,9 +66,14 @@ public class ExtInvoicePoolController extends AbstractController { // } // } gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); - if (gfshList.size() == 0) { - return ResponseEntity.ok(R.ok().put("data", "")); + boolean flag = checkList(gfshList); + if (flag){ + pramsMap.put("sign","88"); + log.info("登陆账号无税号"); } +// if (gfshList.size() == 0) { +// return ResponseEntity.ok(R.ok().put("data", "")); +// } pramsMap.put("gfsh", gfshList); if (pramsMap.get("cjksyf") != null && !"".equals(pramsMap.get("cjksyf"))) { pramsMap.put("cjksyf", DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("cjksyf").toString()))); @@ -219,10 +224,16 @@ public class ExtInvoicePoolController extends AbstractController { // return ResponseEntity.ok(R.ok().put("data", "")); // } // } + gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); - if (gfshList.size() == 0) { - return ResponseEntity.ok(R.ok().put("data", "")); - } + boolean flag = checkList(gfshList); + if (flag){ + pramsMap.put("sign","88"); + log.info("登陆账号无税号"); + } +// if (gfshList.size() == 0) { +// return ResponseEntity.ok(R.ok().put("data", "")); +// } pramsMap.put("taxno", gfshList); if (pramsMap.get("cjksyf") != null && !"".equals(pramsMap.get("cjksyf"))) { pramsMap.put("cjksyf", DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("cjksyf").toString()))); @@ -327,4 +338,22 @@ public class ExtInvoicePoolController extends AbstractController { System.out.println(replace); } } + public boolean checkList(List list) { + boolean flag =false; + if (list == null || list.isEmpty()){ + flag = true; + }else { + String s = list.toString().replace("[","").replace("]",""); + if (StringHelper.isBlank(s)){ + flag = true; + } + if (StringHelper.isNotBlank(s) && s.contains(",")){ + String replace = s.replace(",", ""); + if (StringHelper.isBlank(replace)){ + flag = true; + } + } + } + return flag; + } } diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 8ce721fb..9d93ab8e 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -69,10 +69,13 @@ like CONCAT('%',#{keyWord},'%') - and t.gf_tax_no in - - #{item} - + + and t.gf_tax_no in + + #{item} + + + and t.invoice_type = #{invoiceType} @@ -218,10 +221,13 @@ like CONCAT('%',#{keyWord},'%') - and t.gf_tax_no in - - #{item} - + + and t.gf_tax_no in + + #{item} + + + and t.invoice_type = #{invoiceType} @@ -506,10 +512,13 @@ like CONCAT('%',#{keyWord},'%') - and t.xf_tax_no in - - #{item} - + + and t.xf_tax_no in + + #{item} + + + and t.invoice_type = #{invoiceType} @@ -617,10 +626,13 @@ like CONCAT('%',#{keyWord},'%') - and t.xf_tax_no in - - #{item} - + + and t.xf_tax_no in + + #{item} + + + and t.invoice_type = #{invoiceType} From 5153fea813294fc7e3193ea97a76a8a6d1945d66 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 31 May 2023 20:44:34 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E8=BF=9B=E9=A1=B9=E5=92=8C=E9=94=80?= =?UTF-8?q?=E9=A1=B9=E7=A5=A8=E6=B1=A0=E5=AF=BC=E5=87=BA=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=B8=8E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/core/thread/PoolAddTaxThread.java | 24 ++++++++++ .../com/dxhy/core/thread/PoolSaleThread.java | 23 ++++++++++ .../main/resources/mapper/ExtPaperMapper.xml | 44 ++++++++++++------- 3 files changed, 75 insertions(+), 16 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 258fc5ea..3b90e0e4 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 @@ -181,6 +181,12 @@ public class PoolAddTaxThread extends BaseThread { } else { pramsMap.put("gfsh", gfshList); } + boolean flag = checkList(gfshList); + if (flag){ + pramsMap.put("sign","88"); + log.info("登陆账号无税号"); + } + if (cjksyf != null && !"".equals(cjksyf)) { pramsMap.put("cjksyf", DateUtils.getMorning(DateUtils.strToDate(cjksyf))); } @@ -468,4 +474,22 @@ public class PoolAddTaxThread extends BaseThread { return filePath.toString(); } + public boolean checkList(List list) { + boolean flag =false; + if (list == null || list.isEmpty()){ + flag = true; + }else { + String s = list.toString().replace("[","").replace("]",""); + if (StringHelper.isBlank(s)){ + flag = true; + } + if (StringHelper.isNotBlank(s) && s.contains(",")){ + String replace = s.replace(",", ""); + if (StringHelper.isBlank(replace)){ + flag = true; + } + } + } + return flag; + } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java index d0f6b017..5020384b 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java @@ -186,6 +186,11 @@ public class PoolSaleThread extends BaseThread { } else { pramsMap.put("gfsh", gfshList); } + boolean flag = checkList(gfshList); + if (flag){ + pramsMap.put("sign","88"); + log.info("登陆账号无税号"); + } if (cjksyf != null && !"".equals(cjksyf)) { pramsMap.put("cjksyf", DateUtils.getMorning(DateUtils.strToDate(cjksyf))); } @@ -468,4 +473,22 @@ public class PoolSaleThread extends BaseThread { return filePath.toString(); } + public boolean checkList(List list) { + boolean flag =false; + if (list == null || list.isEmpty()){ + flag = true; + }else { + String s = list.toString().replace("[","").replace("]",""); + if (StringHelper.isBlank(s)){ + flag = true; + } + if (StringHelper.isNotBlank(s) && s.contains(",")){ + String replace = s.replace(",", ""); + if (StringHelper.isBlank(replace)){ + flag = true; + } + } + } + return flag; + } } diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml index 51265a5a..07b88854 100644 --- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml +++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml @@ -293,10 +293,13 @@ like CONCAT('%',#{keyWord},'%') - and t.gf_tax_no in - - #{item} - + + and t.gf_tax_no in + + #{item} + + + and t.invoice_type = #{invoiceType} @@ -400,10 +403,13 @@ like CONCAT('%',#{keyWord},'%') - and t.xf_tax_no in - - #{item} - + + and t.xf_tax_no in + + #{item} + + + and t.invoice_type = #{invoiceType} @@ -559,10 +565,13 @@ like CONCAT('%',#{keyWord},'%') - and t.gf_tax_no in - - #{item} - + + and t.gf_tax_no in + + #{item} + + + and t.invoice_type = #{invoiceType} @@ -669,10 +678,13 @@ like CONCAT('%',#{keyWord},'%') - and t.xf_tax_no in - - #{item} - + + and t.xf_tax_no in + + #{item} + + + and t.invoice_type = #{invoiceType} From d78ed41566ddafc9b7fe0401000b0246fc87d837 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 31 May 2023 20:59:32 +0800 Subject: [PATCH 11/21] =?UTF-8?q?=E8=BF=9B=E9=A1=B9=E5=92=8C=E9=94=80?= =?UTF-8?q?=E9=A1=B9=E7=A5=A8=E6=B1=A0=E5=AF=BC=E5=87=BA=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=B8=8E=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml index 07b88854..e4ee55e0 100644 --- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml +++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml @@ -553,7 +553,7 @@ from ${dxhyTertiary}.t_dx_record_invoice t left JOIN ${dxhyDetail}.t_dx_record_invoice_detail b ON t.uuid = b.uuid - where t.detail_yesorno = '1' + where '1' = '1' AND t.create_date BETWEEN #{cjksyf} and #{cjjsyf} @@ -666,7 +666,7 @@ from ${dxhyTertiary}.t_dx_sale_record_invoice t left JOIN ${dxhyDetail}.t_dx_record_invoice_detail_sales b ON t.uuid = b.uuid - where t.detail_yesorno = '1' + where 1 = 1 AND t.create_date between #{cjksyf} and #{cjjsyf} From 70fe0b1d57adeb7da6f08fee888f938dae33bad9 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 31 May 2023 21:44:06 +0800 Subject: [PATCH 12/21] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E8=83=BD=E5=8B=BE=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 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 2f8895be..b230fa47 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 @@ -72,6 +72,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl{}",orgList); if (gfshList.size() == 0) { // 未从getUserInfo()获取到购方税号信息 @@ -124,10 +125,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl Date: Wed, 31 May 2023 23:30:46 +0800 Subject: [PATCH 13/21] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) 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 b230fa47..eaacf6a4 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 @@ -127,6 +127,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl queryWrapper = new QueryWrapper<>(); @@ -136,6 +137,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl Date: Thu, 1 Jun 2023 08:17:29 +0800 Subject: [PATCH 14/21] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/base/controller/BaseInvoiceController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index cc819f60..3767281e 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -874,11 +874,11 @@ public class BaseInvoiceController extends AbstractController { String menuId = (String)map.get("menuId"); String company = (String)map.get("company"); - if (StringUtils.isNotBlank(inAccountStatus)){ + if (StringUtils.isBlank(inAccountStatus)){ return ResponseEntity.ok(R.error("入账状态不能为空")); } - if (StringUtils.isNotBlank(maxTax)){ + if (StringUtils.isBlank(maxTax)){ return ResponseEntity.ok(R.error("税额上限不能为空")); } From 9f6c74151f8cfb6a3eb4aa17e4d87c98e434328b Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 1 Jun 2023 09:52:23 +0800 Subject: [PATCH 15/21] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=8B=BE=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/base/controller/BaseInvoiceController.java | 2 ++ dxhy-core/src/main/resources/mapper/FpZhMapper.xml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index 3767281e..251bca6c 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -873,6 +873,8 @@ public class BaseInvoiceController extends AbstractController { String maxTax = (String) map.get("maxTax"); String menuId = (String)map.get("menuId"); String company = (String)map.get("company"); + int curr = (int) map.get("curr"); + int size = (int) map.get("size"); if (StringUtils.isBlank(inAccountStatus)){ return ResponseEntity.ok(R.error("入账状态不能为空")); diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 28250108..4ced888f 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -100,7 +100,6 @@ and t.bdk_status in ('1','2') and t.export_mark = '0' and t.auth_status != '0' - and t.rzh_yesorno != '0' and t.company = #{company} and t.gf_tax_no in From e5cc8f1561572aed38e956231a57f51ad71c5ab6 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 1 Jun 2023 11:01:52 +0800 Subject: [PATCH 16/21] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=9C=AA=E8=BF=94=E5=9B=9E=E6=8A=B5=E6=89=A3?= =?UTF-8?q?=E7=A8=8E=E9=A2=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java | 5 +++++ dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java index ad822584..5b7f9c5f 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java @@ -81,12 +81,14 @@ public class BaseFpdrrzServiceImpl extends MpBaseServiceImpl queryRecord = new QueryWrapper<>(); queryRecord.eq("uuid", uuid); BaseTDxRecordInvoice rdxRecordInvoice = baseTDxRecordInvoiceDao.selectOne(queryRecord); + if (StringHelper.isNotBlank(rdxRecordInvoice.getDkTaxAmount().toPlainString())){ + rzlb.setDkse(rdxRecordInvoice.getDkTaxAmount().toPlainString()); + } if (rdxRecordInvoice != null) { if (list == null || list.size() == 0 || !list.contains(rdxRecordInvoice.getGfTaxNo())) { rzlb.setBkrzts("无该发票购方税号权限"); diff --git a/dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml index 68504cc7..8b883a47 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml @@ -13,7 +13,7 @@ select count(1) totalCount, ifnull(sum(invoice_amount), 0) totalAmount, ifnull(sum(dk_tax_amount), 0) totalTax FROM t_dx_record_invoice - WHERE valid='1' and invoice_type in ('01','03','08','14') AND invoice_status='0' AND + WHERE valid='1' and invoice_type in ('01','03','08','14','31') AND invoice_status='0' AND rzh_yesorno='1' and rzh_belong_date = #{skssq} @@ -54,7 +54,7 @@ SELECT ifnull(sum(out_tax_amount), 0) FROM t_dx_record_invoice - WHERE valid='1' and invoice_type in ('01','03','08','14','31') AND invoice_status='0' AND - rzh_yesorno='1' AND - out_status in ('1','2') + WHERE valid='1' + and (invoice_type in('01','03','08','14','31','283','161','183','185') or (invoice_type ='32' and t.lq_tdyslxDm='08')) + AND invoice_status='0' + AND rzh_yesorno='1' + AND out_status in ('1','2') and out_belong_date = #{skssq} @@ -69,9 +73,11 @@ out_reason rzhDate, ifnull(sum(out_tax_amount), 0) tax FROM t_dx_record_invoice - WHERE valid='1' and invoice_type in ('01','03','08','14','31') AND invoice_status='0' AND - rzh_yesorno='1' AND - out_status in ('1','2') + WHERE valid='1' + and (invoice_type in('01','03','08','14','31','283','161','183','185') or (invoice_type ='32' and t.lq_tdyslxDm='08')) + AND invoice_status='0' + AND rzh_yesorno='1' + AND out_status in ('1','2') and out_belong_date = #{skssq} From fa3ef763afcdcb5d2e110bb2b89ec037de1e3cf8 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Fri, 2 Jun 2023 10:50:23 +0800 Subject: [PATCH 20/21] =?UTF-8?q?Merge=20branch=20'test'=20of=20D:\?= =?UTF-8?q?=E6=A1=8C=E9=9D=A2\=E5=B1=B1=E8=83=BD\pt=20with=20conflicts.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/SDNYMainProcessController.java | 5 +++++ .../java/com/dxhy/erp/service/SNPushCheckRecordService.java | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 d3a54b26..7923e143 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 @@ -263,6 +263,8 @@ public class SDNYMainProcessController extends AbstractController { log.info("查验结果为:{}", checkInvoiceResult); } catch (Exception e) { e.printStackTrace(); + log.error("查验失败，errormsg:{}",e.getMessage()); + return ResponseEntity.ok(JSONObject.toJSONString(R.error("查验失败，"+e.getMessage()))); } if (!checkInvoiceResult.containsKey("code")) { @@ -452,6 +454,9 @@ public class SDNYMainProcessController extends AbstractController { for (int i = 0; i < detailList.size(); i++) { String taxRateDetail = ""; JSONObject detail = (JSONObject) detailList.get(i); + if(StringUtils.isNotEmpty(detail.getString("goodsName")) && detail.getString("goodsName").contains("详见销货清单")){ + continue; + } Map snDetailMap = new HashMap(); snDetailMap.put("rowNo", i + 1 + ""); snDetailMap.put("commodityCode", detail.getString("goodsNum")); 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 3f963953..46d5a178 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 @@ -451,7 +451,8 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { jsonObject.put("tonnage", invoiceData.get("dw")); jsonObject.put("limitPeople", invoiceData.get("xcrs")); String taxRate = ""; - if ("免税".equals(invoiceData.get("sl"))) { + if (invoiceData.get("sl")==null||StringUtils.isBlank(invoiceData.get("sl").toString())|| + "免税".equals(invoiceData.get("sl").toString())|| "不征税".equals(invoiceData.get("sl").toString()) || "***".equals(invoiceData.get("sl").toString())) { taxRate = "0"; jsonObject.put("taxRate", taxRate); } else { @@ -726,6 +727,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { reimburse.setTaxRate("0%"); reimburse.setTaxCode(getTaxCode(reimburse.getTaxRate())); } + reimburse.setIsDeduction(invoice.getIsDeductible()); if (StringUtils.isNoneBlank(reimburse.getInvoiceCode())) { From 712b4e1dfcbc8e986c03d858bd930c6e8a7d1add Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Fri, 2 Jun 2023 16:31:09 +0800 Subject: [PATCH 21/21] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/common/service/impl/DictdetaServciceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/dxhy-common/src/main/java/com/dxhy/common/service/impl/DictdetaServciceImpl.java b/dxhy-common/src/main/java/com/dxhy/common/service/impl/DictdetaServciceImpl.java index 7cf18049..a57096ad 100644 --- a/dxhy-common/src/main/java/com/dxhy/common/service/impl/DictdetaServciceImpl.java +++ b/dxhy-common/src/main/java/com/dxhy/common/service/impl/DictdetaServciceImpl.java @@ -34,7 +34,6 @@ public class DictdetaServciceImpl implements DictdetaServcice { @Override public String queryDictName(String type,String code) { - log.info("type={},code={}",type,code); String dictJson = redisUtils.get(RedisConstant.KEY_DICT + type); List dictdetaModels = JSON.parseArray(dictJson, DictdetaModel.class); Map collect = dictdetaModels.stream().collect(Collectors.toMap(DictdetaModel::getDictcode, DictdetaModel::getDictname));