From 2b84bcd0ed69ff328450fb41093898c38731211f Mon Sep 17 00:00:00 2001 From: liufeilong Date: Thu, 13 Apr 2023 09:56:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=98=E6=89=A3=E8=A1=8C=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CommonInterfaceServiceImpl.java | 1 + .../order/consumer/utils/BeanTransitionUtils.java | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) 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 7fa2ef99..b9a74058 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 @@ -613,6 +613,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { } item.setTswl(StrUtil.isBlank(commodityCodeEntity.getTswl())?"0":commodityCodeEntity.getTswl()); + item.setSpbm(commodityCodeEntity.getSpbm()); } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 242872a9..71bdae1d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3522,11 +3522,18 @@ public class BeanTransitionUtils { } ddmxxxBO.setZXBM(detail.getMATNR()); ddmxxxBO.setXMMC(detail.getZCPMC()); - ddmxxxBO.setGGXH(detail.getCHARG()); - ddmxxxBO.setDW(detail.getZSLDW()); - ddmxxxBO.setSPSL(detail.getZZSL()); + if(ConfigureConstant.STRING_1.equals(ddmxxxBO.getFPHXZ())){ + ddmxxxBO.setGGXH(""); + ddmxxxBO.setDW(""); + ddmxxxBO.setSPSL(""); + ddmxxxBO.setDJ(""); + }else { + ddmxxxBO.setGGXH(detail.getCHARG()); + ddmxxxBO.setDW(detail.getZSLDW()); + ddmxxxBO.setSPSL(detail.getZZSL()); + ddmxxxBO.setDJ(detail.getZZDJ()); + } ddmxxxBO.setSL(new BigDecimal(detail.getZTAX()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP).toString()); - ddmxxxBO.setDJ(detail.getZZDJ()); ddmxxxBO.setJE(detail.getZHSJE()); ddmxxxBO.setHSBZ(ConfigureConstant.STRING_1); ddmxxxBO.setSE(detail.getZZSE());