From a57dceb3e6bc02e28a86f4de66f593706452c2b4 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期六, 07 十一月 2026 14:53:09 +0800
Subject: [PATCH] refactor: 需求10/23 改为基于 ERP 实现,修正此前 ERP 可用性误判

---
 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 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 7382197..e3a03cc 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
@@ -5,6 +5,7 @@
 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.framework.mybatis.core.query.LambdaQueryWrapperX;
 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;
@@ -16,7 +17,7 @@
 /**
  * ERP 閿�鍞鍗� Mapper
  *
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
  */
 @Mapper
 public interface ErpSaleOrderMapper extends BaseMapperX<ErpSaleOrderDO> {
@@ -27,12 +28,15 @@
                 .eqIfPresent(ErpSaleOrderDO::getCustomerId, reqVO.getCustomerId())
                 .betweenIfPresent(ErpSaleOrderDO::getOrderTime, reqVO.getOrderTime())
                 .eqIfPresent(ErpSaleOrderDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(ErpSaleOrderDO::getOutStatus, reqVO.getOutStatus())
+                .eqIfPresent(ErpSaleOrderDO::getProductionStatus, reqVO.getProductionStatus())
                 .likeIfPresent(ErpSaleOrderDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(ErpSaleOrderDO::getCreator, reqVO.getCreator())
                 .orderByDesc(ErpSaleOrderDO::getId);
-        if (reqVO.getProductId() != null) {
+        if (reqVO.getProductId() != null || reqVO.getNeedProduction() != null) {
             query.leftJoin(ErpSaleOrderItemDO.class, ErpSaleOrderItemDO::getOrderId, ErpSaleOrderDO::getId)
                     .eq(reqVO.getProductId() != null, ErpSaleOrderItemDO::getProductId, reqVO.getProductId())
+                    .eq(reqVO.getNeedProduction() != null, ErpSaleOrderItemDO::getNeedProduction, reqVO.getNeedProduction())
                     .groupBy(ErpSaleOrderDO::getId); // 閬垮厤 1 瀵瑰鏌ヨ锛屼骇鐢熺浉鍚岀殑 1
         }
         return selectJoinPage(reqVO, ErpSaleOrderDO.class, query);
@@ -47,6 +51,8 @@
                 .eqIfPresent(ErpSaleOrderDO::getCustomerId, reqVO.getCustomerId())
                 .betweenIfPresent(ErpSaleOrderDO::getOrderTime, reqVO.getOrderTime())
                 .eqIfPresent(ErpSaleOrderDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(ErpSaleOrderDO::getOutStatus, reqVO.getOutStatus())
+                .eqIfPresent(ErpSaleOrderDO::getProductionStatus, reqVO.getProductionStatus())
                 .likeIfPresent(ErpSaleOrderDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(ErpSaleOrderDO::getCreator, reqVO.getCreator())
                 .orderByDesc(ErpSaleOrderDO::getId);
@@ -57,9 +63,10 @@
             }
             query.in(ErpSaleOrderDO::getCustomerId, permittedCustomerIds);
         }
-        if (reqVO.getProductId() != null) {
+        if (reqVO.getProductId() != null || reqVO.getNeedProduction() != null) {
             query.leftJoin(ErpSaleOrderItemDO.class, ErpSaleOrderItemDO::getOrderId, ErpSaleOrderDO::getId)
                     .eq(reqVO.getProductId() != null, ErpSaleOrderItemDO::getProductId, reqVO.getProductId())
+                    .eq(reqVO.getNeedProduction() != null, ErpSaleOrderItemDO::getNeedProduction, reqVO.getNeedProduction())
                     .groupBy(ErpSaleOrderDO::getId); // 閬垮厤 1 瀵瑰鏌ヨ锛屼骇鐢熺浉鍚岀殑 1
         }
         return selectJoinPage(reqVO, ErpSaleOrderDO.class, query);
@@ -74,8 +81,16 @@
         return selectOne(ErpSaleOrderDO::getNo, no);
     }
 
+    default ErpSaleOrderDO selectByIdForUpdate(Long id) {
+        return selectOne(new LambdaQueryWrapperX<ErpSaleOrderDO>().eq(ErpSaleOrderDO::getId, id).last("FOR UPDATE"));
+    }
+
+    default ErpSaleOrderDO selectByNoForUpdate(String no) {
+        return selectOne(new LambdaQueryWrapperX<ErpSaleOrderDO>().eq(ErpSaleOrderDO::getNo, no).last("FOR UPDATE"));
+    }
+
     default ErpSaleOrderDO selectByContractId(Long contractId) {
         return selectOne(ErpSaleOrderDO::getContractId, contractId);
     }
 
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3