2023年1月30 16:59

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/excel/ChargeExcel.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -48,4 +49,10 @@ public class ChargeExcel {
 	 */
 	@ExcelProperty(value = "溢付款余额")
 	private BigDecimal inOverpayment;
+
+	/**
+	 * 期初金额
+	 */
+	@ExcelProperty(value = "期初金额")
+	private BigDecimal openingAmount;
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/excel/ChargeItemExcel.java

@@ -4,9 +4,11 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  *  应收账款余额明细导出
@@ -38,6 +40,12 @@ public class ChargeItemExcel {
 	private BigDecimal amount;
 
 	/**
+	 * 日期
+	 */
+	@ExcelProperty(value = "日期")
+	private Date createTime;
+
+	/**
 	 * 科目代码
 	 */
 	@ExcelProperty(value = "科目代码")
@@ -72,4 +80,16 @@ public class ChargeItemExcel {
 	 */
 	@ExcelProperty(value = "使用溢付款")
 	private String caseOverPayment;
+
+	/**
+	 * 到货数量
+	 */
+	@ExcelProperty(value = "到货数量")
+	private BigDecimal actualQuantity;
+
+	/**
+	 * 到货金额
+	 */
+	@ExcelProperty(value = "到货金额")
+	private BigDecimal arrivalAmount;
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/excel/PayExcel.java

@@ -48,4 +48,10 @@ public class PayExcel {
 	 */
 	@ExcelProperty(value = "溢付款余额")
 	private BigDecimal inOverpayment;
+
+	/**
+	 * 期初金额
+	 */
+	@ExcelProperty(value = "期初金额")
+	private BigDecimal openingAmount;
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/excel/PayItemExcel.java

@@ -4,9 +4,11 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  *  应付账款余额明细导出
@@ -38,6 +40,12 @@ public class PayItemExcel {
 	private BigDecimal amount;
 
 	/**
+	 * 日期
+	 */
+	@ExcelProperty(value = "日期")
+	private Date createTime;
+
+	/**
 	 * 科目代码
 	 */
 	@ExcelProperty(value = "科目代码")
@@ -66,4 +74,5 @@ public class PayItemExcel {
 	 */
 	@ExcelProperty(value = "使用溢付款")
 	private String caseOverPayment;
+
 }

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vojo/Acc.java

@@ -542,4 +542,22 @@ public class Acc implements Serializable {
 	 */
 	@TableField(exist = false)
 	private String whetherStatistics;
+
+	/**
+	 * 期初金额
+	 */
+	@TableField(exist = false)
+	private BigDecimal openingAmount;
+
+	/**
+	 * 到货数量
+	 */
+	@TableField(exist = false)
+	private BigDecimal actualQuantity;
+
+	/**
+	 * 到货金额
+	 */
+	@TableField(exist = false)
+	private BigDecimal arrivalAmount;
 }

blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/AccMapper.xml

@@ -69,7 +69,8 @@
         IFNULL( BC.amount, 0 ) AS amount,
         IFNULL( FS.settlementAmount, 0 ) AS settlementAmount,
         IFNULL( IFNULL( BC.amount, 0 ) - IFNULL( FS.settlementAmount, 0 ), 0 ) AS balance,
-        IFNULL( BO.in_overpayment, 0 ) AS inOverpayment
+        IFNULL( BO.in_overpayment, 0 ) AS inOverpayment,
+        BCD.opening_amount AS openingAmount
         FROM finance_acc FC
         LEFT JOIN basic_corps_desc BCD ON BCD.id = FC.Corpid
         LEFT JOIN business_overpayment BO ON BO.corp_id = FC.Corpid
@@ -132,8 +133,24 @@
         SELECT
         FA.AccSysNo AS accSysNo,
         FA.quantity AS quantity,
-        FA.Amount AS amount
+        FA.Amount AS amount,
+        FA.create_time AS createTime,
+        BO.actualQuantity AS actualQuantity,
+        BO.arrivalAmount AS arrivalAmount
         FROM finance_acc FA
+        LEFT JOIN (
+            SELECT
+                BO.id,
+                IFNULL( SUM(BOI.actual_quantity), 0) AS actualQuantity,
+                IFNULL( SUM( BOI.actual_quantity * BOI.price ), 0 ) AS arrivalAmount
+            FROM business_order BO
+            LEFT JOIN business_order_items BOI ON BOI.pid = BO.id
+            WHERE
+                BO.is_deleted = 0
+                AND BOI.is_deleted = 0
+            GROUP BY
+            BO.id
+        ) BO ON BO.id = FA.Src_parent_id
         <where>
             FA.tenant_id = #{acc.tenantId}
             AND FA.is_deleted = 0
@@ -166,9 +183,25 @@
         FS.ACCOUNT_NAME AS accountName,
         FS.ACCOUNT_no AS accountNo,
         FS.over_payment AS overPayment,
-        FS.case_over_payment AS caseOverPayment
+        FS.case_over_payment AS caseOverPayment,
+        FS.create_time AS createTime,
+        BO.actualQuantity AS actualQuantity,
+        BO.arrivalAmount AS arrivalAmount
         FROM finance_settlement FS
         LEFT JOIN finance_items FI ON FI.pid = FS.id
+        LEFT JOIN (
+            SELECT
+                BO.id,
+                IFNULL( SUM(BOI.actual_quantity), 0) AS actualQuantity,
+                IFNULL( SUM( BOI.actual_quantity * BOI.price ), 0 ) AS arrivalAmount
+            FROM business_order BO
+            LEFT JOIN business_order_items BOI ON BOI.pid = BO.id
+            WHERE
+                BO.is_deleted = 0
+                AND BOI.is_deleted = 0
+            GROUP BY
+            BO.id
+        ) BO ON BO.id = FI.Src_parent_id
         <where>
             FS.tenant_id = #{acc.tenantId}
             AND FS.is_deleted = 0

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -298,6 +298,10 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 			if (CollectionUtils.isNotEmpty(itemsList)) {
 				reduce = itemsList.stream().map(Items::getThisAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 			}
+
+			if (ObjectUtil.isNotEmpty(settlement.getAmount())){
+				settlement.setAmount(BigDecimal.ZERO);
+			}
 			//如果人民币金额大于核销金额明细生成溢付款  小于使用溢付款
 			if (settlement.getAmount().compareTo(reduce) > 0) {
 				if (settlement.getCaseOverPayment() != null && settlement.getCaseOverPayment().compareTo(BigDecimal.ZERO) > 0) {

blade-service/trade-purchase/src/main/java/com/trade/purchase/extra/service/impl/ClaimServiceImpl.java

@@ -290,6 +290,11 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
 		}
 	}
 
+	/**
+	 * 审核通过
+	 *
+	 * @param id
+	 */
 	@Override
 	public void passCheck(Long id) {
 		Claim claim = baseMapper.selectById(id);
@@ -301,6 +306,9 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
 		editItemStatus(id, 3);
 	}
 
+	/**
+	 * 审核不通过
+	 */
 	@Override
 	public void passCancel(Long id) {
 		Claim claim = baseMapper.selectById(id);
@@ -312,6 +320,11 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
 		editItemStatus(id, 0);
 	}
 
+	/**
+	 * 审核中
+	 *
+	 * @param id
+	 */
 	@Override
 	public void underReview(Long id) {
 		Claim claim = baseMapper.selectById(id);