✨ ERP：采购入库 100%

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java

@@ -68,8 +68,8 @@ public class ErpPurchaseInRespVO {
     @Schema(description = "定金金额，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
     private BigDecimal otherPrice;
 
-    @Schema(description = "本次收款，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
-    private BigDecimal payPrice;
+    @Schema(description = "本次付款，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+    private BigDecimal refundPrice;
     @Schema(description = "本次欠款，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
     private BigDecimal debtPrice;
 

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInSaveReqVO.java

@@ -32,9 +32,9 @@ public class ErpPurchaseInSaveReqVO {
     @Schema(description = "其它金额，单位：元", example = "7127")
     private BigDecimal otherPrice;
 
-    @Schema(description = "本次收款，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
-    @NotNull(message = "本次收款不能为空")
-    private BigDecimal payPrice;
+    @Schema(description = "本次付款，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+    @NotNull(message = "本次付款不能为空")
+    private BigDecimal refundPrice;
 
     @Schema(description = "附件地址", example = "https://www.iocoder.cn")
     private String fileUrl;

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInDO.java

@@ -107,9 +107,9 @@ public class ErpPurchaseInDO extends BaseDO {
     /**
      * 本次收款，单位：元
      *
-     * payPrice = totalPrice + otherPrice - debtPrice
+     * refundPrice = totalPrice + otherPrice - debtPrice
      */
-    private BigDecimal payPrice;
+    private BigDecimal refundPrice;
     /**
      * 本次欠款，单位：元
      */

yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java

@@ -143,7 +143,7 @@ public class ErpPurchaseInServiceImpl implements ErpPurchaseInService {
         purchaseIn.setTotalPrice(purchaseIn.getTotalPrice().subtract(purchaseIn.getDiscountPrice()));
         // 计算应收金额
         BigDecimal allPrice = purchaseIn.getTotalPrice().add(purchaseIn.getOtherPrice());
-        purchaseIn.setDebtPrice(allPrice.subtract(purchaseIn.getPayPrice()));
+        purchaseIn.setDebtPrice(allPrice.subtract(purchaseIn.getRefundPrice()));
     }
 
     private void updatePurchaseOrderInCount(Long orderId) {