From 433bc1e314ecfd483379ca0e2e74e7c815d3261f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 20 十月 2025 09:15:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpClinicWarehousingServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpClinicWarehousingServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpClinicWarehousingServiceImpl.java
index 587e81a..d06a8d2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpClinicWarehousingServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpClinicWarehousingServiceImpl.java
@@ -266,8 +266,8 @@
.last("LIMIT 1"));
supplierClinicId = crmClinic.getId();
}
- // 获取当前时间后9个月的时间
- LocalDateTime nineMonthLater = LocalDateTime.now().plusMonths(9);
+ // 获取当前时间后1个月的时间
+ LocalDateTime nineMonthLater = LocalDateTime.now().plusMonths(1);
PageInfo<ValidityPeriodWarningVo> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
@@ -364,6 +364,12 @@
// Map<String, List<clinicWarehouseGoodsDto>> collect = dtos.stream().collect(Collectors.groupingBy(clinicWarehouseGoodsDto::getSupplierId));
// for (Map.Entry<String, List<clinicWarehouseGoodsDto>> stringListEntry : collect.entrySet()) {
+ if(dtos.getStatus()==null || dtos.getStatus()!=1 ){
+ // 草稿-》正式 移除所有草稿
+ this.baseMapper.delete(new LambdaQueryWrapper<TErpClinicWarehousing>().eq(TErpClinicWarehousing::getClinicId,supplierClinicId).eq(TErpClinicWarehousing::getStatus,1));
+ }
+
+
TErpClinicWarehousing tErpClinicWarehousing = new TErpClinicWarehousing();
tErpClinicWarehousing.setClinicId(supplierClinicId);
tErpClinicWarehousing.setCreateId(user.getUserId().toString());
@@ -410,7 +416,7 @@
}
- totalPrice = totalPrice.add(dto.getSalesAmount().multiply(new BigDecimal(dto.getPurchaseCount())));
+ totalPrice = totalPrice.add(dto.getUnitAmount().multiply(new BigDecimal(dto.getPurchaseCount())));
}
tErpClinicWarehousing.setTotalPrice(totalPrice);
String name = names.stream().collect(Collectors.joining(","));
--
Gitblit v1.7.1