From f38d38c44c3c813360a2902cb9b9e25157bca326 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 18 Apr 2023 10:12:21 +0800 Subject: [PATCH 01/56] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/SDNYMainProcessController.java | 3 +++ 1 file changed, 3 insertions(+) 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 e5ab319a..3f6502bc 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 @@ -528,6 +528,9 @@ public class SDNYMainProcessController extends AbstractController { info.setZCPXH(snInvoice.getBrandModel()); info.setZMHFZJJ(snInvoice.getCaacDevelopmentFund()); info.setZGFDH(snInvoice.getPurchaserAddressPhone()); + if (snInvoice.getSalesAddressPhone() == "nullnull"){ + info.setZGFDH(""); + } info.setZXFZH(snInvoice.getSalesBank()); info.setZJYM(snInvoice.getCheckCode()); info.setZSJDH(snInvoice.getInspectionListNo()); From f05d91ba54d0fb789dfb91c509d05eb3338934c5 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 18 Apr 2023 11:20:27 +0800 Subject: [PATCH 02/56] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/controller/SDNYMainProcessController.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 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 3f6502bc..bb9acbb2 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 @@ -466,12 +466,10 @@ public class SDNYMainProcessController extends AbstractController { String replace = taxRate.replace("%", ""); BigDecimal bigDecimal = new BigDecimal(replace); BigDecimal divide = bigDecimal.divide(new BigDecimal(100)); - taxRate = divide.toString(); - info.setZTAX(bigDecimal.multiply(new BigDecimal("0.01")).toString()); - info.setZSM(getZSM(taxRate)); - } - if (info.getZTAX() != null) { - info.setZSM(getZSM(info.getZTAX())); +// taxRate = divide.toString(); +// info.setZTAX(bigDecimal.multiply(new BigDecimal("0.01")).toString()); + info.setZTAX(replace+".00"); + info.setZSM(getZSM(divide.toString())); } if (info.getZTAX() == null || info.getZTAX() == "") { info.setZTAX("0.00"); From 1d400e70bdb7c151c0401e5b7dc692e5e0459d62 Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 18 Apr 2023 11:44:05 +0800 Subject: [PATCH 03/56] =?UTF-8?q?ariesy=20=E6=9B=B4=E6=96=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 145 +++++++++++++++++- .../controller/ExtCustomsController.java | 24 +++ .../main/resources/mapper/CustomsMapper.xml | 6 +- .../resources/mapper/ExtBbycfpcxMapper.xml | 11 +- 4 files changed, 175 insertions(+), 11 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 e5ab319a..849d6fca 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 @@ -1,5 +1,6 @@ package com.dxhy.erp.controller; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.dxhy.common.aspect.SysLog; import com.dxhy.common.constant.CommonConstants; @@ -70,7 +71,7 @@ public class SDNYMainProcessController extends AbstractController { @PostMapping("/sn/singleInvoiceCheck") @ResponseBody @SysLog("发票查验") - public ResponseEntity singleInvoiceCheck(@RequestBody Map pramsMap) { + public ResponseEntity singleInvoiceCheck(@RequestBody Map pramsMap) throws ParseException { log.info("传入的参数为:{}", pramsMap); String userid = "101833"; String dbName = "business"; @@ -128,6 +129,7 @@ public class SDNYMainProcessController extends AbstractController { log.info("发票类型为:{}", pramsMap.get("invoiceType")); String uuid = (StringUtils.isBlank(pramsMap.get("invoiceCode")) ? "" : pramsMap.get("invoiceCode")) + pramsMap.get("invoiceNo"); + log.info("uuid={}", uuid); String notes = invoiceQueryService.checkingInvoiceInfo("business", uuid, getUserInfo()); if (notes != null) { return ResponseEntity.ok(JSONObject.toJSONString(R.error(notes))); @@ -136,18 +138,25 @@ public class SDNYMainProcessController extends AbstractController { //查询底账库是否有对应发票，有则直接返回 TdxCheckRecordInvoice checkInvoiceByUuid = signCheckRecordService.getCheckInvoiceByUuid(uuid); if (checkInvoiceByUuid != null) { + log.info("进项票池已存在发票.直接返回票池信息"); R data = new R(1000, "default success"); - String checkInvoice = JSONObject.toJSONString(checkInvoiceByUuid); + JSONObject checkInvoice = (JSONObject) JSONObject.toJSON(checkInvoiceByUuid); + convertToResult(checkInvoice); + data.put("data", checkInvoice); return ResponseEntity.ok(JSONObject.toJSONString(data)); } else { TdxSaleRecordInvoice tdxSaleRecordInvoice = tdxSaleRecordInvoiceDao.selectByUuid(uuid); + log.info("tdxSaleRecordInvoice={}", tdxSaleRecordInvoice); if (tdxSaleRecordInvoice != null) { + log.info("销项票池已存在发票.直接返回票池信息"); R data = new R(1000, "default success"); - String checkInvoice = JSONObject.toJSONString(tdxSaleRecordInvoice); + JSONObject checkInvoice = (JSONObject) JSONObject.toJSON(tdxSaleRecordInvoice); + convertToResult(checkInvoice); + data.put("data", checkInvoice); return ResponseEntity.ok(JSONObject.toJSONString(data)); @@ -199,6 +208,136 @@ public class SDNYMainProcessController extends AbstractController { return ResponseEntity.ok(JSONObject.toJSONString(R.error().put("data", checkInvoiceResult))); } + private void convertToResult(JSONObject checkInvoice) throws ParseException { + checkInvoice.put("totalTax", checkInvoice.getString("taxAmount")); + checkInvoice.put("amountTax", checkInvoice.getString("totalAmount")); + checkInvoice.put("totalAmount", checkInvoice.getString("invoiceAmount")); + String invoiceCode = checkInvoice.get("invoiceCode").toString(); + String invoiceType = checkInvoice.get("invoiceType").toString(); + if ("22".equals(invoiceType)) { + invoiceType = "33"; + } + if ("21".equals(invoiceType)) { + invoiceType = "31"; + } + + checkInvoice.put("invoiceType", invoiceType); + checkInvoice.put("administrativeDivisionNo", ""); + checkInvoice.put("administrativeDivisionName", ""); + + checkInvoice.put("invoiceCode", invoiceCode); + checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString()); + + String kprq = checkInvoice.get("invoiceDate").toString(); + Date formatDat = new SimpleDateFormat("yyyyMMdd").parse(kprq); + String str = new SimpleDateFormat("yyyy-MM-dd").format(formatDat); + log.info("开票日期为:{} ", str); + + checkInvoice.put("billingDate", str); + checkInvoice.put("purchaserName", checkInvoice.get("gfName")); + checkInvoice.put("purchaserTaxNo", checkInvoice.get("gfTaxNo")); + checkInvoice.put("purchaserBank", checkInvoice.get("gfBankAndNo")); + checkInvoice.put("purchaserAddressPhone", checkInvoice.get("gfAddressAndPhone")); + checkInvoice.put("salesName", checkInvoice.get("xfName")); + checkInvoice.put("salesTaxNo", checkInvoice.get("xfTaxNo")); + checkInvoice.put("salesAddressPhone", checkInvoice.get("gfAddressAndPhone")); + checkInvoice.put("salesBank", checkInvoice.get("gfBankAndNo")); + checkInvoice.put("checkCode", checkInvoice.get("checkCode")); + String taxRate = ""; + + List> returnDetailList = new ArrayList<>(); +// JSONArray detailList = (JSONArray) invoiceData.get("detailList"); + JSONArray detailList = new JSONArray(); + + for (int i = 0; i < detailList.size(); i++) { + String taxRateDetail = ""; + JSONObject detail = (JSONObject) detailList.get(i); + Map snDetailMap = new HashMap(); + snDetailMap.put("rowNo", i + 1 + ""); + snDetailMap.put("commodityCode", detail.getString("ssflbm")); + snDetailMap.put("commodityName", detail.getString("hwmc")); + snDetailMap.put("specificationModel", detail.getString("ggxh")); + snDetailMap.put("unit", detail.getString("jldw")); + String quantity = detail.getString("spsl"); + if (quantity.length() > 3) { + int index = quantity.indexOf("."); + quantity = quantity.substring(0, index + 2); + } + snDetailMap.put("quantity", quantity); + + String unitPrice = detail.getString("bhsdj"); + if (unitPrice.length() > 3) { + int index = unitPrice.indexOf("."); + unitPrice = unitPrice.substring(0, index + 3); + } + + snDetailMap.put("unitPrice", unitPrice); + + + if ("11".equals(invoiceType)) { + snDetailMap.put("tax", "0"); + + //如果是卷票计算合计金额 + Float hjje = null; + if (detail.getString("se") != null && detail.getString("je") != null) { + Float je = Float.parseFloat(detail.getString("je")); + Float se = Float.parseFloat(detail.getString("se")); + hjje = je + se; + } + + if (hjje != null) + snDetailMap.put("amount", hjje.toString()); + + } else { + snDetailMap.put("tax", "***".equals(detail.getString("se")) ? "0.00" : detail.getString("se")); + snDetailMap.put("amount", detail.getString("je")); + } + + + if ("免税".equals(detail.getString("sl"))) { + taxRateDetail = "0"; + snDetailMap.put("taxRate", taxRateDetail); + } else { + if (detail.get("sl") != null && StringUtils.isNoneBlank(detail.get("sl").toString())) { + taxRateDetail = detail.get("sl").toString(); + if (!"0".equals(taxRateDetail)) { + if (StringUtils.isNoneBlank(taxRateDetail)) { + int index = taxRateDetail.indexOf("%"); + if (index > 0) { + taxRateDetail = taxRateDetail.substring(0, taxRateDetail.length() - 1); + Float num = Float.parseFloat(taxRateDetail); + if (num > 9) { + taxRateDetail = "0." + taxRateDetail; + } else { + if (!taxRateDetail.startsWith("0")) { + taxRateDetail = "0.0" + taxRateDetail; + } + } + } + } + } + + if ("11".equals(invoiceType)) { + taxRateDetail = "0.000"; + } + log.info("明细-发票税率为:{}", taxRateDetail); + snDetailMap.put("taxRate", taxRateDetail); + } + } + + log.info("明细-tax={}", detail.get("se")); + log.info("明细-commodityCode={}", detail.get("ssflbm")); + snDetailMap.put("currentDateEnd", detail.getString("txrqz")); + snDetailMap.put("currentDateStart", detail.getString("txrqq")); + snDetailMap.put("licensePlateNum", detail.getString("cph")); + snDetailMap.put("type", detail.getString("lx")); + + returnDetailList.add(snDetailMap); + } + + checkInvoice.put("invoiceLineList", returnDetailList); + } + /** * 查验发票 */ diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java index 009c6ffd..452f82da 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java @@ -117,6 +117,30 @@ public class ExtCustomsController extends AbstractController { if("99".equals(pramsMap.get("rzhYesorno"))){ pramsMap.put("rzhYesorno", null); } + + if(pramsMap.get("imageNumber") != null){ + pramsMap.put("imageId",pramsMap.get("imageNumber")); + } + + if(pramsMap.get("snVoucherNumber") != null){ + pramsMap.put("snVoucherNumber",pramsMap.get("snVoucherNumber")); + } + + if(pramsMap.get("accountPeriod") != null){ + pramsMap.put("accountPeriod",pramsMap.get("accountPeriod")); + } + + if (pramsMap.get("postingTimeStart") != null && !"".equals(pramsMap.get("postingTimeStart"))) { + pramsMap.put("postingTimeStart", + DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("postingTimeStart").toString()))); + } + if (pramsMap.get("postingTimeEnd") != null && !"".equals(pramsMap.get("postingTimeEnd"))) { + pramsMap.put("postingTimeEnd", + DateUtils.getNight(DateUtils.strToDate(pramsMap.get("postingTimeEnd").toString()))); + } + + log.info("请求列表的参数为:{}",pramsMap); + try { return ResponseEntity.ok(Objects .requireNonNull(R.ok().put("data", customsService.selectByPramsMap(pramsMap, curr, size)))); diff --git a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml index 04fb6275..24ca22fa 100644 --- a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml @@ -137,12 +137,12 @@ and t.sn_voucher_number = #{snVoucherNumber} - - and t.posting_time = #{postingTime} - and t.image_id = #{imageId} + + and t.posting_time between #{postingTimeStart} and #{postingTimeEnd} + and t.account_period = #{accountPeriod} diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml index 8e5b5268..6880a98d 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml @@ -62,18 +62,19 @@ and t.qs_status = #{qszt} - + and t.rzh_yesorno = #{rzzt} + + and (t.rzh_yesorno = '2' OR t.rzh_yesorno = '3') + and t.xf_name like CONCAT(#{xfmc},'%') - + and t.invoice_no = #{invoiceNo} - + and t.dept_id = #{businessCode} From 3bcd2886bbc47852a273a93b1b77c3ada781572a Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 18 Apr 2023 11:44:17 +0800 Subject: [PATCH 04/56] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/service/SNPushCheckRecordService.java | 9 ++++++++- 1 file changed, 8 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 972f6c87..988ea428 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 @@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dxhy.common.constant.DbConstant; import com.dxhy.common.datasource.config.DynamicContextHolder; +import com.dxhy.common.enums.FplxEnum; import com.dxhy.common.enums.SNFplxEnum; import com.dxhy.common.util.InvoiceUtil; import com.dxhy.common.vo.UserInfo; @@ -317,7 +318,13 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { jsonObject.put("salesName", invoiceData.get("xhfmc")); jsonObject.put("salesTaxNo", invoiceData.get("xhfsbh")); jsonObject.put("salesAddressPhone", invoiceData.get("xhfdzdh")); - jsonObject.put("salesBank", invoiceData.get("xhfyhzh")); + if(FplxEnum.JDC.getFplxDm().equals(invoiceType)){ + if(invoiceData.get("khyh") != null && invoiceData.get("khzh") != null) { + jsonObject.put("salesBank", invoiceData.get("khyh").toString() + invoiceData.get("khzh").toString()); + } + }else{ + jsonObject.put("salesBank", invoiceData.get("xhfyhzh")); + } jsonObject.put("totalAmount", invoiceData.get("fpje")); if ("11".equals(invoiceData.get("fpzl"))) { jsonObject.put("totalTax", "0"); From 52c94e7c8be4ca240f88891c4bae0853821ad873 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 18 Apr 2023 16:29:45 +0800 Subject: [PATCH 05/56] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AD=97=E6=AE=B5?= 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 988ea428..af237fd3 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 @@ -688,7 +688,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { invoice.setPassenger(snInvoice.getRiderName()); invoice.setDepartCity(snInvoice.getStationGetOn()); invoice.setArriveCity(snInvoice.getStationGetOff()); - if ("92".equals(invoice.getInvoiceTypeCode()) || "89".equals(invoice.getInvoiceTypeCode())) { + if ("92".equals(invoice.getInvoiceTypeCode()) || "89".equals(invoice.getInvoiceTypeCode()) || "88".equals(invoice.getInvoiceTypeCode())) { if (snInvoice.getAmountTax() != null) invoice.setInvoiceAmount(new BigDecimal(snInvoice.getAmountTax())); } From e94bdaa8cdf34c193f4068845a79cfae2bf15c8a Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 18 Apr 2023 16:45:55 +0800 Subject: [PATCH 06/56] =?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 --- .../java/com/dxhy/sign/controller/SignFpqsController.java | 2 +- .../com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java index 2fb438e2..e68d801d 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java @@ -650,7 +650,7 @@ public class SignFpqsController extends AbstractController { int size = (int)pramsMap.get("size"); try { log.info("签收列表查询参数 {}",data); - log.info("返回结果为 {}",signFpqsService.selectDelfpList(data,curr,size)); + log.info("返回结果为 {}",signFpqsService.selectQsfpList(data,curr,size)); return ResponseEntity.ok(R.ok().put("data", signFpqsService.selectQsfpList(data, curr, size))); } catch (Exception e) { e.printStackTrace(); 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 f5ac1dcf..90e63bc3 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 @@ -1625,10 +1625,13 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl pageList = new ArrayList<>(); if (pramsMap.get("gxStatus") != null && !"".equals(pramsMap.get("gxStatus"))) { + log.info("gxStatus不为空直接进行查询"); pageList = signInvoiceDao.selectQsfpListJrtt(pramsMap); } else { + log.info("进入到signInvoiceMapper查询"); pageList = signInvoiceSmService.selectQsfpList(pramsMap); } log.info("pageList {}",pageList); @@ -1651,6 +1654,7 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl Date: Tue, 18 Apr 2023 16:48:22 +0800 Subject: [PATCH 07/56] =?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=B4=AD=E6=96=B9?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/SDNYMainProcessController.java | 3 +-- .../src/main/java/com/dxhy/erp/dao/SysDeptDao.java | 4 ++++ .../dxhy/erp/service/SNPushCheckRecordService.java | 13 +++++++++++++ dxhy-erp/src/main/resources/mapper/SysDeptDao.xml | 8 ++++++++ 4 files changed, 26 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 f5e57220..9981c76b 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 @@ -229,8 +229,7 @@ public class SDNYMainProcessController extends AbstractController { checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString()); String kprq = checkInvoice.get("invoiceDate").toString(); - Date formatDat = new SimpleDateFormat("yyyyMMdd").parse(kprq); - String str = new SimpleDateFormat("yyyy-MM-dd").format(formatDat); + String str = new SimpleDateFormat("yyyy-MM-dd").format(kprq); log.info("开票日期为:{} ", str); checkInvoice.put("billingDate", str); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/dao/SysDeptDao.java b/dxhy-erp/src/main/java/com/dxhy/erp/dao/SysDeptDao.java index 2964779d..9ff1e518 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/dao/SysDeptDao.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/dao/SysDeptDao.java @@ -38,6 +38,10 @@ public interface SysDeptDao extends BaseMapper { * @return */ SysDeptEntity getOrg(@Param("taxno") String taxno); + + SysDeptEntity getOrgByCompCode(@Param("compCode") String compCode); + + SysDeptEntity getOrgByCompany(@Param("company") String company); /** 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 af237fd3..8206e14a 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 @@ -14,8 +14,10 @@ import com.dxhy.common.vo.UserInfo; import com.dxhy.erp.dao.AreaDao; import com.dxhy.erp.dao.BaseTDxRecordInvoiceDao; import com.dxhy.erp.dao.BaseTDxTaxCurrentDao; +import com.dxhy.erp.dao.SysDeptDao; import com.dxhy.erp.entity.BaseTDxRecordInvoice; import com.dxhy.erp.entity.BaseTDxTaxCurrent; +import com.dxhy.erp.entity.SysDeptEntity; import com.dxhy.erp.entity.TDxInvoiceReimburse; import com.dxhy.erp.entity.kfpt.ApiCheckInvoiceSingleRequest; import com.dxhy.erp.entity.kfpt.ApiRequest; @@ -91,6 +93,9 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { @Resource private TDxInvoiceReimburseService tDxInvoiceReimburseService; + @Resource + private SysDeptDao sysDeptDao; + public String pushCheckResultToSAP(String requestParam) throws Exception { log.info("获取请求参数：{} , 请求地址：{}", requestParam, snYxUrl); String post = HttpUtils.sendPo(snYxUrl, requestParam, userName, password); @@ -577,10 +582,18 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { log.info("价税分离失败:{}", invoiceResult.getMsg()); return invoiceResult.getMsg(); } + DynamicContextHolder.push(DbConstant.BASICS_READ); + SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(compCode); + reimburse.setGfTaxNo(orgByCompCode.getTaxno()); + reimburse.setGfName(orgByCompCode.getTaxname()); + reimburse.setGfAddressAndPhone(orgByCompCode.getAddress() + orgByCompCode.getPhone()); + reimburse.setGfBankAndNo(orgByCompCode.getBank() + orgByCompCode.getAccount()); reimburse = convertToReimburse(invoice, reimburse, fplxdm, company); + + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); int insert = 0; QueryWrapper wrapper = new QueryWrapper(); diff --git a/dxhy-erp/src/main/resources/mapper/SysDeptDao.xml b/dxhy-erp/src/main/resources/mapper/SysDeptDao.xml index a1cd5833..c0554bc0 100644 --- a/dxhy-erp/src/main/resources/mapper/SysDeptDao.xml +++ b/dxhy-erp/src/main/resources/mapper/SysDeptDao.xml @@ -28,6 +28,14 @@ and del_flag = '0' limit 1 + + select * from sys_dept - where comp_code = #{compCode} + where org_code = #{compCode} and org_type = '5' and del_flag = '0' limit 1 From 00ee0613be1bb4294210bba6a467aafc768ff3a1 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 18 Apr 2023 19:15:31 +0800 Subject: [PATCH 10/56] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml b/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml index d20485af..7089a0a2 100644 --- a/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml +++ b/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml @@ -125,7 +125,7 @@ - and r.invoice_type = #{invoiceType} + and t.invoice_type = #{invoiceType} and t.invoice_no = #{invoiceNo} From 59730dc9308ec3862f7996c18ad82eba5e3f1643 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 18 Apr 2023 19:56:19 +0800 Subject: [PATCH 11/56] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/SignInvoiceMapper.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml b/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml index 7089a0a2..a3ca2ff3 100644 --- a/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml +++ b/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml @@ -50,11 +50,14 @@ and t.invoice_type = #{invoiceType} --> - - and (r.invoice_type = '14' or (r.invoice_type = '32' and r.lq_tdyslxDm='08') ) - - - and r.invoice_type = #{invoiceType} and r.lq_tdyslxDm!='08' + + + + + + + + and r.invoice_type = #{invoiceType} and t.invoice_no = #{invoiceNo} From f8bad7813dff478ff81e62440625c51f6a5d2ea8 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 19 Apr 2023 08:10:06 +0800 Subject: [PATCH 12/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9listOtherInvoice?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E5=8A=A8=E6=80=81sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/ExtInvoicePoolMapper.xml | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 0f33964b..c998d329 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -337,17 +337,29 @@ AND qs_type = #{qsfs} + + + - and t.sn_voucher_number = #{snVoucherNumber} + and sn_voucher_number = #{snVoucherNumber} + + + - and t.posting_time = #{postingTime} + and posting_time = #{postingTime} + + + - and t.image_id = #{imageId} + and image_id = #{imageId} + + + - and t.account_period = #{accountPeriod} + and account_period = #{accountPeriod} GROUP BY uuid having min(create_date) ORDER BY create_date DESC From c90cb7974f1b5e0b0a1718cc5573dcab35645afd Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 19 Apr 2023 08:52:39 +0800 Subject: [PATCH 13/56] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/extend/controller/ExtInvoicePoolController.java | 2 ++ .../dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java | 4 ++++ .../src/main/resources/mapper/ExtInvoicePoolMapper.xml | 3 +-- 3 files changed, 7 insertions(+), 2 deletions(-) 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 2ae52c90..ecc5d6cf 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 @@ -135,6 +135,7 @@ public class ExtInvoicePoolController extends AbstractController { public ResponseEntity listOtherInvoice(@RequestBody Map pramsMap) { pramsMap.put("dbName", getUserInfo().getDbName()); + log.info("其他发票采集接收参数 {}",pramsMap); List gfshList = new ArrayList<>(); List invoiceTypeList = new ArrayList<>(); if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) { @@ -164,6 +165,7 @@ public class ExtInvoicePoolController extends AbstractController { int curr = (int)pramsMap.get("curr"); int size = (int)pramsMap.get("size"); try { + log.info("其他发票采集接收参数 {}" ,pramsMap); return ResponseEntity.ok(R.ok().put("data", extInvoicePoolService.listOther(pramsMap, curr, size))); } catch (Exception e) { e.printStackTrace(); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index bbd9878e..504f3c9f 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Map; import com.dxhy.extend.entity.*; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -22,6 +23,7 @@ import com.github.pagehelper.PageInfo; /** * @author dxhy */ +@Slf4j @SuppressWarnings({"AlibabaUndefineMagicConstant", "AlibabaMethodTooLong"}) @Service public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl @@ -229,7 +231,9 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl pageList = super.baseMapper.listOtherInvoice(pramsMap); + log.info("查询结果为 {}",pageList); PageInfo pageInfo = new PageInfo<>(pageList); // 用于页面返回list对象 if (pageList != null && pageList.size() > 0) { diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index c998d329..f14929c5 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -321,8 +321,7 @@ #{item} - + AND invoice_type = #{invoiceType} From 316ef99e0d5efe7b403e1aa78188e46cb52a2971 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 19 Apr 2023 09:08:40 +0800 Subject: [PATCH 14/56] =?UTF-8?q?ariesy=20=E6=9B=B4=E6=96=B0=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/config/ErpWebConfiguration.java | 2 +- .../controller/SDNYMainProcessController.java | 47 ++++++++++--------- .../dxhy/erp/entity/TdxSaleRecordInvoice.java | 2 + .../erp/service/SNPushCheckRecordService.java | 25 ++++++---- .../src/main/resources/bootstrap-std.yaml | 12 ++--- .../DomesticInvoiceDrawbackController.java | 26 +++++----- .../resources/mapper/SignInvoiceMapper.xml | 2 +- 7 files changed, 62 insertions(+), 54 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/config/ErpWebConfiguration.java b/dxhy-erp/src/main/java/com/dxhy/erp/config/ErpWebConfiguration.java index f5b39590..8b1c373a 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/config/ErpWebConfiguration.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/config/ErpWebConfiguration.java @@ -59,7 +59,7 @@ public class ErpWebConfiguration implements WebMvcConfigurer { */ private ArrayList getIncludePathPatterns() { ArrayList list = new ArrayList<>(); - String[] urls = {"/order/**"}; + String[] urls = {"/order/**,/sn/**"}; Collections.addAll(list, urls); return list; } 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 9981c76b..8a07e574 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 @@ -8,6 +8,7 @@ import com.dxhy.common.constant.ConfigureConstant; import com.dxhy.common.controller.AbstractController; import com.dxhy.common.enums.SNFplxEnum; import com.dxhy.common.util.InvoiceUtil; +import com.dxhy.common.util.UserInfoUtil; import com.dxhy.common.utils.R; import com.dxhy.erp.dao.TdxSaleRecordInvoiceDao; import com.dxhy.erp.entity.TDxInvoiceReimburse; @@ -73,14 +74,14 @@ public class SDNYMainProcessController extends AbstractController { @SysLog("发票查验") public ResponseEntity singleInvoiceCheck(@RequestBody Map pramsMap) throws ParseException { log.info("传入的参数为:{}", pramsMap); - String userid = "101833"; - String dbName = "business"; - String company = "BIGB"; +// String userid = "101833"; +// String dbName = "business"; +// String company = "BIGB"; // 入参统一在入口处理 -// String userid = getLoginName(); -// String dbName = getUserInfo().getDbName(); -// String company = getUserInfo().getCompany(); + String userid = getLoginName(); + String dbName = getUserInfo().getDbName(); + String company = getUserInfo().getCompany(); JSONObject checkInvoiceResult = null; InvoiceUtil iu = new InvoiceUtil(pramsMap.get("invoiceCode")); String fplxdm = iu.getFplxdm(); @@ -229,10 +230,12 @@ public class SDNYMainProcessController extends AbstractController { checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString()); String kprq = checkInvoice.get("invoiceDate").toString(); - String str = new SimpleDateFormat("yyyy-MM-dd").format(kprq); - log.info("开票日期为:{} ", str); + SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US); + Date date = sdf.parse(kprq); + String formatStr = new SimpleDateFormat("yyyy-MM-dd").format(date); + log.info("开票日期为:{} ", formatStr); - checkInvoice.put("billingDate", str); + checkInvoice.put("billingDate", formatStr); checkInvoice.put("purchaserName", checkInvoice.get("gfName")); checkInvoice.put("purchaserTaxNo", checkInvoice.get("gfTaxNo")); checkInvoice.put("purchaserBank", checkInvoice.get("gfBankAndNo")); @@ -347,20 +350,20 @@ public class SDNYMainProcessController extends AbstractController { log.info("影像系统同步数据:{}", JSONObject.toJSONString(snRequestObject)); - String userid = "101833"; - String dbName = "business"; - String company = "BIGB"; - String taxNo = "9111112222333344DD"; +// String userid = "101833"; +// String dbName = "business"; +// String company = "BIGB"; +// String taxNo = "9111112222333344DD"; // // 入参统一在入口处理 -// String userid = getLoginName(); -// String dbName = getUserInfo().getDbName(); -// String company = getUserInfo().getCompany(); -// List gfshAll = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); -// String gfsh = ""; -// if (gfshAll.size() > 0) { -// gfsh = gfshAll.get(0); -// } + String userid = getLoginName(); + String dbName = getUserInfo().getDbName(); + String company = getUserInfo().getCompany(); + List gfshAll = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); + String gfsh = ""; + if (gfshAll.size() > 0) { + gfsh = gfshAll.get(0); + } String result = ""; @@ -391,7 +394,7 @@ public class SDNYMainProcessController extends AbstractController { for (SNInvoice invoice : invoiceInfoList) { String fplxdm = ""; String snFplx = ""; - result = snPushCheckRecordService.updateInvoicePoll(company, taxNo, reimburse, invoice, fplxdm, imageId, compCode); + result = snPushCheckRecordService.updateInvoicePoll(company, gfsh, reimburse, invoice, fplxdm, imageId, compCode); //价税分离判断 if (!"ok".equals(result) && !"0000".equals(result)) { diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java index 15852206..816b73fd 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxSaleRecordInvoice.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.math.BigDecimal; @@ -42,6 +43,7 @@ public class TdxSaleRecordInvoice implements Serializable { /** * 开票日期 */ + @DateTimeFormat(pattern="yyyy-MM-dd") private Date invoiceDate; /** 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 94a122d2..ab1555b9 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 @@ -104,7 +104,17 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { return post; } - public String pushInvoiceToRecordInvoice(SNInvoice snInvoice, String taxNo, String company) throws Exception { + public String pushInvoiceToRecordInvoice(SNInvoice snInvoice, String taxNo, String company,String compCode) throws Exception { + + BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice(); + DynamicContextHolder.push(DbConstant.BASICS_READ); + + SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(compCode); + log.info("查询的组织信息为:{}",JSONObject.toJSONString(orgByCompCode)); + recordInvoice.setGfTaxNo(orgByCompCode.getTaxno()); + recordInvoice.setGfName(orgByCompCode.getTaxname()); + recordInvoice.setGfAddressAndPhone(orgByCompCode.getAddress() + orgByCompCode.getPhone()); + recordInvoice.setGfBankAndNo(orgByCompCode.getBank() + orgByCompCode.getAccount()); QueryWrapper currentWrapper = new QueryWrapper<>(); currentWrapper.eq("taxno", taxNo); @@ -135,7 +145,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { String gfmc = snInvoice.getPurchaserName(); String invoiceType = snInvoice.getInvoiceType(); - BaseTDxRecordInvoice recordInvoice = new BaseTDxRecordInvoice(); + recordInvoice.setUuid(fpdm + fphm); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (kprq != null) { @@ -593,13 +603,15 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { reimburse = convertToReimburse(invoice, reimburse, fplxdm, company); + log.info("插库的发票信息:{}",reimburse); + DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); int insert = 0; QueryWrapper wrapper = new QueryWrapper(); wrapper.eq("uuid", reimburse.getUuid()); TDxInvoiceReimburse reimburse1 = tDxInvoiceReimburseService.getBaseMapper().selectOne(wrapper); if (reimburse1 != null) { - insert = tDxInvoiceReimburseService.getBaseMapper().updateById(reimburse1); + insert = tDxInvoiceReimburseService.getBaseMapper().updateById(reimburse); } else { insert = tDxInvoiceReimburseService.getBaseMapper().insert(reimburse); } @@ -616,7 +628,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { log.info("可查验发票，更新底账库完成"); } else { //不可查验发票,未入库,插入票池 - this.pushInvoiceToRecordInvoice(invoice, taxNo, company); + this.pushInvoiceToRecordInvoice(invoice, taxNo, company,compCode); log.info("不可查验发票，插入底账库成功"); } @@ -653,11 +665,6 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { reimburse.setXfAddressAndPhone(invoice.getSalesAddressPhone()); reimburse.setXfBankAndNo(invoice.getSalesBank()); - reimburse.setGfTaxNo(invoice.getPurchaserTaxNo()); - reimburse.setGfName(invoice.getPurchaserName()); - reimburse.setGfAddressAndPhone(invoice.getPurchaserAddressPhone()); - reimburse.setGfBankAndNo(invoice.getPurchaserBank()); - reimburse.setTaxRate(invoice.getTaxRate()); reimburse.setIsDeduction(invoice.getIsDeductible()); diff --git a/dxhy-erp/src/main/resources/bootstrap-std.yaml b/dxhy-erp/src/main/resources/bootstrap-std.yaml index 588bf1e1..d2241fff 100644 --- a/dxhy-erp/src/main/resources/bootstrap-std.yaml +++ b/dxhy-erp/src/main/resources/bootstrap-std.yaml @@ -4,13 +4,13 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 172.31.36.143:33000 + server-addr: 172.31.36.147:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 # Nacos config 分组 group: dxhy-erp-group # Nacos config 登录用户名 - username: admin + username: nacos # Nacos config 登录密码 password: Invoice.nacos.!1 # Nacos config 配置文件前缀 @@ -19,9 +19,9 @@ spring: file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 172.31.36.143:33000 + server-addr: 172.31.36.147:33000 # Nacos config 登录用户名 - username: admin + username: nacos # Nacos config 登录密码 password: Invoice.nacos.!1 - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 \ No newline at end of file diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/controller/DomesticInvoiceDrawbackController.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/controller/DomesticInvoiceDrawbackController.java index bb3a11ee..831ea0bd 100644 --- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/controller/DomesticInvoiceDrawbackController.java +++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/controller/DomesticInvoiceDrawbackController.java @@ -42,22 +42,20 @@ public class DomesticInvoiceDrawbackController extends AbstractController { /** * 退税手工认证列表接口 * - * @param dto - * 参数 + * @param dto 参数 */ @PostMapping("/authentication_list") @ApiOperation(value = "退税手工认证列表接口") public ResponseEntity authenticationList(@RequestBody @Valid AuthenticationConditionDTO dto) { CommonListResponseVO resultVO = - domesticInvoiceDrawbackService.authenticationList(dto, getUserInfo()); + domesticInvoiceDrawbackService.authenticationList(dto, getUserInfo()); return ResponseEntity.ok(R.ok().put("data", responseResult(JSON.toJSONString(resultVO)))); } /** * 退税手工认证接口 * - * @param dto - * 参数 + * @param dto 参数 */ @PostMapping("/authentication") @ApiOperation(value = "退税手工认证接口") @@ -70,8 +68,7 @@ public class DomesticInvoiceDrawbackController extends AbstractController { /** * 退税导入认证信息查询接口 * - * @param datalist - * 参数 + * @param datalist 参数 */ @ResponseBody @PostMapping("/import_authentication_check") @@ -79,24 +76,24 @@ public class DomesticInvoiceDrawbackController extends AbstractController { public ResponseEntity importAuthenticationCheck(@RequestBody Map datalist) { List dtoList = - JSON.parseArray(datalist.get("datalist"), AuthenticationImportDTO.class); + JSON.parseArray(datalist.get("datalist"), AuthenticationImportDTO.class); dtoList.forEach(dto -> { - dto.setInvoiceCode(dto.getInvoiceCode().replace(" ", "")); + if (dto.getInvoiceCode() != null) + dto.setInvoiceCode(dto.getInvoiceCode().replace(" ", "")); dto.setInvoiceDate(dto.getInvoiceDate().replace(" ", "")); dto.setInvoiceNo(dto.getInvoiceNo().replace(" ", "")); dto.setTaxAmount(dto.getTaxAmount().replace(" ", "")); }); String menuId = datalist.get("menuId"); CommonListResponseVO resultList = - domesticInvoiceDrawbackService.importAuthenticationCheck(dtoList, getUserInfo(), menuId); + domesticInvoiceDrawbackService.importAuthenticationCheck(dtoList, getUserInfo(), menuId); return ResponseEntity.ok(R.ok().put("data", responseResult(JSON.toJSONString(resultList)))); } /** * 退税认证查询接口 * - * @param dto - * 参数 + * @param dto 参数 */ @PostMapping("/authentication_check") @ApiOperation(value = "退税认证查询接口") @@ -105,15 +102,14 @@ public class DomesticInvoiceDrawbackController extends AbstractController { dto.setCompany(getUserInfo().getCompany()); } CommonListResponseVO responseVO = - domesticInvoiceDrawbackService.authenticationCheck(dto, getUserInfo()); + domesticInvoiceDrawbackService.authenticationCheck(dto, getUserInfo()); return ResponseEntity.ok(R.ok().put("data", responseResult(JSON.toJSONString(responseVO)))); } /** * 请求结果加密封装 * - * @param json - * json + * @param json json */ private String responseResult(String json) { String jsonString = null; diff --git a/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml b/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml index d20485af..4421119a 100644 --- a/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml +++ b/dxhy-sign/src/main/resources/mapper/SignInvoiceMapper.xml @@ -32,7 +32,7 @@ From 1a4f35e7aabdbd6247d18530ba58785ccbd234ef Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 19 Apr 2023 14:07:39 +0800 Subject: [PATCH 22/56] =?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/extend/service/companypool/TicketServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java index baa913ea..45a9643f 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java @@ -53,6 +53,7 @@ public class TicketServiceImpl extends MpBaseServiceImpl hjList = super.baseMapper.queryTotal(paramsMap); ExtTicketInvoiceModel hjxx = hjList.get(0); hjsl = hjxx.getId(); @@ -65,6 +66,7 @@ public class TicketServiceImpl extends MpBaseServiceImpl pageList = super.baseMapper.queryTickets(paramsMap); PageInfo pageInfo = new PageInfo<>(pageList); // 用于页面返回list对象 From 1c4a90ee4d5e001ce0f21537d1789263d8c95e05 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 19 Apr 2023 14:09:05 +0800 Subject: [PATCH 23/56] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6&=E5=A2=9E=E5=8A=A0=E5=85=A8?= =?UTF-8?q?=E7=94=B5=E5=8F=91=E7=A5=A8=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DomesticInvoiceDrawbackServiceImpl.java | 2 +- .../com/dxhy/extend/controller/ExtCustomsController.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java index 775a8508..c818f4cf 100644 --- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java +++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java @@ -450,7 +450,7 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba // 发票类型校验 InvoiceUtil invoiceUtil = new InvoiceUtil(dto.getInvoiceCode()); String invoiceType = invoiceUtil.getFplxdm(); - if (!Arrays.asList("01", "08").contains(invoiceType)) { + if (!Arrays.asList("01", "08", "31").contains(invoiceType)) { return "发票类型错误"; } // 重复校验 diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java index 452f82da..ed14aa94 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java @@ -126,8 +126,13 @@ public class ExtCustomsController extends AbstractController { pramsMap.put("snVoucherNumber",pramsMap.get("snVoucherNumber")); } - if(pramsMap.get("accountPeriod") != null){ - pramsMap.put("accountPeriod",pramsMap.get("accountPeriod")); + if(pramsMap.get("accountPeriod") != null ){ + if(pramsMap.get("accountPeriod").toString().length() > 7) { + String accountPeriod = pramsMap.get("accountPeriod").toString().substring(0, 7); + pramsMap.put("accountPeriod", accountPeriod); + }else{ + pramsMap.put("accountPeriod", pramsMap.get("accountPeriod")); + } } if (pramsMap.get("postingTimeStart") != null && !"".equals(pramsMap.get("postingTimeStart"))) { From eb8e9598bfde3fdcb18d21b214ddcdaa023b16b5 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 19 Apr 2023 14:51:24 +0800 Subject: [PATCH 24/56] =?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 --- .../resources/mapper/ExtInvoicePoolMapper.xml | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 5e83cd21..d5d251c1 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -188,12 +188,10 @@ #{item} - + and t.invoice_type = #{invoiceType} - + and t.invoice_status = #{invoiceStatus} @@ -223,26 +221,27 @@ and t.qs_type = #{qsfs} - + and t.payment_status = #{inAccountStatus} - - and t.posting_time = #{postingTime} + + and posting_time between #{postingTimeStart} and #{postingTimeEnd} - - and t.image_id = #{imageId} + + and t.image_id = #{imageNumber} and t.account_period = #{accountPeriod} - + and DATE_FORMAT(t.payment_date,'%Y-%m') = #{inAccountMonth} and t.invoice_source = #{invoiceSource} + + and t.sn_voucher_number = #{snVoucherNumber} + From 64c474c993bf70c94c44b8e11dca52e5b796706a Mon Sep 17 00:00:00 2001 From: yefei Date: Thu, 20 Apr 2023 08:45:17 +0800 Subject: [PATCH 36/56] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-admin/src/main/resources/dxhy-logback.xml | 2 +- .../src/main/resources/logback-spring.xml | 2 +- .../controller/SDNYMainProcessController.java | 9 +++++++++ dxhy-erp/src/main/resources/bootstrap-dev.yaml | 18 ++++++++++-------- .../service/fpqs/impl/FpqsServiceImpl.java | 2 +- pom.xml | 12 ++++++------ 6 files changed, 28 insertions(+), 17 deletions(-) diff --git a/dxhy-admin/src/main/resources/dxhy-logback.xml b/dxhy-admin/src/main/resources/dxhy-logback.xml index ac4e26d6..d2d6386a 100644 --- a/dxhy-admin/src/main/resources/dxhy-logback.xml +++ b/dxhy-admin/src/main/resources/dxhy-logback.xml @@ -16,7 +16,7 @@ - DEBUG + INFO ${PATTERN} diff --git a/dxhy-admin/src/main/resources/logback-spring.xml b/dxhy-admin/src/main/resources/logback-spring.xml index 1675cc6c..98e953ff 100644 --- a/dxhy-admin/src/main/resources/logback-spring.xml +++ b/dxhy-admin/src/main/resources/logback-spring.xml @@ -25,7 +25,7 @@ - + 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 dc409676..762082b0 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 @@ -228,6 +228,15 @@ public class SDNYMainProcessController extends AbstractController { checkInvoice.put("invoiceCode", invoiceCode); checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString()); + String uuid = ""; + if(invoiceCode != null && StringUtils.isNoneBlank(invoiceCode)){ + uuid = invoiceCode + checkInvoice.get("invoiceNo").toString(); + checkInvoice.put("uuid",uuid); + }else{ + uuid = checkInvoice.get("invoiceNo").toString(); + checkInvoice.put("uuid",uuid); + } + String kprq = checkInvoice.get("invoiceDate").toString(); SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US); diff --git a/dxhy-erp/src/main/resources/bootstrap-dev.yaml b/dxhy-erp/src/main/resources/bootstrap-dev.yaml index aa8b3494..d2241fff 100644 --- a/dxhy-erp/src/main/resources/bootstrap-dev.yaml +++ b/dxhy-erp/src/main/resources/bootstrap-dev.yaml @@ -4,22 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 10.1.2.202:8848 + server-addr: 172.31.36.147:33000 # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace） - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 # Nacos config 分组 group: dxhy-erp-group # Nacos config 登录用户名 - username: dxhy-jxpt + username: nacos # Nacos config 登录密码 - password: dxhy-jxpt + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 prefix: dxhy-erp # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 10.1.2.202:8848 - username: dxhy-jxpt - password: dxhy-jxpt - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file + server-addr: 172.31.36.147:33000 + # Nacos config 登录用户名 + username: nacos + # Nacos config 登录密码 + password: Invoice.nacos.!1 + namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6 \ No newline at end of file diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java index 6d0d2e7f..a24970b6 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java @@ -92,7 +92,7 @@ public class FpqsServiceImpl extends MpBaseServiceImpl/home/dxhy/logs/ - - - + + true + @@ -220,9 +220,9 @@ /home/dxhy/logs/ - - true - + + + From de65d2175d0984b26858e20b700a372e2ec2baa7 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 20 Apr 2023 09:19:19 +0800 Subject: [PATCH 37/56] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 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 dc409676..a07666ca 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 @@ -604,6 +604,7 @@ public class SDNYMainProcessController extends AbstractController { BigDecimal bigDecimal = new BigDecimal(taxRate); BigDecimal multiply = bigDecimal.multiply(new BigDecimal("100")); info.setZTAX(multiply.toString()); + info.setZSM(getZSM(taxRate)); } if (taxRate != null && taxRate.contains("%")) { String replace = taxRate.replace("%", ""); @@ -616,6 +617,7 @@ public class SDNYMainProcessController extends AbstractController { } if (info.getZTAX() == null || info.getZTAX() == "") { info.setZTAX("0.00"); + info.setZSM(getZSM(info.getZTAX())); } info.setZFPDM(snInvoice.getInvoiceCode()); info.setZCD(snInvoice.getOriginPlace()); @@ -677,6 +679,10 @@ public class SDNYMainProcessController extends AbstractController { info.setZSJDH(snInvoice.getInspectionListNo()); // info.setZYGC(""); info.setZJSHJ(snInvoice.getAmountTax()); + if (snInvoice.getAmountTax() == null && (info.getZFPLX() == "17"|| info.getZFPLX() == "18")){ + info.setZJSHJ(snInvoice.getTotalAmount()); + + } info.setZCYRMC(snInvoice.getCarrierName()); info.setZJGDM(snInvoice.getTaxAuthorityNo()); //时间转换 @@ -687,10 +693,19 @@ public class SDNYMainProcessController extends AbstractController { if (snInvoice.getSource() == null) { info.setZPJLY("1"); } - info.setZCYZT(snInvoice.getCheckStaus()); - if (snInvoice.getCheckStaus() == null) { - info.setZCYZT("1"); + if ("01".equals(snInvoice.getInvoiceType()) || "02".equals(snInvoice.getInvoiceType()) || "03".equals(snInvoice.getInvoiceType()) || "04".equals(snInvoice.getInvoiceType()) + || "08".equals(snInvoice.getInvoiceType()) || "10".equals(snInvoice.getInvoiceType()) || "11".equals(snInvoice.getInvoiceType()) || "14".equals(snInvoice.getInvoiceType()) + || "15".equals(snInvoice.getInvoiceType()) || "31".equals(snInvoice.getInvoiceType()) || "32".equals(snInvoice.getInvoiceType())) { + //可查验发票, + info.setZCYZT("1"); + } else { + //不可查验发票 + info.setZCYZT("3"); } +// info.setZCYZT(snInvoice.getCheckStaus()); +// if (snInvoice.getCheckStaus() == null) { +// info.setZCYZT("1"); +// } info.setZCJR("opentext"); info.setZGXR("opentext"); info.setZQM("opentext"); From ae10da597b90783cdd971056f3ddaeae2a41b11a Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 20 Apr 2023 10:45:29 +0800 Subject: [PATCH 38/56] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/controller/SDNYMainProcessController.java | 9 +++++---- 1 file changed, 5 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 617373ac..3af388eb 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 @@ -679,16 +679,17 @@ public class SDNYMainProcessController extends AbstractController { info.setZCCRZH(snInvoice.getIdcardNo()); info.setZCPXH(snInvoice.getBrandModel()); info.setZMHFZJJ(snInvoice.getCaacDevelopmentFund()); - info.setZGFDH(snInvoice.getPurchaserAddressPhone()); - if (snInvoice.getPurchaserAddressPhone() == "nullnull"){ - info.setZGFDH(""); + + if ("nullnull".equals(snInvoice.getPurchaserAddressPhone())){ + info.setZGFDH(snInvoice.getPurchaserAddressPhone()); +// info.setZGFDH(""); } info.setZXFZH(snInvoice.getSalesBank()); info.setZJYM(snInvoice.getCheckCode()); info.setZSJDH(snInvoice.getInspectionListNo()); // info.setZYGC(""); info.setZJSHJ(snInvoice.getAmountTax()); - if (snInvoice.getAmountTax() == null && (info.getZFPLX() == "17"|| info.getZFPLX() == "18")){ + if (snInvoice.getAmountTax() == null && ("17".equals(info.getZFPLX()) || "18".equals(info.getZFPLX()))){ info.setZJSHJ(snInvoice.getTotalAmount()); } From 79400f949d08bb88e17d635aea9bd20a99be9917 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 20 Apr 2023 10:58:53 +0800 Subject: [PATCH 39/56] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/controller/SDNYMainProcessController.java | 2 +- 1 file changed, 1 insertion(+), 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 3af388eb..92517575 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 @@ -680,7 +680,7 @@ public class SDNYMainProcessController extends AbstractController { info.setZCPXH(snInvoice.getBrandModel()); info.setZMHFZJJ(snInvoice.getCaacDevelopmentFund()); - if ("nullnull".equals(snInvoice.getPurchaserAddressPhone())){ + if (!"nullnull".equals(snInvoice.getPurchaserAddressPhone())){ info.setZGFDH(snInvoice.getPurchaserAddressPhone()); // info.setZGFDH(""); } From 9c3e91da57e25ae8bc0bb29afb0006a95e815d28 Mon Sep 17 00:00:00 2001 From: yefei Date: Thu, 20 Apr 2023 11:22:31 +0800 Subject: [PATCH 40/56] =?UTF-8?q?ariesy=20=E8=A7=A3=E5=86=B3=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=E8=8F=9C=E5=8D=95=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=85=A2=E7=9A=84=E9=97=AE=E9=A2=98=20v1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/service/impl/SsoLoginServiceImpl.java | 57 ++++++++++++++----- .../BaseFpbrzServiceImpl.java | 2 + 2 files changed, 46 insertions(+), 13 deletions(-) diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java index f16624a6..7723b141 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java @@ -264,29 +264,60 @@ public class SsoLoginServiceImpl implements SsoLoginService { return roleIds; } +// public List toUserOrg(SsoUser user) { +// SysUserOrgEntity userOrg; +// List listUserOrg = new ArrayList<>(); +// List dataPerm = user.getDataPerm(); +// List taxplayercodeDeptList = user.getTaxplayercodeDeptList(); +// if (dataPerm != null && dataPerm.size() > 0) { +// for (Long deptId : dataPerm) { +// if (dataPerm.size() > 0) { +// for (com.xxl.sso.core.entity.SysDeptEntity sysDeptEntity : taxplayercodeDeptList) { +// log.debug("deptId : " + deptId + " sysDetp: " + sysDeptEntity.getDeptId()); +// if (deptId.longValue() == sysDeptEntity.getDeptId().longValue()) { +// userOrg = new SysUserOrgEntity(); +// userOrg.setCompany(AdminConfig.company); +// userOrg.setDeptId(sysDeptEntity.getDeptId()); +// userOrg.setTaxname(sysDeptEntity.getName()); +// userOrg.setTaxno(sysDeptEntity.getTaxpayerCode()); +// listUserOrg.add(userOrg); +// } +// } +// } +// } +// } +// log.debug("listUserOrg : " + listUserOrg.size() + " listUserOrgJson: " + JSON.toJSONString(listUserOrg)); +// return listUserOrg; +// } + public List toUserOrg(SsoUser user) { SysUserOrgEntity userOrg; + Map detpCollect = null; List listUserOrg = new ArrayList<>(); List dataPerm = user.getDataPerm(); List taxplayercodeDeptList = user.getTaxplayercodeDeptList(); + if(taxplayercodeDeptList != null && taxplayercodeDeptList.size() > 0){ + detpCollect = taxplayercodeDeptList.stream().collect(Collectors.toMap(com.xxl.sso.core.entity.SysDeptEntity::getDeptId, tri -> tri)); + } + if(detpCollect == null){ + return listUserOrg; + } if (dataPerm != null && dataPerm.size() > 0) { + for (Long deptId : dataPerm) { - if (dataPerm.size() > 0) { - for (com.xxl.sso.core.entity.SysDeptEntity sysDeptEntity : taxplayercodeDeptList) { - log.debug("deptId : " + deptId + " sysDetp: " + sysDeptEntity.getDeptId()); - if (deptId.longValue() == sysDeptEntity.getDeptId().longValue()) { - userOrg = new SysUserOrgEntity(); - userOrg.setCompany(AdminConfig.company); - userOrg.setDeptId(sysDeptEntity.getDeptId()); - userOrg.setTaxname(sysDeptEntity.getName()); - userOrg.setTaxno(sysDeptEntity.getTaxpayerCode()); - listUserOrg.add(userOrg); - } - } + com.xxl.sso.core.entity.SysDeptEntity deptEntity = detpCollect.get(deptId); + if(deptEntity != null){ + userOrg = new SysUserOrgEntity(); + userOrg.setCompany(AdminConfig.company); + userOrg.setDeptId(deptEntity.getDeptId()); + userOrg.setTaxname(deptEntity.getName()); + userOrg.setTaxno(deptEntity.getTaxpayerCode()); + listUserOrg.add(userOrg); } } + } - log.debug("listUserOrg : " + listUserOrg.size() + " listUserOrgJson: " + JSON.toJSONString(listUserOrg)); + log.info("listUserOrg : " + listUserOrg.size() + " listUserOrgJson: " + JSON.toJSONString(listUserOrg)); return listUserOrg; } diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java index ef051aca..7ee79e98 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java @@ -57,6 +57,7 @@ public class BaseFpbrzServiceImpl extends MpBaseServiceImpl pramsMap, int curr, int size) { @@ -65,6 +66,7 @@ public class BaseFpbrzServiceImpl extends MpBaseServiceImpl taxnoList = (List)pramsMap.get("gfsh"); From 06c77754fd28e1c9ce35bcb2ff49c3a00048e276 Mon Sep 17 00:00:00 2001 From: yefei Date: Thu, 20 Apr 2023 14:55:37 +0800 Subject: [PATCH 41/56] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E6=89=93?= =?UTF-8?q?=E5=8C=85=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index a93680a6..883cfd98 100644 --- a/pom.xml +++ b/pom.xml @@ -176,9 +176,9 @@ /home/dxhy/logs/ - - true - + + + @@ -220,9 +220,9 @@ /home/dxhy/logs/ - - - + + true + From e501c1658a68f25eedfe4a7a6facc9d19925083a Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 20 Apr 2023 15:21:26 +0800 Subject: [PATCH 42/56] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=BB=93=E6=9E=9C=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 51 +++++++++++++++++-- 1 file changed, 47 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 92517575..1aca9d2c 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 @@ -2,21 +2,25 @@ package com.dxhy.erp.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dxhy.common.aspect.SysLog; import com.dxhy.common.constant.CommonConstants; import com.dxhy.common.constant.ConfigureConstant; +import com.dxhy.common.constant.DbConstant; import com.dxhy.common.controller.AbstractController; +import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.common.enums.SNFplxEnum; import com.dxhy.common.util.InvoiceUtil; import com.dxhy.common.util.UserInfoUtil; import com.dxhy.common.utils.R; +import com.dxhy.erp.dao.CustomsRecordDao; +import com.dxhy.erp.dao.RecordInvoiceDao; import com.dxhy.erp.dao.TdxSaleRecordInvoiceDao; -import com.dxhy.erp.entity.TDxInvoiceReimburse; -import com.dxhy.erp.entity.TdxCheckRecordInvoice; -import com.dxhy.erp.entity.TdxSaleRecordInvoice; +import com.dxhy.erp.entity.*; import com.dxhy.erp.entity.sdny.*; import com.dxhy.erp.service.*; import com.dxhy.erp.utils.HmacSHA1Util; +import com.dxhy.erp.utils.ServiceResult; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -66,6 +70,12 @@ public class SDNYMainProcessController extends AbstractController { @Resource TdxSaleRecordInvoiceDao tdxSaleRecordInvoiceDao; + @Resource + private CustomsRecordDao customsRecordDao; + + @Resource + private RecordInvoiceDao recordInvoiceDao; + /** * 查验发票 */ @@ -658,7 +668,7 @@ public class SDNYMainProcessController extends AbstractController { info.setZGXR(""); //认证相关 - info.setZRZJG("0"); + String zrzjg = getZRZJG(snInvoice.getInvoiceCode(),snInvoice.getInvoiceNumber(),info.getZFPLX()); info.setZRZSSQ(""); // info.setZRZMS(""); // info.setZRZRQ(""); @@ -703,6 +713,7 @@ public class SDNYMainProcessController extends AbstractController { if (snInvoice.getSource() == null) { info.setZPJLY("1"); } + if ("01".equals(snInvoice.getInvoiceType()) || "02".equals(snInvoice.getInvoiceType()) || "03".equals(snInvoice.getInvoiceType()) || "04".equals(snInvoice.getInvoiceType()) || "08".equals(snInvoice.getInvoiceType()) || "10".equals(snInvoice.getInvoiceType()) || "11".equals(snInvoice.getInvoiceType()) || "14".equals(snInvoice.getInvoiceType()) || "15".equals(snInvoice.getInvoiceType()) || "31".equals(snInvoice.getInvoiceType()) || "32".equals(snInvoice.getInvoiceType())) { @@ -853,4 +864,36 @@ public class SDNYMainProcessController extends AbstractController { } return sm; } + + private String getZRZJG(String invoiceCode, String invoiceNo,String FPLX){ + String ZCYJG = ""; + String uuid = invoiceCode+invoiceNo; + DynamicContextHolder.push(DbConstant.BASICS_READ); + + //可价税分离票种 + if ("10".equals(FPLX) || "12".equals(FPLX) || "13".equals(FPLX) || "14".equals(FPLX) || "15".equals(FPLX) + || "24".equals(FPLX) || "25".equals(FPLX) || "26".equals(FPLX) || "27".equals(FPLX) || "22".equals(FPLX) + || "11".equals(FPLX) || "16".equals(FPLX) || "17".equals(FPLX) || "18".equals(FPLX) ) { + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("uuid", uuid); + ZCYJG = tDxInvoiceReimburseService.getOne(wrapper).getRzhYesorno(); + + } else { + //如果是可查验类型，直接更新数据库 + if ( "19".equals(FPLX) || "20".equals(FPLX) || "21".equals(FPLX) || "28".equals(FPLX)) { + //其他票种 + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("uuid", uuid); + ZCYJG = recordInvoiceDao.selectOne(wrapper).getRzhYesorno(); + } else { + //海关缴款书 + QueryWrapper wrapper = new QueryWrapper(); + wrapper.eq("uuid", uuid); + ZCYJG = customsRecordDao.selectOne(wrapper).getRzhYesorno(); + + } + + } + return ZCYJG; + } } From 228450a86e353ffca2ba533c0fc61be03b764ab3 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 20 Apr 2023 15:48:10 +0800 Subject: [PATCH 43/56] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=BB=93=E6=9E=9C=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 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 1aca9d2c..b91a6b55 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 @@ -669,6 +669,7 @@ public class SDNYMainProcessController extends AbstractController { //认证相关 String zrzjg = getZRZJG(snInvoice.getInvoiceCode(),snInvoice.getInvoiceNumber(),info.getZFPLX()); + info.setZRZJG(zrzjg); info.setZRZSSQ(""); // info.setZRZMS(""); // info.setZRZRQ(""); @@ -868,7 +869,7 @@ public class SDNYMainProcessController extends AbstractController { private String getZRZJG(String invoiceCode, String invoiceNo,String FPLX){ String ZCYJG = ""; String uuid = invoiceCode+invoiceNo; - DynamicContextHolder.push(DbConstant.BASICS_READ); + DynamicContextHolder.push(DbConstant.BUSINESS_READ); //可价税分离票种 if ("10".equals(FPLX) || "12".equals(FPLX) || "13".equals(FPLX) || "14".equals(FPLX) || "15".equals(FPLX) @@ -876,7 +877,11 @@ public class SDNYMainProcessController extends AbstractController { || "11".equals(FPLX) || "16".equals(FPLX) || "17".equals(FPLX) || "18".equals(FPLX) ) { QueryWrapper wrapper = new QueryWrapper(); wrapper.eq("uuid", uuid); - ZCYJG = tDxInvoiceReimburseService.getOne(wrapper).getRzhYesorno(); + TDxInvoiceReimburse one = tDxInvoiceReimburseService.getOne(wrapper); + if (one != null){ + ZCYJG = one.getRzhYesorno(); + } + } else { //如果是可查验类型，直接更新数据库 @@ -884,13 +889,19 @@ public class SDNYMainProcessController extends AbstractController { //其他票种 QueryWrapper wrapper = new QueryWrapper(); wrapper.eq("uuid", uuid); - ZCYJG = recordInvoiceDao.selectOne(wrapper).getRzhYesorno(); + RecordInvoice recordInvoice = recordInvoiceDao.selectOne(wrapper); + if (recordInvoice != null){ + ZCYJG = recordInvoice.getRzhYesorno(); + } + } else { //海关缴款书 QueryWrapper wrapper = new QueryWrapper(); wrapper.eq("uuid", uuid); - ZCYJG = customsRecordDao.selectOne(wrapper).getRzhYesorno(); - + TdxCustomsRecord tdxCustomsRecord = customsRecordDao.selectOne(wrapper); + if (tdxCustomsRecord != null){ + ZCYJG = tdxCustomsRecord.getRzhYesorno(); + } } } From f9899e05a577ccb0efd9ac692ef259987af9e4b0 Mon Sep 17 00:00:00 2001 From: yefei Date: Thu, 20 Apr 2023 16:03:45 +0800 Subject: [PATCH 44/56] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E4=BE=9B=E5=BA=94=E5=95=86=E9=A3=8E=E9=99=A9=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java index 6ac1c0d9..db47982d 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java @@ -172,7 +172,7 @@ public class SupplierRiskServiceImpl extends MpBaseServiceImpl risks = new ArrayList<>(); From 0d231cfb4a80f0ee6c87a51485615dfbddec2ffb Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 20 Apr 2023 16:32:06 +0800 Subject: [PATCH 45/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=92=8C=E5=8D=95=E4=BB=B7=E7=9A=84=E5=B0=8F=E6=95=B0=E4=BD=8D?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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 b91a6b55..68c0be4a 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 @@ -282,17 +282,17 @@ public class SDNYMainProcessController extends AbstractController { snDetailMap.put("specificationModel", detail.getString("ggxh")); snDetailMap.put("unit", detail.getString("jldw")); String quantity = detail.getString("spsl"); - if (quantity.length() > 3) { - int index = quantity.indexOf("."); - quantity = quantity.substring(0, index + 2); - } +// if (quantity.length() > 3) { +// int index = quantity.indexOf("."); +// quantity = quantity.substring(0, index + 2); +// } snDetailMap.put("quantity", quantity); String unitPrice = detail.getString("bhsdj"); - if (unitPrice.length() > 3) { - int index = unitPrice.indexOf("."); - unitPrice = unitPrice.substring(0, index + 3); - } +// if (unitPrice.length() > 3) { +// int index = unitPrice.indexOf("."); +// unitPrice = unitPrice.substring(0, index + 3); +// } snDetailMap.put("unitPrice", unitPrice); From 74563bfc3ef00a9c74b5387b29385ec1a51504e9 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 20 Apr 2023 17:00:26 +0800 Subject: [PATCH 46/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=92=8C=E5=8D=95=E4=BB=B7=E7=9A=84=E5=B0=8F=E6=95=B0=E4=BD=8D?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 68c0be4a..ee913bab 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 @@ -872,6 +872,20 @@ public class SDNYMainProcessController extends AbstractController { DynamicContextHolder.push(DbConstant.BUSINESS_READ); //可价税分离票种 + //10：增值税专用发票 + //12：增值税电子普通发票 + //13：增值税普通发票(卷票) + //14：机动车销售统一发票 + //15：二手车销售统一发票 + //24：增值税电子普通发票(通行费) + //25：增值税电子专用发票 + //26：电子发票（增值税专用发票） + //27：电子发票（普通发票） + //22：过路费发票 + //11：增值税普通发票 + //16：定额发票 + //17：机打发票 + //18：出租车发票 if ("10".equals(FPLX) || "12".equals(FPLX) || "13".equals(FPLX) || "14".equals(FPLX) || "15".equals(FPLX) || "24".equals(FPLX) || "25".equals(FPLX) || "26".equals(FPLX) || "27".equals(FPLX) || "22".equals(FPLX) || "11".equals(FPLX) || "16".equals(FPLX) || "17".equals(FPLX) || "18".equals(FPLX) ) { @@ -884,6 +898,10 @@ public class SDNYMainProcessController extends AbstractController { } else { + //19：火车票 + //20：客运汽车 + //21：航空运输电子客票行程单 + //28：船票 //如果是可查验类型，直接更新数据库 if ( "19".equals(FPLX) || "20".equals(FPLX) || "21".equals(FPLX) || "28".equals(FPLX)) { //其他票种 From a15d4c40979d78383fc3e78681bf334a83559212 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 20 Apr 2023 19:28:54 +0800 Subject: [PATCH 47/56] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/base/controller/BaseInvoiceController.java | 2 +- 1 file changed, 1 insertion(+), 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 bc3f143e..f3d4db7b 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 @@ -462,7 +462,7 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("accountPeriod", accountPeriod); log.info("accountPeriod:{}",accountPeriod); } - pramsMap.put("accountPeriod", map.get("accountPeriod")); +// pramsMap.put("accountPeriod", map.get("accountPeriod")); String inAccountStatus = (String)map.get("inAccountStatus"); if (sfkrz != null) { From afbb5723e036c189d9cec720230ea0b11c3e64c0 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 20 Apr 2023 20:38:46 +0800 Subject: [PATCH 48/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=92=8C=E5=8D=95=E4=BB=B7=E7=9A=84=E5=B0=8F=E6=95=B0=E4=BD=8D?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/entity/BaseTDxRecordInvoice.java | 4 +++- .../com/dxhy/base/model/BaseSggxCxRespVO.java | 23 +++++++++++++++++++ .../BaseInvoiceManualCheckServiceImpl.java | 5 ++++ .../main/resources/mapper/BaseFpZhMapper.xml | 2 +- 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java index 1e2b958f..856c6a67 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java +++ b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java @@ -506,5 +506,7 @@ public class BaseTDxRecordInvoice implements Serializable { //账期 private String accountPeriod; //过账时间 - private Date postingTime; + private String postingTime; + //影像号 + private String imageId; } diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java index 498aa1ca..b9e2c0cc 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java @@ -1,7 +1,10 @@ package com.dxhy.base.model; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.util.Date; + /** * 手工勾选查询返回对象 * @@ -126,4 +129,24 @@ public class BaseSggxCxRespVO { */ private String eleInvoiceNo; + /** + * 影像id + */ + private String imageId; + + /** + * 凭证号 + */ + private String snVoucherNumber; + + /** + * 过账时间 + */ + private String postingTime; + + /** + * 过账时间 + */ + private String accountPeriod; + } diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java index e92d0555..098ea695 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java @@ -14,6 +14,7 @@ import java.util.Map; import javax.annotation.Resource; import com.dxhy.common.constant.DictConstant; +import com.dxhy.common.utils.DateUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -168,6 +169,10 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl select t.invoice_code,t.invoice_no,t.invoice_type,DATE_FORMAT(t.invoice_date,'%Y-%m-%d')kprq,t.gf_tax_no - gfsh,t.gf_name + gfsh,t.gf_name,t.image_id,t.rzh_date, gfmc,t.dept_id deptId,t.dept_name deptName, t.xf_tax_no,t.xf_name,t.tax_amount,t.dk_tax_amount,t.invoice_status,t.invoice_amount,date_format(t.rzh_date,'%Y-%m-%d') rzh_date,date_format(t.qs_date,'%Y-%m-%d') qs_date,t.rzh_type,t.id id, From f2fbc7fae2ab4023e825f8c1548c7ee079d32e44 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 20 Apr 2023 20:57:16 +0800 Subject: [PATCH 49/56] =?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-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java | 2 ++ dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java index 297c62d0..4ac7dafd 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java @@ -202,5 +202,7 @@ public class BaseFpRzRespVO implements Serializable { private Date postingTime; //影像号 SN private String imageNumber; + private String imageId; + private String rzhDate; } diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 2b9f6895..e24af5e8 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -54,7 +54,7 @@ select t.invoice_code,t.invoice_no,t.invoice_type,DATE_FORMAT(t.invoice_date,'%Y-%m-%d')kprq,t.gf_tax_no gfsh,t.gf_name,t.image_id,t.rzh_date, - gfmc,t.dept_id deptId,t.dept_name deptName, + t.gfmc,t.dept_id deptId,t.dept_name deptName, t.xf_tax_no,t.xf_name,t.tax_amount,t.dk_tax_amount,t.invoice_status,t.invoice_amount,date_format(t.rzh_date,'%Y-%m-%d') rzh_date,date_format(t.qs_date,'%Y-%m-%d') qs_date,t.rzh_type,t.id id, t.gx_user_name,t.rzh_belong_date From 7c129ff9ff2d6a4ce7699ec215d5044f27a2c7f6 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 20 Apr 2023 22:10:18 +0800 Subject: [PATCH 50/56] =?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/base/model/BaseFpRzRespVO.java | 2 +- dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java index 4ac7dafd..ea4f5d11 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java @@ -204,5 +204,5 @@ public class BaseFpRzRespVO implements Serializable { private String imageNumber; private String imageId; - private String rzhDate; + } diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index e24af5e8..2362edf9 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -11,7 +11,12 @@ + + + + + @@ -52,9 +57,8 @@ select - id, dept_id, company_code, dept_name, username, user_id, email_address, create_time, del_status, modify_time + id, dept_id, company_code, dept_name, username, user_id, email_address,email_password, create_time, del_status, modify_time from email_maintain