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 | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 216 insertions(+), 9 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 8ef66b0..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
@@ -44,7 +44,9 @@
import java.math.RoundingMode;
import java.security.PrivateKey;
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;
@@ -86,6 +88,21 @@
@Autowired
private TErpProcurementGoodsService erpProcurementGoodsService;
+
+ @Resource
+ private TErpSupplierWarehousingMapper erpSupplierWarehousingMapper;
+
+ @Resource
+ private TErpSupplierWarehousingBatchMapper erpSupplierWarehousingBatchMapper;
+
+ @Resource
+ private TErpSupplierOutboundMapper erpSupplierOutboundMapper;
+
+ @Resource
+ private TErpSupplierOutboundGoodsMapper erpSupplierOutboundGoodsMapper;
+
+ @Resource
+ private TCrmWarehouseMapper crmWarehouseMapper;
@Override
@@ -156,15 +173,15 @@
Integer roleType = user.getRoleType();
- String supplierClinicId = null;
+ List<String> supplierClinicId = null;
if (roleType == 6) {
- // 供应商
- TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
- .eq(TCrmSupplier::getUserId, user.getUserId())
+
+ TCrmWarehouse warehouse = crmWarehouseMapper.selectOne(Wrappers.lambdaQuery(TCrmWarehouse.class)
+ .eq(TCrmWarehouse::getUserId, user.getUserId())
.last("LIMIT 1"));
- supplierClinicId = crmSupplier.getId();
-
-
+ // 供应商
+ supplierClinicId = crmSupplierMapper.selectList(Wrappers.lambdaQuery(TCrmSupplier.class)
+ .eq(TCrmSupplier::getWarehouseId, warehouse.getId())).stream().map(TCrmSupplier::getId).collect(Collectors.toList());
String sTime = null;
String eTime = null;
if (query.getTime() != null && !query.getTime().isEmpty()) {
@@ -172,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;
@@ -365,7 +386,7 @@
BigDecimal all = BigDecimal.ZERO;
for (AddProcurementDto addProcurementDto : value) {
- BigDecimal multiply = addProcurementDto.getSalesAmount().multiply(BigDecimal.valueOf(addProcurementDto.getPurchaseCount()));
+ BigDecimal multiply = addProcurementDto.getGoodsSalesAmount().multiply(BigDecimal.valueOf(addProcurementDto.getPurchaseCount()));
all = all.add(multiply);
}
tErpProcurement.setPayMoney(all);
@@ -379,6 +400,9 @@
BigDecimal add = BigDecimal.ZERO;
+
+ BigDecimal supplierCommissionPrice = BigDecimal.ZERO;
+
for (AddProcurementDto dto : value) {
TErpProcurementGoods tErpProcurementGoods = new TErpProcurementGoods();
tErpProcurementGoods.setProcurementId(tErpProcurement.getId());
@@ -389,7 +413,9 @@
tErpProcurementGoods.setQuasiNumber(goods.getQuasiNumber());
TErpGoodsUnit tErpGoodsUnit = erpGoodsUnitMapper.selectById(goods.getPackingUnitId());
- tErpProcurementGoods.setUnitName(tErpGoodsUnit.getUnitName());
+ if(tErpGoodsUnit!=null){
+ tErpProcurementGoods.setUnitName(tErpGoodsUnit.getUnitName());
+ }
tErpProcurementGoods.setPurchasePrice(dto.getGoodsSalesAmount());
tErpProcurementGoods.setSalesAmount(dto.getSalesAmount());
tErpProcurementGoods.setTotalPrice(dto.getGoodsSalesAmount().multiply(new BigDecimal(dto.getPurchaseCount())));
@@ -398,6 +424,7 @@
tErpProcurementGoods.setSupplierId(supplierClinicId);
tErpProcurementGoods.setRecvMerchantNo(supplier.getRecvMerchantNo());
tErpProcurementGoods.setSupplierMoney(dto.getSalesAmount().subtract(dto.getPlatformCommissionPrice()));
+ supplierCommissionPrice = supplierCommissionPrice.add(tErpProcurementGoods.getSupplierMoney().multiply(BigDecimal.valueOf(dto.getPurchaseCount())));
if (tErpProcurementGoods.getSupplierMoney().doubleValue() < 0) {
throw new RuntimeException("平台抽成不能大于售卖价格");
}
@@ -410,6 +437,7 @@
if (tErpProcurement.getMoney().doubleValue() < 0) {
throw new RuntimeException("金额设置错误，请联系平台管理员");
}
+ tErpProcurement.setSupplierMoney(supplierCommissionPrice);
this.save(tErpProcurement);
tErpProcurementGoods1.forEach(e -> e.setProcurementId(tErpProcurement.getId()));
erpProcurementGoodsService.saveBatch(tErpProcurementGoods1);
@@ -421,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());
@@ -443,10 +478,182 @@
detailProcurementNextVO.setTotalPrice(tErpProcurement.getPayMoney());
detailProcurementNextVO.setId(tErpProcurementGoods.getId());
detailProcurementNextVO.setPurchasePrice(tErpProcurementGoods.getPurchasePrice());
+
+ List<TErpSupplierOutboundGoods> tErpSupplierOutboundGoods = erpSupplierOutboundGoodsMapper.selectList(new LambdaQueryWrapper<TErpSupplierOutboundGoods>().eq(TErpSupplierOutboundGoods::getProcurementGoodsId, tErpProcurementGoods.getId()));
+ if(!tErpSupplierOutboundGoods.isEmpty()){
+ ArrayList<DetailProcurementNextThreeVO> detailProcurementNextThreeVOS = new ArrayList<>();
+ List<String> collect = tErpSupplierOutboundGoods.stream().map(TErpSupplierOutboundGoods::getWarehousingBatchId).collect(Collectors.toList());
+ List<TErpSupplierWarehousingBatch> tErpSupplierWarehousingBatches = erpSupplierWarehousingBatchMapper.selectBatchIds(collect);
+ for (TErpSupplierOutboundGoods tErpSupplierOutboundGood : tErpSupplierOutboundGoods) {
+ List<TErpSupplierWarehousingBatch> collect1 = tErpSupplierWarehousingBatches.stream().filter(e -> e.getId().equals(tErpSupplierOutboundGood.getWarehousingBatchId())).collect(Collectors.toList());
+ for (TErpSupplierWarehousingBatch tErpSupplierWarehousingBatch : collect1) {
+ DetailProcurementNextThreeVO detailProcurementNextThreeVO = new DetailProcurementNextThreeVO();
+ detailProcurementNextThreeVO.setBatchNumber(tErpSupplierWarehousingBatch.getBatchNumber());
+ detailProcurementNextThreeVO.setProductionDate(tErpSupplierWarehousingBatch.getProductionDate());
+ detailProcurementNextThreeVO.setExpirationDate(tErpSupplierWarehousingBatch.getExpiryDate());
+ detailProcurementNextThreeVO.setNum(tErpSupplierOutboundGood.getOutboundCount());
+ detailProcurementNextThreeVOS.add(detailProcurementNextThreeVO);
+ }
+ }
+ detailProcurementNextVO.setDetailProcurementNextThreeVOS(detailProcurementNextThreeVOS);
+ }
detailProcurementNextVOS.add(detailProcurementNextVO);
}
detailProcurementVO.setList(detailProcurementNextVOS);
return detailProcurementVO;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+ public void detailProcurementSend(List<String> clinicSupplierId, SysUser user, String id,String logisticsNumber) {
+ // 查出这个采购的下级商品
+ List<TErpProcurementGoods> list = erpProcurementGoodsService.list(new QueryWrapper<TErpProcurementGoods>().eq("procurement_id", id));
+ List<TErpSupplierWarehousing> tErpSupplierWarehousings = erpSupplierWarehousingMapper.selectList(new LambdaQueryWrapper<TErpSupplierWarehousing>()
+ .in(TErpSupplierWarehousing::getSupplierId, clinicSupplierId).in(TErpSupplierWarehousing::getGoodsId, list.stream().map(TErpProcurementGoods::getGoodsId).collect(Collectors.toList()))
+ .orderByAsc(BaseModel::getCreateTime));
+
+ if(tErpSupplierWarehousings.isEmpty()){
+ throw new RuntimeException("商品供应商未入库，请先入库");
+ }
+
+ List<TErpSupplierWarehousingBatch> tErpSupplierWarehousingBatches = erpSupplierWarehousingBatchMapper.selectList(new LambdaQueryWrapper<TErpSupplierWarehousingBatch>().in(TErpSupplierWarehousingBatch::getWarehousingId, tErpSupplierWarehousings.stream().map(TErpSupplierWarehousing::getId).collect(Collectors.toList())));
+ // 获取所有的出库记录
+ List<TErpSupplierOutboundGoods> tErpSupplierOutboundGoodsLists = erpSupplierOutboundGoodsMapper.selectList(new LambdaQueryWrapper<TErpSupplierOutboundGoods>().in(TErpSupplierOutboundGoods::getWarehousingBatchId, tErpSupplierWarehousingBatches.stream().map(TErpSupplierWarehousingBatch::getId).collect(Collectors.toList())));
+
+
+ outer:for (TErpProcurementGoods tErpProcurementGoods : list) {
+ // 分别入库
+ String goodsId = tErpProcurementGoods.getGoodsId();
+ // 查询这个供应商的 该商品是否入过库 未入库提示 出库判断库存 先找先入库的
+ List<TErpSupplierWarehousing> collect = tErpSupplierWarehousings.stream().filter(e -> e.getGoodsId().equals(goodsId)).collect(Collectors.toList());
+ if(collect.isEmpty()){
+ throw new RuntimeException("商品供应商未入库，请先入库");
+ }
+ // 需要出库的数量
+ Integer purchaseCount = tErpProcurementGoods.getPurchaseCount();
+
+
+ if(purchaseCount==0){
+ continue;
+ }
+
+ for (TErpSupplierWarehousing tErpSupplierWarehousing : collect) {
+ List<TErpSupplierWarehousingBatch> warehousingBatches = tErpSupplierWarehousingBatches.stream().filter(e -> e.getWarehousingId().equals(tErpSupplierWarehousing.getId())).collect(Collectors.toList());
+ for (TErpSupplierWarehousingBatch warehousingBatch : warehousingBatches) {
+ // 已出库数量
+ int sum = tErpSupplierOutboundGoodsLists.stream().filter(e -> e.getWarehousingBatchId().equals(warehousingBatch.getId())).mapToInt(TErpSupplierOutboundGoods::getOutboundCount).sum();
+ // 该批次剩余的数量
+ int count = warehousingBatch.getWarehousingNumber() - sum;
+
+ // 该批次没有数量 找下个批次
+ if(count==0 ){
+ continue;
+ }
+ // 如果大于这个数量 则使用这个批次
+ if(count>=purchaseCount){
+ // 添加出库记录
+ TErpSupplierOutbound tErpSupplierOutbound= new TErpSupplierOutbound();
+ tErpSupplierOutbound.setSupplierId(tErpSupplierWarehousing.getSupplierId());
+ tErpSupplierOutbound.setWarehouseId(tErpSupplierWarehousing.getWarehouseId());
+ tErpSupplierOutbound.setOutboundType(7);
+ //TODO 确定这个是采购价还是销售价格
+ tErpSupplierOutbound.setTotalMoney(tErpProcurementGoods.getPurchasePrice().multiply(new BigDecimal(purchaseCount)));
+ tErpSupplierOutbound.setOutboundNumber("G" + DateUtils.dateTimeNow());
+ erpSupplierOutboundMapper.insert(tErpSupplierOutbound);
+
+ TErpSupplierOutboundGoods tErpSupplierOutboundGoods = new TErpSupplierOutboundGoods();
+ tErpSupplierOutboundGoods.setOutboundId(tErpSupplierOutbound.getId());
+ tErpSupplierOutboundGoods.setWarehousingId(tErpSupplierWarehousing.getId());
+ tErpSupplierOutboundGoods.setWarehousingBatchId(warehousingBatch.getId());
+ tErpSupplierOutboundGoods.setOutboundCount(purchaseCount);
+ tErpSupplierOutboundGoods.setTotalPrice(tErpProcurementGoods.getPurchasePrice().multiply(new BigDecimal(purchaseCount)));
+ tErpSupplierOutboundGoods.setProcurementGoodsId(tErpProcurementGoods.getId());
+ erpSupplierOutboundGoodsMapper.insert(tErpSupplierOutboundGoods);
+ continue outer;
+ }
+
+ if(count<purchaseCount){
+ purchaseCount = purchaseCount - count;
+ // 添加出库记录
+ TErpSupplierOutbound tErpSupplierOutbound= new TErpSupplierOutbound();
+ tErpSupplierOutbound.setSupplierId(tErpSupplierWarehousing.getSupplierId());
+ tErpSupplierOutbound.setWarehouseId(tErpSupplierWarehousing.getWarehouseId());
+ tErpSupplierOutbound.setOutboundType(7);
+ //TODO 确定这个是采购价还是销售价格
+ tErpSupplierOutbound.setTotalMoney(tErpProcurementGoods.getPurchasePrice().multiply(new BigDecimal(purchaseCount)));
+ tErpSupplierOutbound.setOutboundNumber("G" + DateUtils.dateTimeNow());
+ erpSupplierOutboundMapper.insert(tErpSupplierOutbound);
+
+ TErpSupplierOutboundGoods tErpSupplierOutboundGoods = new TErpSupplierOutboundGoods();
+ tErpSupplierOutboundGoods.setOutboundId(tErpSupplierOutbound.getId());
+ tErpSupplierOutboundGoods.setWarehousingId(tErpSupplierWarehousing.getId());
+ tErpSupplierOutboundGoods.setWarehousingBatchId(warehousingBatch.getId());
+ tErpSupplierOutboundGoods.setOutboundCount(purchaseCount);
+ tErpSupplierOutboundGoods.setTotalPrice(tErpProcurementGoods.getPurchasePrice().multiply(new BigDecimal(purchaseCount)));
+ tErpSupplierOutboundGoods.setProcurementGoodsId(tErpProcurementGoods.getId());
+ erpSupplierOutboundGoodsMapper.insert(tErpSupplierOutboundGoods);
+ }
+
+ }
+
+ }
+ if(purchaseCount>0){
+ throw new RuntimeException("商品供应商库存不足，请先入库");
+ }
+
+
+ }
+ TErpProcurement byId = this.getById(id);
+ byId.setStatus(4);
+ byId.setSendTime(LocalDateTime.now());
+ byId.setLogisticsNumber(logisticsNumber);
+ this.updateById(byId);
+
+ }
+
+ @Override
+ public List<SupplierThirtyProcurementStatisticsVO> supplierThirtyProcurementStatistics(String supplierAndClinicId, String startTime, String endTime,Integer roleType) {
+ return this.baseMapper.supplierThirtyProcurementStatistics(supplierAndClinicId, startTime, endTime, roleType);
+ }
+
+ @Override
+ public List<SupplierThirtyMoneyProcurementStatisticsVO> supplierThirtyMoneyProcurementStatistics(String supplierAndClinicId, String startTime, String endTime,Integer roleType) {
+ return this.baseMapper.supplierThirtyMoneyProcurementStatistics(supplierAndClinicId, startTime, endTime, roleType);
+ }
+
+ @Override
+ public Integer supplierSalesStatisticsTypeCount(String supplierId) {
+ return this.baseMapper.supplierSalesStatisticsTypeCount(supplierId);
+ }
+
+ @Override
+ public Integer supplierSalesStatisticsCount(String supplierId) {
+ return this.baseMapper.supplierSalesStatisticsCount(supplierId);
+ }
+
+ @Override
+ public BigDecimal supplierSalesStatisticsMoney(String supplierId, String startTime, String endTime) {
+ return this.baseMapper.supplierSalesStatisticsMoney(supplierId,startTime, endTime);
+ }
+
+ @Override
+ public List<SupplierSalesStatisticsGoodsTypeVO> supplierSalesStatisticsGoodsType(String supplierId, String startTime, String endTime) {
+ return this.baseMapper.supplierSalesStatisticsGoodsType(supplierId,startTime, endTime);
+ }
+
+ @Override
+ public List<SupplierSalesStatisticsGoodsCountVO> supplierSalesStatisticsGoodsCount(String supplierId, String startTime, String endTime, String goodsName) {
+ return this.baseMapper.supplierSalesStatisticsGoodsCount(supplierId,startTime, endTime,goodsName);
+ }
+
+ @Override
+ public List<SupplierSalesStatisticsGoodsCountVO> supplierSalesStatisticsGoodsCountMonth(String supplierId, String startTime, String endTime, String goodsName) {
+ 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