From f9e9f7e980122f70f65cfb303c17eba5c2084760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Fri, 23 Aug 2024 09:40:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=97=B6=E7=A9=BA=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/bespoke/model/sk/SkOrderItemInfo.java | 5 +++++ .../modules/bespoke/service/impl/SkOrderServiceImpl.java | 1 + .../resources/mybatis/mapper/SkOrderItemInfoMapper.xml | 8 +++++++- .../src/main/resources/mybatis/mapper/SkOrderMapper.xml | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/sk/SkOrderItemInfo.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/sk/SkOrderItemInfo.java index e27ed8a..cc56b89 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/sk/SkOrderItemInfo.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/sk/SkOrderItemInfo.java @@ -60,4 +60,9 @@ public class SkOrderItemInfo { * 相关单据编号 */ private String xgdjbh; + + /** + * 备注 + */ + private String beizhu; } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java index fc7b127..c3b150d 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java @@ -355,6 +355,7 @@ public class SkOrderServiceImpl implements OrderService { ddmxxxBO.setSE(new BigDecimal(orderItemInfo.getSe()).setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString()); ddmxxxBO.setDJ(getDynamicLengthDecimal(ddmxxxBO.getJE(), ddmxxxBO.getSPSL())); ddmxxxBO.setFPHXZ(ConfigureConstant.STRING_0); + ddmxxxBO.setBZ(orderItemInfo.getBeizhu()); ddmxxxBO.setHSBZ(ConfigureConstant.STRING_1); ddmxxxBO.setBYZD1(orderItemInfo.getHsdj()); //累计求金额和税额 diff --git a/order-management-order/src/main/resources/mybatis/mapper/SkOrderItemInfoMapper.xml b/order-management-order/src/main/resources/mybatis/mapper/SkOrderItemInfoMapper.xml index 4355c89..cd4959a 100644 --- a/order-management-order/src/main/resources/mybatis/mapper/SkOrderItemInfoMapper.xml +++ b/order-management-order/src/main/resources/mybatis/mapper/SkOrderItemInfoMapper.xml @@ -18,7 +18,7 @@ - select id, order_id, cpmc, xh, cpdw, cpsl, hsdj, hsje, sl, se, create_time, update_time,xgdjbh from sk_order_item_info + select id, order_id, cpmc, xh, cpdw, cpsl, hsdj, hsje, sl, se, create_time, update_time,xgdjbh,beizhu from sk_order_item_info @@ -63,6 +63,9 @@ xgdjbh, + + beizhu, + @@ -104,6 +107,9 @@ #{xgdjbh}, + + #{beizhu}, + diff --git a/order-management-order/src/main/resources/mybatis/mapper/SkOrderMapper.xml b/order-management-order/src/main/resources/mybatis/mapper/SkOrderMapper.xml index 8a1f21b..ac5b819 100644 --- a/order-management-order/src/main/resources/mybatis/mapper/SkOrderMapper.xml +++ b/order-management-order/src/main/resources/mybatis/mapper/SkOrderMapper.xml @@ -31,6 +31,7 @@ sl, xh, xgdjbh, + beizhu, se from v_invoice_detail_fp where xsddm = #{xsddm}