From 332237012a7515950b806de93ac607bcc4820909 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 6 Aug 2024 14:59:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=8C=E5=96=84=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E5=8D=95=E4=BF=9D=E5=AD=98=E6=9D=90=E6=96=99=E8=B4=B9?=
 =?UTF-8?q?=E5=92=8C=E9=99=84=E4=BB=B6=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/sms/biz/smssalesbill/SmsSalesBill.java    |  4 ++++
 .../biz/smssalesbill/SmsSalesBillDetailsVo.java   |  4 ++++
 .../yxt/sms/biz/smssalesbill/SmsSalesBillDto.java |  5 ++++-
 .../sms/biz/smssalesbill/SmsSalesBillService.java | 15 ++++++++-------
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java
index 4de5edaf17..967ed27409 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBill.java
@@ -102,4 +102,8 @@ public class SmsSalesBill extends BaseEntity {
     private String vehMark; // 车牌号
     @ApiModelProperty("车架号")
     private String vinNo; // 车架号
+    @ApiModelProperty("材料费")
+    private BigDecimal goodsAmount;
+    @ApiModelProperty("附加费")
+    private BigDecimal addAmount;
 }
diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillDetailsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillDetailsVo.java
index 98fb13080d..7ed413d0c8 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillDetailsVo.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillDetailsVo.java
@@ -110,6 +110,10 @@ public class SmsSalesBillDetailsVo implements Vo {
     private String customerOrg; // 客户单位
     @ApiModelProperty("应收金额")
     private String receivableAmount;
+    @ApiModelProperty("材料费")
+    private String goodsAmount;
+    @ApiModelProperty("附加费")
+    private String addAmount;
     private List<SmsAttachitemVo> aitemVos = new ArrayList<>();// 附加项目
 
 
diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillDto.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillDto.java
index ded5cebef6..f177d549e6 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillDto.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillDto.java
@@ -100,7 +100,10 @@ public class SmsSalesBillDto implements Dto {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
 
-
+    @ApiModelProperty("材料费")
+    private String goodsAmount;
+    @ApiModelProperty("附加费")
+    private String addAmount;
     @ApiModelProperty("车架号")
     private String vinNo; // 车架号
     @ApiModelProperty("备注")
diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
index b7fc30b204..2b5063c106 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
@@ -688,16 +688,17 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
                     goodsPdfVo.setSortNo(String.valueOf(i + 1));
                     BigDecimal price = BigDecimal.ZERO;
                     BigDecimal count = BigDecimal.ZERO;
-                    if (null != goodsDetailsVo.getPrice()) {
-                        price = goodsDetailsVo.getPrice();
+                    if (null != goodsDetailsVo.getAmount()) {
+                        price = goodsDetailsVo.getAmount();
                     }
-                    if (null != goodsDetailsVo.getCount()) {
-                        count = goodsDetailsVo.getCount();
-                    }
-                    BigDecimal amount = price.multiply(count);
+//                    if (null != goodsDetailsVo.getCount()) {
+//                        count = goodsDetailsVo.getCount();
+//                    }
+//                    BigDecimal amount = price.multiply(count);
                     goodsPdfVos.add(goodsPdfVo);
-                    sumMoney2.add(amount);
+                    sumMoney2 = sumMoney2.add(price);
                 }
+                vo.setGoods(goodsPdfVos);
             }
             vo.setAmountTotal(sumMoney2.toString());
             String caps2 = bigDecimalToLocalStr(sumMoney2);