From 9256180bd57599b0fb64e4627aeff7c5d65186ef Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 30 九月 2025 17:42:20 +0800
Subject: [PATCH] 诊所erp
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpClinicWarehousingServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 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 6653c29..4b9f165 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
@@ -13,6 +13,7 @@
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.*;
+import com.ruoyi.system.service.TCrmSupplierService;
import com.ruoyi.system.service.TErpClinicWarehousingService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.vo.*;
@@ -68,6 +69,11 @@
@Resource
private TErpGoodsTypeMapper erpGoodsTypeMapper;
+ @Resource
+ private TErpMaintenanceReminderMapper erpMaintenanceReminderMapper;
+
+ @Resource
+ private TCrmSupplierMapper crmSupplierMapper;
@Override
@@ -162,6 +168,16 @@
TErpClinicWarehousing tErpSupplierWarehousing = erpClinicWarehousingMapper.selectById(tErpSupplierInventoryGood.getWarehousingId());
String goodsId = tErpSupplierInventoryGood.getGoodsId();
TErpGoods goods = erpGoodsMapper.selectById(goodsId);
+
+ if(goods.getGoodsSource()==1){
+ TCrmSupplier supplier = crmSupplierMapper.selectById(goods.getSupplierClinicId());
+ if(supplier!=null){
+ inventoryDetailVo.setSupplierName(supplier.getSupplierName());
+ }
+ }else {
+ inventoryDetailVo.setSupplierName(goods.getSupplierName());
+ }
+
inventoryDetailVo.setGoodsName(goods.getGoodsName());
TErpGoodsUnit tErpGoodsUnit = erpGoodsUnitMapper.selectById(goods.getPackingUnitId());
inventoryDetailVo.setUnitName(tErpGoodsUnit.getUnitName());
@@ -191,6 +207,15 @@
TErpClinicWarehousing tErpSupplierWarehousing = erpClinicWarehousingMapper.selectById(warehousingId);
String goodsId = tErpSupplierInventoryGood.getGoodsId();
TErpGoods goods = erpGoodsMapper.selectById(goodsId);
+ if(goods.getGoodsSource()==1){
+ TCrmSupplier supplier = crmSupplierMapper.selectById(goods.getSupplierClinicId());
+ if(supplier!=null){
+ inventoryDetailVo.setSupplierName(supplier.getSupplierName());
+ }
+ }else {
+ inventoryDetailVo.setSupplierName(goods.getSupplierName());
+ }
+
inventoryDetailVo.setGoodsName(goods.getGoodsName());
TErpGoodsUnit tErpGoodsUnit = erpGoodsUnitMapper.selectById(goods.getPackingUnitId());
inventoryDetailVo.setUnitName(tErpGoodsUnit.getUnitName());
@@ -370,6 +395,20 @@
tErpClinicWarehousingBatch.setPurchaseCount(dto.getPurchaseCount());
erpClinicWarehousingBatchMapper.insert(tErpClinicWarehousingBatch);
+
+ if(goods.getMaintenanceInterval()!=null && !goods.getMaintenanceInterval().isEmpty()){
+ TErpMaintenanceReminder tErpMaintenanceReminder = new TErpMaintenanceReminder();
+ tErpMaintenanceReminder.setClinicSupplierId(supplierClinicId);
+ tErpMaintenanceReminder.setMaintenanceType(2);
+ tErpMaintenanceReminder.setWarehousingBatchId(tErpClinicWarehousingBatch.getId());
+ Integer day = Integer.valueOf(goods.getMaintenanceInterval());
+ // 当前时间+day天
+ LocalDateTime time1 = LocalDateTime.now().plusDays(day);
+ tErpMaintenanceReminder.setMaintenanceTime(time1);
+ erpMaintenanceReminderMapper.insert(tErpMaintenanceReminder);
+ }
+
+
totalPrice = totalPrice.add(dto.getSalesAmount().multiply(new BigDecimal(dto.getPurchaseCount())));
}
tErpClinicWarehousing.setTotalPrice(totalPrice);
--
Gitblit v1.7.1