From 73ca5e1e44c6c9e3418df1aa902f884c4191574a Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 15 May 2023 19:18:10 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E9=AA=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BA=95=E8=B4=A6=E5=BA=93=E5=85=A8=E7=94=B5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=8F=91=E7=A5=A8=E4=BB=A3=E7=A0=81=E5=92=8C?= =?UTF-8?q?=E5=8F=B7=E7=A0=81=E5=88=86=E5=BC=80=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/controller/SDNYMainProcessController.java | 9 +++++++-- 1 file changed, 7 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 8716d009..e7bcc8e8 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 @@ -387,8 +387,13 @@ public class SDNYMainProcessController extends AbstractController { checkInvoice.put("administrativeDivisionNo", ""); checkInvoice.put("administrativeDivisionName", ""); - checkInvoice.put("invoiceCode", invoiceCode); - checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString()); + if("31".equals(invoiceType) || "32".equals(invoiceType) || "185".equals(invoiceType) || "186".equals(invoiceType)){ + checkInvoice.put("invoiceCode", ""); + checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString()); + }else { + checkInvoice.put("invoiceCode", invoiceCode); + checkInvoice.put("invoiceNumber", invoiceCode == null ? checkInvoice.get("invoiceNo").toString() :invoiceCode + checkInvoice.get("invoiceNo").toString()); + } String uuid = ""; if (invoiceCode != null && StringUtils.isNoneBlank(invoiceCode)) { uuid = invoiceCode + checkInvoice.get("invoiceNo").toString();