汽运结算报销增加服务费、实付金额等字段

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranSettlementReport.java

@@ -127,6 +127,22 @@ public class TranSettlementReport extends BaseModel<TranSettlementReport> {
      * 扣款(元)
      */
     private String deductionAmount;
+    /**
+     * 服务费(元)
+     */
+    private Double serviceCharge;
+    /**
+     * 实付金额(元)
+     */
+    private Double amountActuallyPaid;
+    /**
+     * 合计应付(元)
+     */
+        private Double totalPayable;
+    /**
+     * 税点(元)
+     */
+    private Double taxPoint;
     /**
      * 应付金额（元/吨）
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -320,8 +320,21 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                     }
                                 }
                                 tranSettlementReport.setSettlementWeight(tranCarInfo.getLoadNetWeight());
+                                tranSettlementReport.setServiceCharge(20d);
                                 //应付
                                 tranSettlementReport.setAmountIngPayable(Float.valueOf(tranCarInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
+                                //实付金额
+                                if(tranSettlementReport.getDeductionAmount() != null){
+                                    tranSettlementReport.setAmountActuallyPaid(Double.valueOf(tranCarInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight()
+                                            - Double.valueOf(tranSettlementReport.getDeductionAmount()) - tranSettlementReport.getServiceCharge());
+                                }else{
+                                    tranSettlementReport.setAmountActuallyPaid(Double.valueOf(tranCarInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight()
+                                            - tranSettlementReport.getServiceCharge());
+                                }
+                                //税点
+                                tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
+                                //合计应付
+                                tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
                                 //未付
                                 tranSettlementReport.setAmountNotPayable(Float.valueOf(tranCarInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
                                 tranSettlementReport.setTranCarNo(tranCarInfo.getTranCarNo());
@@ -449,11 +462,21 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                         tranSettlementReport1.setDeductionAmount("0");
                                         //应付=单价x结算重量-扣款
                                         tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getTransportPrice() * tranSettlementReport1.getSettlementWeight());
+                                        //实付金额
+                                        tranSettlementReport1.setAmountActuallyPaid(Double.valueOf(tranSettlementReport1.getTransportPrice()) * tranSettlementReport1.getSettlementWeight()
+                                                - tranSettlementReport1.getServiceCharge());
                                     } else {
                                         tranSettlementReport1.setDeductionAmount(String.format("%.2f", (Float.valueOf(tranCarInfo.getLoadNetWeight() - tranCarInfo.getUnloadNetWeight()) - (tranCarInfo.getLoadNetWeight() / 1000)) * Float.valueOf(tranCarInfo.getTranPrice())));
                                         //应付=单价x结算重量-扣款
                                         tranSettlementReport1.setAmountIngPayable(tranSettlementReport1.getTransportPrice() * tranSettlementReport1.getSettlementWeight() - Float.valueOf(tranSettlementReport1.getDeductionAmount()));
+                                        //实付金额
+                                        tranSettlementReport1.setAmountActuallyPaid(Double.valueOf(tranSettlementReport1.getTransportPrice()) * tranSettlementReport1.getSettlementWeight()
+                                                - Double.valueOf(tranSettlementReport1.getDeductionAmount()) - tranSettlementReport1.getServiceCharge());
                                     }
+                                    //税点
+                                    tranSettlementReport1.setTaxPoint(tranSettlementReport1.getAmountActuallyPaid()/0.946*0.054);
+                                    //合计应付
+                                    tranSettlementReport1.setTotalPayable(tranSettlementReport1.getAmountActuallyPaid()+tranSettlementReport1.getTaxPoint());
                                 }
                                 tranSettlementReportService.updateById(tranSettlementReport1);
                                 }
@@ -494,6 +517,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                             tranSettlementReport.setLoadingImg(tranCarInfo.getLoadPoundImg());
                             tranSettlementReport.setUnloadingWeight(tranCarInfo.getUnloadNetWeight());
                             tranSettlementReport.setUnloadingImg(tranCarInfo.getUnloadPoundImg());
+                            tranSettlementReport.setServiceCharge(20d);
                             //损耗
                             tranSettlementReport.setLossWeight(tranCarInfo.getLoadNetWeight() - tranCarInfo.getUnloadNetWeight());
                             //扣款
@@ -501,11 +525,21 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                 tranSettlementReport.setDeductionAmount("0");
                                 //应付=单价x结算重量-扣款
                                 tranSettlementReport.setAmountIngPayable(tranSettlementReport.getTransportPrice() * tranSettlementReport.getSettlementWeight());
+                                //实付金额
+                                tranSettlementReport.setAmountActuallyPaid(Double.valueOf(tranSettlementReport.getTransportPrice()) * Double.valueOf(tranSettlementReport.getSettlementWeight())
+                                         - tranSettlementReport.getServiceCharge());
                             } else {
                                 tranSettlementReport.setDeductionAmount(String.format("%.2f", (Float.valueOf(tranCarInfo.getLoadNetWeight() - tranCarInfo.getUnloadNetWeight()) - (tranCarInfo.getLoadNetWeight() / 1000)) * Float.valueOf(tranCarInfo.getTranPrice())));
                                 //应付=单价x结算重量-扣款
                                 tranSettlementReport.setAmountIngPayable(tranSettlementReport.getTransportPrice() * tranSettlementReport.getSettlementWeight() - Float.valueOf(tranSettlementReport.getDeductionAmount()));
+                                //实付金额
+                                tranSettlementReport.setAmountActuallyPaid(Double.valueOf(tranSettlementReport.getTransportPrice()) * Double.valueOf(tranSettlementReport.getSettlementWeight())
+                                        - Double.valueOf(tranSettlementReport.getDeductionAmount()) - tranSettlementReport.getServiceCharge());
                             }
+                            //税点
+                            tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
+                            //合计应付
+                            tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
                             //未付
                             tranSettlementReport.setAmountNotPayable(tranSettlementReport.getAmountIngPayable());
                             tranSettlementReport.setBatchId(batchReviewInfo.getId());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranSettlementReportServiceImpl.java

@@ -221,7 +221,7 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
     }
 
     /**
-     * 修改结算重量0修改扣款1修改已开发票2设置本次账户3
+     * 修改结算重量0修改扣款1修改已开发票2设置本次账户3服务费4
      *
      * @param tranSettlementReport
      * @return
@@ -270,12 +270,31 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                 return "OK";
             }
             //2 修改已开发票
-            else {
+            else if (tranSettlementReport.getFlag() == 2){
                 tranSettlementReport1.setAlreadyInvoice(tranSettlementReport1.getAlreadyInvoice() + tranSettlementReport.getAlreadyInvoice());
                 //更改汽运结算信息
                 this.updateById(tranSettlementReport1);
                 return "OK";
             }
+            //4 修改服务费
+            else{
+                tranSettlementReport1.setServiceCharge(tranSettlementReport.getServiceCharge());
+                //实付金额
+                if(tranSettlementReport1.getDeductionAmount() != null){
+                    tranSettlementReport1.setAmountActuallyPaid(Double.valueOf(tranSettlementReport1.getTransportPrice()) * tranSettlementReport1.getSettlementWeight()
+                            - Double.valueOf(tranSettlementReport.getDeductionAmount()) - tranSettlementReport1.getServiceCharge());
+                }else{
+                    tranSettlementReport1.setAmountActuallyPaid(Double.valueOf(tranSettlementReport1.getTransportPrice()) * tranSettlementReport1.getSettlementWeight()
+                            - tranSettlementReport1.getServiceCharge());
+                }
+                //税点
+                tranSettlementReport1.setTaxPoint(tranSettlementReport1.getAmountActuallyPaid()/0.946*0.054);
+                //合计应付
+                tranSettlementReport1.setTotalPayable(tranSettlementReport1.getAmountActuallyPaid()+tranSettlementReport1.getTaxPoint());
+                //更改汽运结算信息
+                this.updateById(tranSettlementReport1);
+                return "OK";
+            }
         }
         return "NG";
     }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -962,6 +962,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         if (tranSettlementReport!=null) {
                             tranSettlementReport.setUnloadingWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             tranSettlementReport.setUnloadingImg(warehouseInOutInfo.getAddressUrl());
+//                            tranSettlementReport.setServiceCharge(20d);
                             //损耗
                             tranSettlementReport.setLossWeight(tranSettlementReport.getLoadingWeight() - tranSettlementReport.getUnloadingWeight());
                             //汽运类型
@@ -977,11 +978,21 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranSettlementReport.setDeductionAmount("0");
                                         //应付=单价x结算重量-扣款
                                         tranSettlementReport.setAmountIngPayable(tranSettlementReport.getTransportPrice() * tranSettlementReport.getSettlementWeight());
+                                        //实付金额
+                                        tranSettlementReport.setAmountActuallyPaid(Double.valueOf(tranSettlementReport.getTransportPrice()) * tranSettlementReport.getSettlementWeight()
+                                                - tranSettlementReport.getServiceCharge());
                                     } else {
                                         tranSettlementReport.setDeductionAmount(String.format("%.2f", (Float.valueOf(tranSettlementReport.getLoadingWeight() - tranSettlementReport.getUnloadingWeight()) - (tranSettlementReport.getLoadingWeight() / 1000)) * Float.valueOf(tranSettlementReport.getTransportPrice())));
                                         //应付=单价x结算重量-扣款
                                         tranSettlementReport.setAmountIngPayable(tranSettlementReport.getTransportPrice() * tranSettlementReport.getSettlementWeight() - Float.valueOf(tranSettlementReport.getDeductionAmount()));
+                                        //实付金额
+                                        tranSettlementReport.setAmountActuallyPaid(Double.valueOf(tranSettlementReport.getTransportPrice()) * tranSettlementReport.getSettlementWeight()
+                                                - Double.valueOf(tranSettlementReport.getDeductionAmount()) - tranSettlementReport.getServiceCharge());
                                     }
+                                    //税点
+                                    tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
+                                    //合计应付
+                                    tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
                                 }
                             }
                             tranSettlementReportService.updateById(tranSettlementReport);
@@ -1489,10 +1500,23 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
                                     tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
                                     tranSettlementReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                    tranSettlementReport.setServiceCharge(20d);
                                     //运输单价不为空
                                     if (tranProcessInfo.getTranPrice()!=null){
                                         //应付
                                         tranSettlementReport.setAmountIngPayable(Float.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
+                                        //实付金额
+                                        if(tranSettlementReport.getDeductionAmount() != null){
+                                            tranSettlementReport.setAmountActuallyPaid(Double.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight()
+                                                    - Double.valueOf(tranSettlementReport.getDeductionAmount()) - tranSettlementReport.getServiceCharge());
+                                        }else{
+                                            tranSettlementReport.setAmountActuallyPaid(Double.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight()
+                                                    - tranSettlementReport.getServiceCharge());
+                                        }
+                                        //税点
+                                        tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
+                                        //合计应付
+                                        tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
                                         //未付
                                         tranSettlementReport.setAmountNotPayable(Float.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
                                         tranSettlementReport.setTransportPrice(Float.valueOf(tranProcessInfo.getTranPrice()));
@@ -1652,8 +1676,21 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
                             tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
                             tranSettlementReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            tranSettlementReport.setServiceCharge(20d);
                             //运输单价不为空
                             if (warehouseInOutInfo.getFreight()!=null){
+                                //实付金额
+                                if(tranSettlementReport.getDeductionAmount() != null){
+                                    tranSettlementReport.setAmountActuallyPaid(Double.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight()
+                                            - Double.valueOf(tranSettlementReport.getDeductionAmount()) - tranSettlementReport.getServiceCharge());
+                                }else{
+                                    tranSettlementReport.setAmountActuallyPaid(Double.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight()
+                                            - tranSettlementReport.getServiceCharge());
+                                }
+                                //税点
+                                tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
+                                //合计应付
+                                tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
                                 //应付
                                 tranSettlementReport.setAmountIngPayable(Float.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight());
                                 //未付
@@ -2160,8 +2197,21 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         tranSettlementReport.setContractNo(warehouseInOutInfo.getContractNo());
                         tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
                         tranSettlementReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                        tranSettlementReport.setServiceCharge(20d);
                         //运输单价不为空
                         if (warehouseInOutInfo.getFreight()!=null){
+                            //实付金额
+                            if(tranSettlementReport.getDeductionAmount() != null){
+                                tranSettlementReport.setAmountActuallyPaid(Double.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight()
+                                        - Double.valueOf(tranSettlementReport.getDeductionAmount()) - tranSettlementReport.getServiceCharge());
+                            }else{
+                                tranSettlementReport.setAmountActuallyPaid(Double.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight()
+                                        - tranSettlementReport.getServiceCharge());
+                            }
+                            //税点
+                            tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
+                            //合计应付
+                            tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
                             //应付
                             tranSettlementReport.setAmountIngPayable(Float.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight());
                             //未付
@@ -3590,6 +3640,18 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                             //应付=单价x结算重量-扣款
                                             tranSettlementReport.setAmountIngPayable(tranSettlementReport.getTransportPrice() * tranSettlementReport.getSettlementWeight() - Float.valueOf(tranSettlementReport.getDeductionAmount()));
                                         }
+                                        //实付金额
+                                        if(tranSettlementReport.getDeductionAmount() != null){
+                                            tranSettlementReport.setAmountActuallyPaid(Double.valueOf(tranSettlementReport.getTransportPrice()) * tranSettlementReport.getSettlementWeight()
+                                                    - Double.valueOf(tranSettlementReport.getDeductionAmount()) - tranSettlementReport.getServiceCharge());
+                                        }else{
+                                            tranSettlementReport.setAmountActuallyPaid(Double.valueOf(tranSettlementReport.getTransportPrice()) * tranSettlementReport.getSettlementWeight()
+                                                    - tranSettlementReport.getServiceCharge());
+                                        }
+                                        //税点
+                                        tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
+                                        //合计应付
+                                        tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
                                     }
                                 }
                             }
@@ -4207,8 +4269,21 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     tranSettlementReport.setTranCarNo(warehouseInOutInfo.getTranCarNo());
                                     tranSettlementReport.setStartAddress(warehouseInOutInfo.getWarehouseName());
                                     tranSettlementReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                                    tranSettlementReport.setServiceCharge(20d);
                                     //运输单价不为空
                                     if (tranProcessInfo.getTranPrice()!=null){
+                                        //实付金额
+                                        if(tranSettlementReport.getDeductionAmount() != null){
+                                            tranSettlementReport.setAmountActuallyPaid(Double.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight()
+                                                    - Double.valueOf(tranSettlementReport.getDeductionAmount()) - tranSettlementReport.getServiceCharge());
+                                        }else{
+                                            tranSettlementReport.setAmountActuallyPaid(Double.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight()
+                                                     - tranSettlementReport.getServiceCharge());
+                                        }
+                                        //税点
+                                        tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
+                                        //合计应付
+                                        tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
                                         //应付
                                         tranSettlementReport.setAmountIngPayable(Float.valueOf(tranProcessInfo.getTranPrice()) * tranSettlementReport.getSettlementWeight());
                                         //未付
@@ -4385,8 +4460,21 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             tranSettlementReport.setCarNo(warehouseInOutInfo.getCarNo());
                             tranSettlementReport.setStartAddress(warehouseInOutInfo.getWarehouseName());
                             tranSettlementReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                            tranSettlementReport.setServiceCharge(20d);
                             //运输单价不为空
                             if (warehouseInOutInfo.getFreight()!=null){
+                                //实付金额
+                                if(tranSettlementReport.getDeductionAmount() != null){
+                                    tranSettlementReport.setAmountActuallyPaid(Double.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight()
+                                            - Double.valueOf(tranSettlementReport.getDeductionAmount()) - tranSettlementReport.getServiceCharge());
+                                }else{
+                                    tranSettlementReport.setAmountActuallyPaid(Double.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight()
+                                            - tranSettlementReport.getServiceCharge());
+                                }
+                                //税点
+                                tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
+                                //合计应付
+                                tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
                                 //应付
                                 tranSettlementReport.setAmountIngPayable(Float.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight());
                                 //未付
@@ -4962,8 +5050,21 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         tranSettlementReport.setTranCarNo(warehouseInOutInfo.getTranCarNo());
                         tranSettlementReport.setStartAddress(warehouseInOutInfo.getWarehouseName());
                         tranSettlementReport.setSettlementWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
+                        tranSettlementReport.setServiceCharge(20d);
                         //运输单价不为空
                         if (warehouseInOutInfo.getFreight()!=null){
+                            //实付金额
+                            if(tranSettlementReport.getDeductionAmount() != null){
+                                tranSettlementReport.setAmountActuallyPaid(Double.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight()
+                                        - Double.valueOf(tranSettlementReport.getDeductionAmount()) - tranSettlementReport.getServiceCharge());
+                            }else{
+                                tranSettlementReport.setAmountActuallyPaid(Double.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight()
+                                        - tranSettlementReport.getServiceCharge());
+                            }
+                            //税点
+                            tranSettlementReport.setTaxPoint(tranSettlementReport.getAmountActuallyPaid()/0.946*0.054);
+                            //合计应付
+                            tranSettlementReport.setTotalPayable(tranSettlementReport.getAmountActuallyPaid()+tranSettlementReport.getTaxPoint());
                             //应付
                             tranSettlementReport.setAmountIngPayable(Float.valueOf(warehouseInOutInfo.getFreight()) * tranSettlementReport.getSettlementWeight());
                             //未付

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranSettlementReportMapper.xml

@@ -70,6 +70,10 @@
         batch_id as batchId,
         phone,
         name as name,
+        service_charge as serviceCharge,
+        amount_actually_paid as amountActuallyPaid,
+        tax_point as taxPoint,
+        total_payable as totalPayable,
         tran_car_no as tranCarNo,
         tran_type_Key as tranTypeKey,
         car_no as carNo,