From be9e92d2c30fdfeed4bdd3a5aea2c84bd93f61f4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 15 十月 2025 16:23:24 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java | 18 ++++++++++++++++++
1 files changed, 18 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 0ff98fd..3033e10 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
@@ -46,6 +46,7 @@
import java.security.cert.X509Certificate;
import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -102,6 +103,7 @@
@Resource
private TCrmWarehouseMapper crmWarehouseMapper;
+
@Override
public PageInfo<TErpProcurementVo> pageList(TErpProcurementQuery query, SysUser user) {
@@ -187,7 +189,11 @@
sTime = split[0] + " 00:00:00";
eTime = split[1] + " 23:59:59";
}
+
PageInfo<TErpProcurementVo> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ if(supplierClinicId.isEmpty()){
+ return pageInfo;
+ }
List<TErpProcurementVo> list = this.baseMapper.pageListWarehouse(query, pageInfo, user, sTime, eTime, supplierClinicId);
// if (list.isEmpty()) {
// return pageInfo;
@@ -443,6 +449,13 @@
public DetailProcurementVO detailProcurement(String clinicSupplierId, SysUser user, String id) {
DetailProcurementVO detailProcurementVO = new DetailProcurementVO();
TErpProcurement tErpProcurement = this.getById(id);
+ if (tErpProcurement.getWarehousingUserId()!=null && !tErpProcurement.getWarehousingUserId().isEmpty()) {
+ SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(tErpProcurement.getWarehousingUserId()));
+ detailProcurementVO.setWarehousingUserName(sysUser.getUserName());
+ }
+ detailProcurementVO.setWarehousingTime(tErpProcurement.getWarehousingTime());
+
+
detailProcurementVO.setStatus(tErpProcurement.getStatus());
detailProcurementVO.setCreateTime(tErpProcurement.getCreateTime());
detailProcurementVO.setSendTime(tErpProcurement.getSendTime());
@@ -638,4 +651,9 @@
return this.baseMapper.supplierSalesStatisticsGoodsCountMonth(supplierId,startTime, endTime,goodsName);
}
+ @Override
+ public List<TErpProcurementGoods> branchAdminStatisticsThree(List<String> clinicIds) {
+ return this.baseMapper.branchAdminStatisticsThree(clinicIds);
+ }
+
}
--
Gitblit v1.7.1