From eccad5a129106377a275be4f7cdc58e99e9b95d4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 21 七月 2026 13:45:14 +0800
Subject: [PATCH] feat(mes): 实现库存移库功能
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java
index 0b3b2ee..7382197 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java
@@ -1,17 +1,17 @@
package cn.iocoder.yudao.module.erp.dal.mysql.sale;
+import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderPageReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderItemDO;
-import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
-import java.util.Objects;
+import java.util.List;
/**
* ERP 閿�鍞鍗� Mapper
@@ -30,31 +30,32 @@
.likeIfPresent(ErpSaleOrderDO::getRemark, reqVO.getRemark())
.eqIfPresent(ErpSaleOrderDO::getCreator, reqVO.getCreator())
.orderByDesc(ErpSaleOrderDO::getId);
- // 鍏ュ簱鐘舵�併�備负浠�涔堥渶瑕� t. 鐨勫師鍥狅紝鏄洜涓鸿仈琛ㄦ煡璇㈡椂锛岄渶瑕佹寚瀹氳〃鍚嶏紝涓嶇劧浼氭姤 out_count 閿欒
- if (Objects.equals(reqVO.getOutStatus(), ErpSaleOrderPageReqVO.OUT_STATUS_NONE)) {
- query.eq(ErpSaleOrderDO::getOutCount, 0);
- } else if (Objects.equals(reqVO.getOutStatus(), ErpSaleOrderPageReqVO.OUT_STATUS_PART)) {
- query.gt(ErpSaleOrderDO::getOutCount, 0).apply("t.out_count < t.total_count");
- } else if (Objects.equals(reqVO.getOutStatus(), ErpSaleOrderPageReqVO.OUT_STATUS_ALL)) {
- query.apply("t.out_count = t.total_count");
+ if (reqVO.getProductId() != null) {
+ query.leftJoin(ErpSaleOrderItemDO.class, ErpSaleOrderItemDO::getOrderId, ErpSaleOrderDO::getId)
+ .eq(reqVO.getProductId() != null, ErpSaleOrderItemDO::getProductId, reqVO.getProductId())
+ .groupBy(ErpSaleOrderDO::getId); // 閬垮厤 1 瀵瑰鏌ヨ锛屼骇鐢熺浉鍚岀殑 1
}
- // 閫�璐х姸鎬�
- if (Objects.equals(reqVO.getReturnStatus(), ErpSaleOrderPageReqVO.RETURN_STATUS_NONE)) {
- query.eq(ErpSaleOrderDO::getReturnCount, 0);
- } else if (Objects.equals(reqVO.getReturnStatus(), ErpSaleOrderPageReqVO.RETURN_STATUS_PART)) {
- query.gt(ErpSaleOrderDO::getReturnCount, 0).apply("t.return_count < t.total_count");
- } 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");
+ return selectJoinPage(reqVO, ErpSaleOrderDO.class, query);
+ }
+
+ /**
+ * 鍒嗛〉鏌ヨ锛堝甫瀹㈡埛鏉冮檺杩囨护锛�
+ */
+ default PageResult<ErpSaleOrderDO> selectPage(ErpSaleOrderPageReqVO reqVO, List<Long> permittedCustomerIds) {
+ MPJLambdaWrapperX<ErpSaleOrderDO> query = new MPJLambdaWrapperX<ErpSaleOrderDO>()
+ .likeIfPresent(ErpSaleOrderDO::getNo, reqVO.getNo())
+ .eqIfPresent(ErpSaleOrderDO::getCustomerId, reqVO.getCustomerId())
+ .betweenIfPresent(ErpSaleOrderDO::getOrderTime, reqVO.getOrderTime())
+ .eqIfPresent(ErpSaleOrderDO::getStatus, reqVO.getStatus())
+ .likeIfPresent(ErpSaleOrderDO::getRemark, reqVO.getRemark())
+ .eqIfPresent(ErpSaleOrderDO::getCreator, reqVO.getCreator())
+ .orderByDesc(ErpSaleOrderDO::getId);
+ // 瀹㈡埛鏉冮檺杩囨护
+ if (permittedCustomerIds != null) {
+ if (CollUtil.isEmpty(permittedCustomerIds)) {
+ return PageResult.empty();
+ }
+ query.in(ErpSaleOrderDO::getCustomerId, permittedCustomerIds);
}
if (reqVO.getProductId() != null) {
query.leftJoin(ErpSaleOrderItemDO.class, ErpSaleOrderItemDO::getOrderId, ErpSaleOrderDO::getId)
--
Gitblit v1.9.3