From d1a1711a7f663f512ae4643c557ec11491113b0e Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 8 Aug 2023 15:35:38 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E8=AE=A2=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=86=9C=E4=BA=A7=E5=93=81=E8=A1=A5=E5=85=A8=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E4=B8=BA=E8=BE=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/order/consumer/constant/ExcelErrorMessageEnum.java | 4 ++-- .../modules/order/controller/ReceiveOrderController.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java index 759019df..4d82f972 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java @@ -172,11 +172,11 @@ public enum ExcelErrorMessageEnum { /** * 项目数量小数点后超过8位 */ - ORDERINFO_XMSL_OVERLENGTHEIGHT("9636", "数量超出最大位数25位,小数点后8位,全电票小数点后15位"), + ORDERINFO_XMSL_OVERLENGTHEIGHT("9636", "数量超出最大位数25位,小数点后8位,全电票小数点后13位"), /** * 项目单价小数点后超过8位 */ - ORDERINFO_XMDJ_OVERLENGTHEIGHT("9637", "单价超出最大长度25位,小数点后8位,全电票小数点后15位"), + ORDERINFO_XMDJ_OVERLENGTHEIGHT("9637", "单价超出最大长度25位,小数点后8位,全电票小数点后13位"), /** * 备注超过200位 */ diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java index 5729f8ee..39703904 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java @@ -315,6 +315,9 @@ public class ReceiveOrderController { excel.setGhfDh(excel.getXhfDh()); excel.setGhfQylx(OrderInfoEnum.GHF_QYLX_04.getValue()); } + if(StringUtils.equals(OrderInfoEnum.TSPZ_2.getValue(), excel.getTspz())){ + excel.setXmdw(ConfigureConstant.STRING_LINAG); + } /** * 处理税率开具理由，将内容转为code * 参考：{@link OrderInfoEnum#ORDER_SLKJLY_0}、{@link OrderInfoEnum#ORDER_SLKJLY_2}、{@link OrderInfoEnum#ORDER_SLKJLY_3}