From 7401b4b696bf8469150aa45f65f91ed33e5bd76e Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 16 十月 2025 13:56:47 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 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 7c2997f..f0478aa 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
@@ -13,10 +13,7 @@
 import com.ruoyi.system.dto.InventoryGoodsDto;
 import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.model.*;
-import com.ruoyi.system.query.TClinicGoodsWarehouseQuery;
-import com.ruoyi.system.query.TErpGoodsAdminQuery;
-import com.ruoyi.system.query.TErpGoodsInventoryQuery;
-import com.ruoyi.system.query.TErpGoodsQuery;
+import com.ruoyi.system.query.*;
 import com.ruoyi.system.service.TErpGoodsService;
 import com.ruoyi.system.service.TErpSupplierInventoryGoodsService;
 import com.ruoyi.system.vo.*;
@@ -55,31 +52,37 @@
 
     @Resource
     private TErpSupplierInventoryMapper erpSupplierInventoryMapper;
+
     @Resource
     private TErpClinicInventoryMapper erpClinicInventoryMapper;
 
     @Resource
     private TErpSupplierInventoryGoodsMapper erpSupplierInventoryGoodsMapper;
+
     @Resource
     private TErpClinicInventoryGoodsMapper erpClinicInventoryGoodsMapper;
 
     @Resource
     private TErpSupplierWarehousingMapper erpSupplierWarehousingMapper;
+
     @Resource
     private TErpClinicWarehousingMapper erpClinicWarehousingMapper;
 
     @Resource
     private TErpSupplierWarehousingBatchMapper erpSupplierWarehousingBatchMapper;
+
     @Resource
     private TErpClinicWarehousingBatchMapper erpClinicWarehousingBatchMapper;
 
     @Resource
     private TErpSupplierOutboundMapper erpSupplierOutboundMapper;
+
     @Resource
     private TErpClinicOutboundMapper erpClinicOutboundMapper;
 
     @Resource
     private TErpSupplierOutboundGoodsMapper erpSupplierOutboundGoodsMapper;
+
     @Resource
     private TErpClinicOutboundGoodsMapper erpClinicOutboundGoodsMapper;
 
@@ -88,6 +91,10 @@
 
     @Resource
     private  TCrmSupplierMapper crmSupplierMapper;
+
+    @Resource
+    private TErpProcurementMapper erpProcurementMapper;
+
 
 
     @Override
@@ -153,6 +160,11 @@
     }
 
     @Override
+    public List<TErpGoods> pageAddList(Page<TErpGoods> tErpGoodsPage, String clinicSupplierId, PageAddListQuery query) {
+        return this.baseMapper.pageAddList(tErpGoodsPage, clinicSupplierId, query);
+    }
+
+    @Override
     public List<TErpGoodsVO> listExport(TErpGoodsQuery query, SysUser user) {
         List<TErpGoodsVO> list = this.baseMapper.listExport(query, user);
         if (list.isEmpty()) {
@@ -185,7 +197,7 @@
 
     @Override
     public boolean isExit(String goodsIdCode, String quasiNumber,String id) {
-        Long size = this.baseMapper.selectCount(new LambdaQueryWrapper<>(TErpGoods.class).ne(id!=null,TErpGoods::getId, id).and(q -> q.eq(TErpGoods::getGoodsIdCode, goodsIdCode).or().eq(TErpGoods::getQuasiNumber, quasiNumber)));
+        Long size = this.baseMapper.selectCount(new LambdaQueryWrapper<>(TErpGoods.class).eq(TErpGoods::getGoodsSource,1).ne(id!=null,TErpGoods::getId, id).and(q -> q.eq(TErpGoods::getGoodsIdCode, goodsIdCode).or().eq(TErpGoods::getQuasiNumber, quasiNumber)));
         if (size > 0) {
             return true;
         }
@@ -410,8 +422,8 @@
         warehouseGoodsDetailVo.setCreateTime(tErpClinicWarehousing.getCreateTime());
         warehouseGoodsDetailVo.setCreateBy(tErpClinicWarehousing.getCreateBy());
         if(tErpClinicWarehousing.getType()==1){
-            TErpClinicInventory tErpClinicInventory = erpClinicInventoryMapper.selectById(tErpClinicWarehousing.getInventoryId());
-            warehouseGoodsDetailVo.setInventoryNumber(tErpClinicInventory.getInventoryNumber());
+            TErpProcurement tErpProcurement = erpProcurementMapper.selectById(tErpClinicWarehousing.getProcurementId());
+            warehouseGoodsDetailVo.setInventoryNumber(tErpProcurement.getProcurementCode());
         }
 
         List<TErpClinicWarehousingBatch> tErpClinicWarehousingBatches = erpClinicWarehousingBatchMapper.selectList(new LambdaQueryWrapper<TErpClinicWarehousingBatch>().eq(TErpClinicWarehousingBatch::getWarehousingId, id));

--
Gitblit v1.7.1