From 9b6f0ade46587f0b9fcbb659d491bae01c7e2649 Mon Sep 17 00:00:00 2001
From: quxin <592870522@qq.com>
Date: 星期五, 04 九月 2026 11:37:30 +0800
Subject: [PATCH] 修复： 生产领料后的退料应该是选择领料的记录，不是选择库存的记录（同时库存数据需要根据领料退料变动，比如库存100，领用80，然后领用80中退料30，库存应由原来的20变成50）
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java
index 9f7aca0..9576e9b 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java
@@ -57,6 +57,11 @@
query.eq(ErpPurchaseOrderDO::getStatus, ErpAuditStatus.APPROVE.getStatus())
.apply("t.return_count < t.in_count");
}
+ // 鍙潵绁ㄧ櫥璁帮紙鍓╀綑鍙紑绁ㄩ噾棰� > 0锛夛細閲戦宸插紑瀹岀殑璁㈠崟涓嶅睍绀�
+ if (Boolean.TRUE.equals(reqVO.getRemainPriceEnable())) {
+ query.apply("t.total_price > (SELECT IFNULL(SUM(i.price), 0) FROM erp_purchase_invoice i "
+ + "WHERE i.purchase_order_id = t.id AND i.deleted = 0)");
+ }
if (reqVO.getProductId() != null) {
query.leftJoin(ErpPurchaseOrderItemDO.class, ErpPurchaseOrderItemDO::getOrderId, ErpPurchaseOrderDO::getId)
.eq(reqVO.getProductId() != null, ErpPurchaseOrderItemDO::getProductId, reqVO.getProductId())
@@ -74,6 +79,10 @@
return selectOne(ErpPurchaseOrderDO::getNo, no);
}
+ default ErpPurchaseOrderDO selectByProcessInstanceId(String processInstanceId) {
+ return selectOne(ErpPurchaseOrderDO::getProcessInstanceId, processInstanceId);
+ }
+
default List<ErpPurchaseOrderDO> selectList(Long supplierId, Integer status) {
return selectList(new LambdaQueryWrapperX<ErpPurchaseOrderDO>()
.eqIfPresent(ErpPurchaseOrderDO::getSupplierId, supplierId)
--
Gitblit v1.9.3