From 4fe40708251e555b61c760e5c9ebf231498066e9 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 6 May 2024 16:51:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=87=BA=E5=BA=93=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusrepairInventorybillDetailSDto.java | 2 +- .../AsBusrepairInventorybillService.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java index 1cec229ba8..57ef3ab019 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java @@ -55,7 +55,7 @@ public class AsBusrepairInventorybillDetailSDto { @ApiModelProperty("销售价（元）") private String price; //折扣（0-10，0免费，10不打折） - private Integer discount; + private String discount; //优惠金额（=销售价*(1-折扣*0.1）） private String discountAmount; //金额（销售价-优惠金额） diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java index e12a8bdda4..34f11e1d46 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java @@ -168,6 +168,10 @@ public class AsBusrepairInventorybillService extends MybatisBaseService sitemVoList = asBusrepairBillService.selectSitemList(asBusrepairInventorybill.getSourceBillSid()); - return null; + sitemVoList.removeAll(Collections.singleton(null)); + if (!sitemVoList.isEmpty()) { + inventoryBillDetailsVo.setSitemVoList(sitemVoList); + } + return rb.success().setData(inventoryBillDetailsVo); } }