优化完善销售单保存材料费和附件费

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;
 }

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<>();// 附加项目
 
 

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("备注")

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);