Merge remote-tracking branch 'origin/dev' into dev

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/ep/order/application/impl/EpSaleOrderApplicationImpl.java

@@ -46,6 +46,7 @@ import org.springframework.util.Assert;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Auther: xin.lu
@@ -183,11 +184,11 @@ public class EpSaleOrderApplicationImpl extends FlowBroker implements EpSaleOrde
      */
     private String getApprovalSubjectName(String bizId) {
         EpSaleOrder epSaleOrder = this.epSaleOrderRepository.findOne(bizId);
-        List<EpSaleOrderItem> orderItemList = epSaleOrderItemApplication.findByEpSaleOrderId(epSaleOrder.getId());
+        String vbeln = this.getBizAndApprovalData().getString("vbeln");
         //查询 单据日期
         String fillinDateStr = DateUtil.getDateFormat("yyyy-MM-dd HH:mm:ss", epSaleOrder.getFillinDate());
         //设置标题
-        return String.format("%s-%s(%s)", epSaleOrder.getKunnr(), orderItemList.get(0).getVbeln(), fillinDateStr);
+        return String.format("%s-%s(%s)", epSaleOrder.getKunnr(), vbeln, fillinDateStr);
     }
     
     
@@ -242,13 +243,16 @@ public class EpSaleOrderApplicationImpl extends FlowBroker implements EpSaleOrde
             epSaleOrder.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
 
             Map<String, Object> formData = BeanUtil.beanToMap(epSaleOrder);
+            List<EpSaleOrderItemVo> epSaleOrderItemVos = epSaleOrderVo.getEpSaleOrderItemVos();
+            List<String> vbelns = epSaleOrderItemVos.stream().map(EpSaleOrderItemVo::getVbeln).collect(Collectors.toList());
+            String vbeln = String.join(",", vbelns);
+            formData.put("vbeln",vbeln);
             String bizId = this.startProcessInstance(EpSaleOrderApplication.PROCESS_DEFINITION_KEY, formData, localSdo);
             epSaleOrder.setId(bizId);
            // epSaleOrder.setStatusId(BizBillStatus.APPROVING.getId()); //lxh
             epSaleOrder.setStatusId(BizBillStatus.APPLYING.getId());
             epSaleOrder = epSaleOrderRepository.save(epSaleOrder);
 
-            List<EpSaleOrderItemVo> epSaleOrderItemVos = epSaleOrderVo.getEpSaleOrderItemVos();
             List<EpSaleOrderItem> epSaleOrderItems = new ArrayList<>();
             epSaleOrderItemVos.forEach(epSaleOrderItemVo -> {
                 EpSaleOrderItem epSaleOrderItem = new EpSaleOrderItem();

topsun/src/main/java/com/huigou/topsun/ep/order/application/impl/EpSaleOrderCancelApplicationImpl.java

@@ -45,6 +45,7 @@ import org.springframework.util.Assert;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Auther: xin.lu
@@ -182,11 +183,11 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa
      */
     private String getApprovalSubjectName(String bizId) {
         EpSaleOrderCancel saleOrderCancel = this.epSaleOrderCancelRepository.findOne(bizId);
-        List<EpSaleOrderCancelItem> cancelItemList = epSaleOrderCancelItemApplication.findByEpSaleOrderCancelId(saleOrderCancel.getId());
+        String vbeln = this.getBizAndApprovalData().getString("vbeln");
         //查询 单据日期
         String fillinDateStr = DateUtil.getDateFormat("yyyy-MM-dd HH:mm:ss", saleOrderCancel.getFillinDate());
         //设置标题
-        return String.format("%s-%s(%s)", saleOrderCancel.getCustomerName(), cancelItemList.get(0).getVbeln(), fillinDateStr);
+        return String.format("%s-%s(%s)", saleOrderCancel.getCustomerName(), vbeln, fillinDateStr);
     }
     
     
@@ -240,6 +241,10 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa
             SDO localSdo = new SDO();
             localSdo.setOperator(operator);
             Map<String, Object> formData = BeanUtil.beanToMap(epSaleOrderCancel);
+            List<EpSaleOrderCancelItemVo> epSaleOrderCancelItemVos = epSaleOrderCancelVo.getEpSaleOrderCancelItemVos();
+            List<String> vbelns = epSaleOrderCancelItemVos.stream().map(EpSaleOrderCancelItemVo::getVbeln).collect(Collectors.toList());
+            String vbeln = String.join(",", vbelns);
+            formData.put("vbeln",vbeln);
             String bizId = this.startProcessInstance(EpSaleOrderCancelApplication.PROCESS_DEFINITION_KEY, formData, localSdo);
             epSaleOrderCancel.setId(bizId);
             epSaleOrderCancel.setStatusId(BizBillStatus.APPLYING.getId());  //LXH 改为申请状态
@@ -247,7 +252,7 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa
             BeanUtil.copyProperties(epSaleOrderCancelVo, epSaleOrderCancel);
 
 
-                List<EpSaleOrderCancelItemVo> epSaleOrderCancelItemVos = epSaleOrderCancelVo.getEpSaleOrderCancelItemVos();
+
                 List<EpSaleOrderCancelItem> epSaleOrderCancelItems = new ArrayList<>();
                 epSaleOrderCancelItemVos.forEach(epSaleOrderCancelItemVo -> {
                     EpSaleOrderCancelItem epSaleOrderCancelItem = new EpSaleOrderCancelItem();

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