hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-11-04 12:18:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

✨ ERP：初始化销售退货逻辑 100%

Browse Source
This commit is contained in:
YunaiV
2024-02-12 06:52:20 +08:00
parent 926286fe08
commit 798b72778e
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java
View File

@@ -74,4 +74,7 @@ public class ErpSaleOrderPageReqVO extends PageParam {
@Schema(description = "是否可出库", example = "true")
private Boolean outEnable;
@Schema(description = "是否可退货", example = "true")
private Boolean returnEnable;
}

2
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/returns/ErpSaleReturnRespVO.java
View File

@@ -42,7 +42,7 @@ public class ErpSaleReturnRespVO {
@Schema(description = "退货时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("退货时间")
private LocalDateTime outTime;
private LocalDateTime returnTime;
@Schema(description = "销售订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
private Long orderId;

7
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java
View File

@@ -46,11 +46,16 @@ public interface ErpSaleOrderMapper extends BaseMapperX<ErpSaleOrderDO> {
} else if (Objects.equals(reqVO.getReturnStatus(), ErpSaleOrderPageReqVO.RETURN_STATUS_ALL)) {
query.apply("t.return_count = t.total_count");
}
// 可出库
// 可销售出库
if (Boolean.TRUE.equals(reqVO.getOutEnable())) {
query.eq(ErpSaleOrderDO::getStatus, ErpAuditStatus.APPROVE.getStatus())
.apply("t.out_count < t.total_count");
}
// 可销售退货
if (Boolean.TRUE.equals(reqVO.getReturnEnable())) {
query.eq(ErpSaleOrderDO::getStatus, ErpAuditStatus.APPROVE.getStatus())
.apply("t.return_count < t.out_count");
}
if (reqVO.getProductId() != null) {
query.leftJoin(ErpSaleOrderItemDO.class, ErpSaleOrderItemDO::getOrderId, ErpSaleOrderDO::getId)
.eq(reqVO.getProductId() != null, ErpSaleOrderItemDO::getProductId, reqVO.getProductId())