From 0b37ca51f1d90aedaad7fa883e7248cd2ebe7b45 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 06 七月 2026 11:51:21 +0800
Subject: [PATCH] fix(database): 修正客户和供应商应收应付金额计算逻辑 公式：应收/应付 = 合同金额 - 回款/付款金额 - 退货金额
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationParamServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationParamServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationParamServiceImpl.java
index d66ebc7..a792b35 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationParamServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationParamServiceImpl.java
@@ -161,11 +161,21 @@
// 妫�鏌ユ暟鎹槸鍚﹂噸澶嶏紝閬垮厤閲嶅淇濆瓨
boolean duplicate = productionOrderRoutingOperationParamMapper.selectCount(
Wrappers.<ProductionOrderRoutingOperationParam>lambdaQuery()
+ .eq(ProductionOrderRoutingOperationParam::getProductionOrderId, item.getProductionOrderId())
.isNull(ProductionOrderRoutingOperationParam::getProductionProductMainId)
.eq(ProductionOrderRoutingOperationParam::getProductionOrderRoutingOperationId, item.getProductionOrderRoutingOperationId())
.eq(item.getTechnologyRoutingOperationParamId() != null,
ProductionOrderRoutingOperationParam::getTechnologyRoutingOperationParamId, item.getTechnologyRoutingOperationParamId())
- .eq(item.getTechnologyRoutingOperationParamId() == null && item.getParamCode() != null,
+ .eq(item.getTechnologyRoutingOperationParamId() == null && item.getTechnologyOperationParamId() != null,
+ ProductionOrderRoutingOperationParam::getTechnologyOperationParamId, item.getTechnologyOperationParamId())
+ .eq(item.getTechnologyRoutingOperationParamId() == null
+ && item.getTechnologyOperationParamId() == null
+ && item.getParamId() != null,
+ ProductionOrderRoutingOperationParam::getParamId, item.getParamId())
+ .eq(item.getTechnologyRoutingOperationParamId() == null
+ && item.getTechnologyOperationParamId() == null
+ && item.getParamId() == null
+ && item.getParamCode() != null,
ProductionOrderRoutingOperationParam::getParamCode, item.getParamCode())
.ne(item.getId() != null, ProductionOrderRoutingOperationParam::getId, item.getId())
) > 0;
--
Gitblit v1.9.3