From 221026a7d4065d98b0e4808d8b356799bbd425ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Wed, 24 Jan 2024 13:37:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9F=A5=E9=AA=8C=EF=BC=9A=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E8=BF=94=E5=9B=9E=E5=BD=B1=E5=83=8F=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E3=80=81=E7=A8=8E=E9=A2=9D=E3=80=81=E4=BB=B7=E7=A8=8E=E5=90=88?= =?UTF-8?q?=E8=AE=A1=E5=9B=9B=E4=BD=8D=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SDNYMainProcessController.java | 34 +++++++++++++++++++ 1 file changed, 34 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 c8e81f0c..1459bdd1 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 @@ -632,7 +632,9 @@ public class SDNYMainProcessController extends AbstractController { } } } + decimalFormat(checkInvoiceByUuid); JSONObject checkInvoice = (JSONObject) JSONObject.toJSON(checkInvoiceByUuid); + log.info("checkInvoice:{}",checkInvoice); JSONArray checkInvoiceDetail = (JSONArray) JSONObject.toJSON(baseTDxRecordInvoiceDetail); JSONObject vehicleDetail = new JSONObject(); if (vehicleList != null && vehicleList.size() > 0) { @@ -676,6 +678,7 @@ public class SDNYMainProcessController extends AbstractController { } checkInvoiceByUuid = snPushCheckRecordService.selectRecordByWrapper(recordWrapper); } + decimalFormat(tdxSaleRecordInvoice); JSONObject checkInvoice = (JSONObject) JSONObject.toJSON(tdxSaleRecordInvoice); JSONArray saleDetail = (JSONArray) JSONObject.toJSON(recordInvoiceSaleDetailModel); if(baseTDxRecordInvoiceDetail!= null && baseTDxRecordInvoiceDetail.size() > 0){ @@ -775,6 +778,37 @@ public class SDNYMainProcessController extends AbstractController { return ResponseEntity.ok(JSONObject.toJSONString(R.error().put("data", "请求正在处理,不要重复提交"))); } + + private void decimalFormat(TdxSaleRecordInvoice tdxSaleRecordInvoice) { + if (tdxSaleRecordInvoice != null){ + if (tdxSaleRecordInvoice.getInvoiceAmount() != null){ + tdxSaleRecordInvoice.setInvoiceAmount(tdxSaleRecordInvoice.getInvoiceAmount().setScale(2)); + } + if (tdxSaleRecordInvoice.getTaxAmount() != null){ + tdxSaleRecordInvoice.setTaxAmount(tdxSaleRecordInvoice.getTaxAmount().setScale(2)); + } + if (tdxSaleRecordInvoice.getTotalAmount() != null){ + tdxSaleRecordInvoice.setTotalAmount(tdxSaleRecordInvoice.getTotalAmount().setScale(2)); + } + + } + } + + public static void decimalFormat(BaseTDxRecordInvoice checkInvoiceByUuid) { + if (checkInvoiceByUuid != null){ + if (checkInvoiceByUuid.getInvoiceAmount() != null){ + checkInvoiceByUuid.setInvoiceAmount(checkInvoiceByUuid.getInvoiceAmount().setScale(2)); + } + if (checkInvoiceByUuid.getTaxAmount() != null){ + checkInvoiceByUuid.setTaxAmount(checkInvoiceByUuid.getTaxAmount().setScale(2)); + } + if (checkInvoiceByUuid.getTotalAmount() != null){ + checkInvoiceByUuid.setTotalAmount(checkInvoiceByUuid.getTotalAmount().setScale(2)); + } + + } + } + @Async void saveCheckLog(Map pramsMap, JSONObject checkInvoice) { TdxPlatformCheckLog checkLog = new TdxPlatformCheckLog(); From 9558bd03506ee0aeca1aa69fb23959d1bc072497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Thu, 25 Jan 2024 09:30:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9F=A5=E9=AA=8C=EF=BC=9A=E5=B0=86?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=99=E5=BD=B1=E5=83=8F=E7=9A=84185?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=B1=BB=E5=9E=8B=E8=BD=AC=E5=8C=96=E6=88=90?= =?UTF-8?q?01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/SDNYMainProcessController.java | 7 +++++++ 1 file changed, 7 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 1459bdd1..5e543ff7 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 @@ -918,6 +918,9 @@ public class SDNYMainProcessController extends AbstractController { checkInvoice.put("invoiceCode", invoiceCode); checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString()); } + if ("185".equals(checkInvoice.getString("invoiceType"))){ + checkInvoice.put("invoiceType","01"); + } String uuid = ""; if (invoiceCode != null && StringUtils.isNoneBlank(invoiceCode)) { uuid = invoiceCode + checkInvoice.get("invoiceNo").toString(); @@ -1058,6 +1061,7 @@ public class SDNYMainProcessController extends AbstractController { } checkInvoice.put("invoiceType", invoiceType); + checkInvoice.put("administrativeDivisionNo", ""); checkInvoice.put("administrativeDivisionName", ""); @@ -1068,6 +1072,9 @@ public class SDNYMainProcessController extends AbstractController { checkInvoice.put("invoiceCode", invoiceCode); checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString()); } + if("185".equals(checkInvoice.getString("invoiceType"))){ + checkInvoice.put("invoiceType", "01"); + } String uuid = ""; if (invoiceCode != null && StringUtils.isNoneBlank(invoiceCode)) { uuid = invoiceCode + checkInvoice.get("invoiceNo").toString(); From 9ef6244cd03577c056c2c4c997cce6bd65b990c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Thu, 25 Jan 2024 15:09:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BA=8C=E6=89=8B=E8=BD=A6=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=EF=BC=9A=E4=BC=A0sap=E6=8A=A5=E6=96=87=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0ZJSHJ=E5=8F=96=E5=80=BCtotalAmount?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/SDNYMainProcessController.java | 4 +++- 1 file changed, 3 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 5e543ff7..5ce18a2e 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 @@ -1861,7 +1861,9 @@ public class SDNYMainProcessController extends AbstractController { info.setZJSHJ(snInvoice.getAmountTax()); if (snInvoice.getAmountTax() == null && ("17".equals(info.getZFPLX()) || "18".equals(info.getZFPLX()))) { info.setZJSHJ(snInvoice.getTotalAmount()); - + } + if (SNFplxEnum.ESC.getFplxDm().equals(info.getZFPLX())){ + info.setZJSHJ(snInvoice.getTotalAmount()); } info.setZCYRMC(snInvoice.getCarrierName()); info.setZJGDM(snInvoice.getTaxAuthorityNo()); From 9ecf74788c21212e5250ab36a1c6d00cd9c73908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Fri, 2 Feb 2024 14:14:17 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9F=A5=E9=AA=8C=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E7=A4=BA?= 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, 2 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 5ce18a2e..029144a6 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 @@ -757,7 +757,8 @@ public class SDNYMainProcessController extends AbstractController { data.put("data", checkInvoiceResult); } else { - data.put("message", "error 其他类发票不支持查验"); + //根据刘振要求进行提示修改 + data.put("message", "请检查发票代码或者发票类型是否正确！"); } return ResponseEntity.ok(JSONObject.toJSONString(data)); From 9c551c1f4fcb55451ecaa070a179ddf9b42f1454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Tue, 5 Mar 2024 10:24:08 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9F=A5=E9=AA=8C=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= 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, 2 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 029144a6..ef761be8 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 @@ -919,6 +919,7 @@ public class SDNYMainProcessController extends AbstractController { checkInvoice.put("invoiceCode", invoiceCode); checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString()); } + //全电纸专发票类型185返回给影像01 if ("185".equals(checkInvoice.getString("invoiceType"))){ checkInvoice.put("invoiceType","01"); } @@ -1863,6 +1864,7 @@ public class SDNYMainProcessController extends AbstractController { if (snInvoice.getAmountTax() == null && ("17".equals(info.getZFPLX()) || "18".equals(info.getZFPLX()))) { info.setZJSHJ(snInvoice.getTotalAmount()); } + //添加二手车返回价税合计 if (SNFplxEnum.ESC.getFplxDm().equals(info.getZFPLX())){ info.setZJSHJ(snInvoice.getTotalAmount()); }