From a478ca4e08c51647585471b50eb47950fb9b5e96 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 4 Jul 2023 11:24:21 +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=A1=AB=E5=86=99=E7=A8=8E=E6=94=B6=E5=90=8E=E4=B8=8D?= =?UTF-8?q?=E5=9C=A8=E6=A0=B9=E6=8D=AE=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CommonInterfaceServiceImpl.java | 1 + .../main/resources/download/OrderExcel.xlsx | Bin 13198 -> 13230 bytes 2 files changed, 1 insertion(+) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java index 407c5f6e..867c97a3 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java @@ -688,6 +688,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { String spbm = item.getSpbm(); String spmc = item.getXmmc(); String sl = item.getSl(); + item.setZnfm(ConfigureConstant.STRING_0); if (StringUtils.isNotBlank(spbm) && !ConfigureConstant.XJZSXHQD.equals(spmc)) { SpjcXx spjcXx = SpjcXx.initSpjcXx(spbm, spmc, sl, qdbz); try { diff --git a/order-management-consumer/src/main/resources/download/OrderExcel.xlsx b/order-management-consumer/src/main/resources/download/OrderExcel.xlsx index cbf7fe1261ef4b8f5552e6bf9eb8d01562d9f581..c4d8a393ee0c554d97c9de77b45323c5593e2ccd 100644 GIT binary patch delta 4949 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