废品销售单明细增加税率字段；一行明细扩充为三行数据传到SAP

topsun-xt/src/main/webapp/biz/topsun/sap/wasteSale/wasteSaleDetail.js

@@ -180,6 +180,12 @@ function getGridColumns(){
                 required: true, type: "text",mask: '9999999.99'
             }
         },)
+        columns.push({
+            display: "税率", name: "kbetr", width: 120, minWidth: 60, type: "string", align: "left",
+            editor: {
+                required: true, type: "text",mask: '9999999.99'
+            }
+        },)
         columns.push({
             display: "总价", name: "amount", width: 120, minWidth: 60, type: "string", align: "left",
             render: function (item){

topsun/src/main/java/com/huigou/topsun/sap/wasteSale/application/impl/WasteSaleApplicationImpl.java

 package com.huigou.topsun.sap.wasteSale.application.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.math.MathUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.huigou.cache.DictUtil;
 import com.huigou.data.domain.model.CommonDomainConstants;
@@ -34,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -118,8 +120,23 @@ public class WasteSaleApplicationImpl extends FlowBroker implements WasteSaleApp
             sapWasteSaleItemNextVo.setBschl("50");
             sapWasteSaleItemNextVo.setKtonr("6301090000");
             sapWasteSaleItemNextVo.setRstgr("");
+            //计算不含税总价  “单项总价”/1+税率
+            BigDecimal decimal = wasteSaleItem.getAmount().divide(wasteSaleItem.getKbetr().add(BigDecimal.ONE),2,BigDecimal.ROUND_HALF_UP);
+            sapWasteSaleItemNextVo.setWrbtr(decimal.toString());
             sapWasteSaleVoList.add(sapWasteSaleItemNextVo);
             i++;
+            SapWasteSaleItemVo sapWasteSaleItemThirdVo = new SapWasteSaleItemVo();
+            BeanUtil.copyProperties(sapWasteSaleItemVo,sapWasteSaleItemThirdVo);
+            sapWasteSaleItemThirdVo.setBuzei(i.toString());
+            sapWasteSaleItemThirdVo.setShkzg("H");
+            sapWasteSaleItemThirdVo.setBschl("50");
+            sapWasteSaleItemThirdVo.setKtonr("2221010400");
+            sapWasteSaleItemThirdVo.setRstgr("");
+            //税费=含税-不含税
+            BigDecimal subtract = wasteSaleItem.getAmount().subtract(decimal);
+            sapWasteSaleItemThirdVo.setWrbtr(subtract.toString());
+            sapWasteSaleVoList.add(sapWasteSaleItemThirdVo);
+            i++;
         }
         sapWasteSaleVo.setWasteSaleItemVos(sapWasteSaleVoList);
         try {

topsun/src/main/java/com/huigou/topsun/sap/wasteSale/domain/WasteSaleItem.java

@@ -95,4 +95,10 @@ public class WasteSaleItem extends AbstractEntity {
      */
     @Column(name = "sale_goods")
     private String saleGoods;
+
+    /**
+     * 税率
+     */
+    @Column(name = "kbetr")
+    private BigDecimal kbetr;
 }