BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 62ef4b16afb2680fa0688683ae40c0df9b2bb1c8

Authored by YunaiV
1 parent 0599f539

✨ ERP：采购入库 100%

Inline Side-by-side
Showing 4 changed files with 8 additions and 8 deletions
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java
  View file @62ef4b1
... ... @@ -68,8 +68,8 @@ public class ErpPurchaseInRespVO {
68 68 @Schema(description = "定金金额，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
69 69 private BigDecimal otherPrice;
70 70  
71   - @Schema(description = "本次收款，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
72   - private BigDecimal payPrice;
  71 + @Schema(description = "本次付款，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
  72 + private BigDecimal refundPrice;
73 73 @Schema(description = "本次欠款，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
74 74 private BigDecimal debtPrice;
75 75  
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInSaveReqVO.java
  View file @62ef4b1
... ... @@ -32,9 +32,9 @@ public class ErpPurchaseInSaveReqVO {
32 32 @Schema(description = "其它金额，单位：元", example = "7127")
33 33 private BigDecimal otherPrice;
34 34  
35   - @Schema(description = "本次收款，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
36   - @NotNull(message = "本次收款不能为空")
37   - private BigDecimal payPrice;
  35 + @Schema(description = "本次付款，单位：元", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
  36 + @NotNull(message = "本次付款不能为空")
  37 + private BigDecimal refundPrice;
38 38  
39 39 @Schema(description = "附件地址", example = "https://www.iocoder.cn")
40 40 private String fileUrl;
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInDO.java
  View file @62ef4b1
... ... @@ -107,9 +107,9 @@ public class ErpPurchaseInDO extends BaseDO {
107 107 /**
108 108 * 本次收款，单位：元
109 109 *
110   - * payPrice = totalPrice + otherPrice - debtPrice
  110 + * refundPrice = totalPrice + otherPrice - debtPrice
111 111 */
112   - private BigDecimal payPrice;
  112 + private BigDecimal refundPrice;
113 113 /**
114 114 * 本次欠款，单位：元
115 115 */
... ...
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
  View file @62ef4b1
... ... @@ -143,7 +143,7 @@ public class ErpPurchaseInServiceImpl implements ErpPurchaseInService {
143 143 purchaseIn.setTotalPrice(purchaseIn.getTotalPrice().subtract(purchaseIn.getDiscountPrice()));
144 144 // 计算应收金额
145 145 BigDecimal allPrice = purchaseIn.getTotalPrice().add(purchaseIn.getOtherPrice());
146   - purchaseIn.setDebtPrice(allPrice.subtract(purchaseIn.getPayPrice()));
  146 + purchaseIn.setDebtPrice(allPrice.subtract(purchaseIn.getRefundPrice()));
147 147 }
148 148  
149 149 private void updatePurchaseOrderInCount(Long orderId) {
... ...