From 383d20c1c9446b6652fe27596d49c0a2fdfa97f1 Mon Sep 17 00:00:00 2001 From: liufeilong Date: Fri, 31 Mar 2023 10:22:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BC=80=E7=A5=A8=E8=B5=8B=E5=80=BC?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/manager/service/impl/InvoiceServiceImpl.java | 2 +- .../service/impl/AllocateInvoiceInterfaceServiceImplV3.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index 1b0ca1ed..dd487130 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -204,7 +204,7 @@ public class InvoiceServiceImpl implements InvoiceService { }); } if(consumerList.size()>0){ - return R.error(ConfigureConstant.STRING_9001, "校验客户提示",consumerList); + return R.error(ConfigureConstant.STRING_9001, "以下结算单中客户的状态为“冻结”状态，不能进行开票。",consumerList); }else if((StrUtil.isBlank(pageInvoiceReq.getConfirmZnfm()) || !ConfigureConstant.STRING_0.equals(pageInvoiceReq.getConfirmZnfm())) && confirmList.size()>0){ return R.error(ConfigureConstant.STRING_9002,"请确认以下物料税收分类编码是否准确",confirmList); }else if(djOverflowList.size() > 0){ diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index 068da1f5..ad03716b 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -856,14 +856,11 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt processInfo.setYzfp(ddtxx.getYZFP()); processInfo.setOriginDdh(ddtxx.getDDH()); processInfo.setOriginOrderId(processInfo.getOrderInfoId()); - processInfo.setKb(insertOrderItem.get(0).get(0).getKb()); + processInfo.setKb(ddmxxx.get(0).getKB()); } for (OrderItemInfo itemInfo : insertOrderItem.get(0)) { itemInfo.setPh(ddmxxx.get(0).getPH()); itemInfo.setKb(ddmxxx.get(0).getKB()); - //TODO lfl 这两在哪赋值？ - itemInfo.setZnfm(""); - itemInfo.setTswl(""); } //根据配置拼接备注信息 InvoiceRemarkSet invoiceRemarkSet = new InvoiceRemarkSet();