hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-10-30 01:38:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

✨ ERP：采购入库 100%

Browse Source
This commit is contained in:
YunaiV
2024-02-12 16:51:56 +08:00
parent 0599f5392c
commit 62ef4b16af
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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