From d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 10 十月 2025 18:16:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
index 29b9c97..addd8d1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
@@ -194,6 +194,9 @@
tErpProcurementVo.setStatus(tErpProcurement.getStatus());
tErpProcurementVo.setSendTime(tErpProcurement.getSendTime());
+ tErpProcurementVo.setMoney(tErpProcurement.getMoney());
+ tErpProcurementVo.setTotalPrice(tErpProcurement.getPayMoney());
+
List<TErpProcurementGoods> tErpProcurementGoods = erpProcurementGoodsMapper.selectList
(new LambdaQueryWrapper<TErpProcurementGoods>().eq(TErpProcurementGoods::getProcurementId, id)
.like(goodsName != null && !goodsName.isEmpty(), TErpProcurementGoods::getGoodsName, goodsName)
@@ -210,6 +213,7 @@
tErpProcurementDetailNextVo.setNum(tErpProcurementGood.getPurchaseCount());
tErpProcurementDetailNextVo.setTotalPrice(tErpProcurementGood.getTotalPrice());
tErpProcurementDetailNextVo.setQuasiNumber(tErpProcurementGood.getQuasiNumber());
+ tErpProcurementDetailNextVo.setPurchasePrice(tErpProcurementGood.getPurchasePrice());
List<TSysCommission> tSysCommissions = sysCommissionMapper.selectList(new LambdaQueryWrapper<TSysCommission>().eq(TSysCommission::getTErpProcurementGoodsId, tErpProcurementGood.getId()));
--
Gitblit v1.7.1