From 283ea8cfd97f225d0451d57bf915e6f3a0f2041b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 28 九月 2025 19:03:34 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java
index 58a0076..4cbca8e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java
@@ -415,6 +415,7 @@
outboundGoodsDetailVo.setCreateBy(tErpClinicOutbound.getCreateBy());
outboundGoodsDetailVo.setOutboundType(tErpClinicOutbound.getOutboundType());
outboundGoodsDetailVo.setOrderNumber(tErpClinicOutbound.getOrderNumber());
+ outboundGoodsDetailVo.setOutboundReason(tErpClinicOutbound.getOutboundReason());
if(tErpClinicOutbound.getOutboundType()==6){
TErpClinicInventory tErpClinicInventory = erpClinicInventoryMapper.selectById(tErpClinicOutbound.getInventoryId());
outboundGoodsDetailVo.setInventoryNumber(tErpClinicInventory.getInventoryNumber());
@@ -429,7 +430,7 @@
outboundGoodsDetailNextVo.setWarehouseNo(tErpClinicWarehousing.getWarehouseNo());
outboundGoodsDetailNextVo.setGoodsId(outboundGoods.getGoodsId());
- TErpGoods goods = erpGoodsMapper.selectById(outboundGoods.getGoodsId());
+ TErpGoods goods = erpGoodsMapper.getGoodsById(outboundGoods.getGoodsId());
outboundGoodsDetailNextVo.setGoodsName(goods.getGoodsName());
outboundGoodsDetailNextVo.setTypeId(goods.getTypeId());
--
Gitblit v1.7.1