From 00957f0c836b80d9052a6ccf673d3b454b646081 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 29 九月 2025 18:17:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
index 1cf9c4e..76a45c9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java
@@ -27,6 +27,7 @@
import javax.validation.Valid;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -54,12 +55,13 @@
private final TErpClinicWarehousingService erpClinicWarehousingService;
private final TErpClinicWarehousingBatchService erpClinicWarehousingBatchService;
private final TCrmSupplierService crmSupplierService;
+ private final TErpMaintenanceReminderService erpMaintenanceReminderService;
@Autowired
public TErpProcurementController(TErpProcurementService erpProcurementService, TokenService tokenService,TCrmClinicService crmClinicService,TErpProcurementGoodsService erpProcurementGoodsService
, TErpGoodsService erpGoodsService,TErpClinicWarehousingService erpClinicWarehousingService,TErpClinicWarehousingBatchService erpClinicWarehousingBatchService,
- TCrmSupplierService crmSupplierService) {
+ TCrmSupplierService crmSupplierService,TErpMaintenanceReminderService erpMaintenanceReminderService) {
this.erpProcurementService = erpProcurementService;
this.tokenService = tokenService;
this.crmClinicService = crmClinicService;
@@ -68,6 +70,7 @@
this.erpClinicWarehousingService = erpClinicWarehousingService;
this.erpClinicWarehousingBatchService = erpClinicWarehousingBatchService;
this.crmSupplierService = crmSupplierService;
+ this.erpMaintenanceReminderService = erpMaintenanceReminderService;
}
@@ -248,6 +251,20 @@
tErpClinicWarehousingGoods.setSalesAmount(tErpProcurementGoods.getSalesAmount());
erpClinicWarehousingBatchService.save(tErpClinicWarehousingGoods);
+
+ if(erpGoods.getMaintenanceInterval()!=null){
+ TErpMaintenanceReminder tErpMaintenanceReminder = new TErpMaintenanceReminder();
+ tErpMaintenanceReminder.setClinicSupplierId(clinicSupplierId);
+ tErpMaintenanceReminder.setMaintenanceType(2);
+ tErpMaintenanceReminder.setWarehousingBatchId(tErpClinicWarehousingGoods.getId());
+ Integer day = Integer.valueOf(erpGoods.getMaintenanceInterval());
+ // 当前时间+day天
+ LocalDateTime time1 = LocalDateTime.now().plusDays(day);
+ tErpMaintenanceReminder.setMaintenanceTime(time1);
+ erpMaintenanceReminderService.save(tErpMaintenanceReminder);
+ }
+
+
}
return R.ok();
}
--
Gitblit v1.7.1