From 14d5e41594ac774a43a54ee7868ae49f8057a17e Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 4 Sep 2023 17:01:52 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=8F=91=E7=A5=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/SDNYMainProcessController.java | 13 ++++++++++++- .../dxhy/erp/service/SNPushCheckRecordService.java | 6 +++--- 2 files changed, 15 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 db94c914..5ed210f4 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 @@ -779,7 +779,18 @@ public class SDNYMainProcessController extends AbstractController { checkInvoice.put("salesAddressPhone", checkInvoice.get("gfAddressAndPhone")); checkInvoice.put("salesBank", checkInvoice.get("gfBankAndNo")); checkInvoice.put("checkCode", checkInvoice.get("checkCode")); - checkInvoice.put("state", "0"); + if("1".equals(checkInvoice.get("invoiceStatus"))){ + checkInvoice.put("state", "3"); + }else if("2".equals(checkInvoice.get("invoiceStatus"))){ + checkInvoice.put("state", "1"); + }else if("3".equals(checkInvoice.get("invoiceStatus")) || "7".equals(checkInvoice.get("invoiceStatus")) || "8".equals(checkInvoice.get("invoiceStatus"))){ + checkInvoice.put("state", "2"); + }else if("4".equals(checkInvoice.get("invoiceStatus"))){ + checkInvoice.put("state", "4"); + }else if("0".equals(checkInvoice.get("invoiceStatus"))){ + checkInvoice.put("state", "0"); + } + checkInvoice.put("tollSign", "07"); //机动车 if ("03".equals(invoiceType)) { 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 1246545e..857828c7 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 @@ -401,11 +401,11 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { jsonObject.put("checkCode", invoiceData.get("jym")); - if ("N".equals(invoiceData.get("zfbz"))) { + if ("N".equals(invoiceData.get("fpzt"))) { jsonObject.put("state", "0"); - } else if ("H".equals(invoiceData.get("zfbz"))) { + } else if ("3".equals(invoiceData.get("fpzt")) || "7".equals(invoiceData.get("fpzt")) || "8".equals(invoiceData.get("fpzt"))) { jsonObject.put("state", "2"); - } else if ("Y".equals(invoiceData.get("zfbz"))) { + } else if ("Y".equals(invoiceData.get("fpzt"))) { jsonObject.put("state", "1"); }