From d0d542dd888f58c63ceb57b7979e03bd128c04a6 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 8 Jun 2023 20:05:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E5=8C=BA?= =?UTF-8?q?=E5=9D=97=E9=93=BE=E5=8F=91=E7=A5=A8=E6=8F=90=E4=BA=A4S4?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/controller/SDNYMainProcessController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 5d092c32..f4d63859 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 @@ -1011,7 +1011,14 @@ public class SDNYMainProcessController extends AbstractController { || "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"); + log.info("发票类型为:{}",snInvoice.getInvoiceType()); + //0608 区块链发票 并且 checkStatus = 3 的时候 提交sap状态为3（刘振和谈楚才提出需求） + if("10".equals(snInvoice.getInvoiceType()) && "3".equals(snInvoice.getCheckStaus())){ + log.info("区块链发票 传输状态checkStatus = 3"); + info.setZCYZT("3"); + }else { + info.setZCYZT("1"); + } } else { //不可查验发票 info.setZCYZT("3"); From e4aad28b4c17c09c5b60bd33f1b3fd1cc8ab0393 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 8 Jun 2023 21:15:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNInvoice.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNInvoice.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNInvoice.java index f49503e2..bacc972e 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNInvoice.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/sdny/SNInvoice.java @@ -317,7 +317,7 @@ public class SNInvoice { /** * 查验状态 */ - private String checkStaus; + private String checkStatus; /** * 查验时间 From 1c5f956dd69911d69d37a1cd5a47c4a9922f9b81 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 8 Jun 2023 21:22:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=A9=A2?= =?UTF-8?q?=E6=A2=9D=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/controller/SDNYMainProcessController.java | 2 +- dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml | 6 +++--- 2 files changed, 4 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 f4d63859..a954c619 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 @@ -1013,7 +1013,7 @@ public class SDNYMainProcessController extends AbstractController { //可查验发票, log.info("发票类型为:{}",snInvoice.getInvoiceType()); //0608 区块链发票 并且 checkStatus = 3 的时候 提交sap状态为3（刘振和谈楚才提出需求） - if("10".equals(snInvoice.getInvoiceType()) && "3".equals(snInvoice.getCheckStaus())){ + if("10".equals(snInvoice.getInvoiceType()) && "3".equals(snInvoice.getCheckStatus())){ log.info("区块链发票 传输状态checkStatus = 3"); info.setZCYZT("3"); }else { diff --git a/dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml index 11a9b730..858970a9 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtJxssbbMapper.xml @@ -14,7 +14,7 @@ ifnull(sum(dk_tax_amount), 0) totalTax FROM t_dx_record_invoice WHERE valid='1' - and (invoice_type in('01','03','08','14','31','283','161','183','185') or (invoice_type ='32' and t.lq_tdyslxDm='08')) + and (invoice_type in('01','03','08','14','31','283','161','183','185') or (invoice_type ='32' and lq_tdyslxDm='08')) AND invoice_status='0' AND rzh_yesorno='1' @@ -57,7 +57,7 @@