From 806125e39de433c7c622acdabe8138876fae6973 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 21 十月 2025 10:23:06 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpMaintenanceReminderController.java | 96 +++++++++++++++++++++++++++++++++---------------
1 files changed, 66 insertions(+), 30 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpMaintenanceReminderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpMaintenanceReminderController.java
index 2ffae90..48736da 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpMaintenanceReminderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpMaintenanceReminderController.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.UpdateReminderDto;
+import com.ruoyi.system.model.TErpClinicWarehousingBatch;
import com.ruoyi.system.model.TErpGoods;
import com.ruoyi.system.model.TErpMaintenanceReminder;
import com.ruoyi.system.model.TErpSupplierWarehousingBatch;
@@ -42,16 +43,20 @@
private final TErpSupplierWarehousingBatchService erpSupplierWarehousingBatchService;
private final TErpSupplierWarehousingService erpSupplierWarehousingService;
private final TErpGoodsService erpGoodsService;
+ private final TErpClinicWarehousingBatchService erpClinicWarehousingBatchService;
+ private final TErpClinicWarehousingService erpClinicWarehousingService;
@Autowired
public TErpMaintenanceReminderController(TErpMaintenanceReminderService erpMaintenanceReminderService, TokenService tokenService,
- TErpSupplierWarehousingBatchService erpSupplierWarehousingBatchService,TErpSupplierWarehousingService erpSupplierWarehousingService,
- TErpGoodsService erpGoodsService) {
+ TErpSupplierWarehousingBatchService erpSupplierWarehousingBatchService, TErpSupplierWarehousingService erpSupplierWarehousingService,
+ TErpGoodsService erpGoodsService, TErpClinicWarehousingBatchService erpClinicWarehousingBatchService, TErpClinicWarehousingService erpClinicWarehousingService) {
this.erpMaintenanceReminderService = erpMaintenanceReminderService;
this.tokenService = tokenService;
this.erpSupplierWarehousingBatchService = erpSupplierWarehousingBatchService;
this.erpSupplierWarehousingService = erpSupplierWarehousingService;
this.erpGoodsService = erpGoodsService;
+ this.erpClinicWarehousingBatchService = erpClinicWarehousingBatchService;
+ this.erpClinicWarehousingService = erpClinicWarehousingService;
}
@@ -92,37 +97,68 @@
reminder.setSuccessTime(LocalDateTime.now());
erpMaintenanceReminderService.updateById( reminder);
String warehousingBatchId = reminder.getWarehousingBatchId();
- TErpSupplierWarehousingBatch byId = erpSupplierWarehousingBatchService.getById(warehousingBatchId);
- String goodsId = erpSupplierWarehousingService.getById(byId.getWarehousingId()).getGoodsId();
+ if(reminder.getMaintenanceType()==2){
+ TErpClinicWarehousingBatch byId = erpClinicWarehousingBatchService.getById(warehousingBatchId);
+ String goodsId = byId.getGoodsId();
+ TErpMaintenanceReminder tErpMaintenanceReminder = new TErpMaintenanceReminder();
+ TErpGoods byId1 = erpGoodsService.getById(goodsId);
+ String maintenanceInterval = byId1.getMaintenanceInterval();
+ String maintenanceIntervalUnit = byId1.getMaintenanceIntervalUnit();
+ if(maintenanceIntervalUnit!=null && !"".equals(maintenanceIntervalUnit) && "天".equals(maintenanceIntervalUnit)){
+ Integer day = Integer.valueOf(maintenanceInterval);
+ // 当前时间+day天
+ LocalDateTime time1 = LocalDateTime.now().plusDays(day);
+ tErpMaintenanceReminder.setMaintenanceTime(time1);
+ }else if(maintenanceIntervalUnit!=null && !"".equals(maintenanceIntervalUnit) && "月".equals(maintenanceIntervalUnit)){
+ Integer day = Integer.valueOf(maintenanceInterval);
+ // 当前时间+day月
+ LocalDateTime time1 = LocalDateTime.now().plusMonths(day);
+ tErpMaintenanceReminder.setMaintenanceTime(time1);
+ }else if(maintenanceIntervalUnit!=null && !"".equals(maintenanceIntervalUnit) && "年".equals(maintenanceIntervalUnit)){
+ Integer day = Integer.valueOf(maintenanceInterval);
+ // 当前时间+day年
+ LocalDateTime time1 = LocalDateTime.now().plusYears(day);
+ tErpMaintenanceReminder.setMaintenanceTime(time1);
+ }
- TErpMaintenanceReminder tErpMaintenanceReminder = new TErpMaintenanceReminder();
- TErpGoods byId1 = erpGoodsService.getById(goodsId);
- String maintenanceInterval = byId1.getMaintenanceInterval();
- String maintenanceIntervalUnit = byId1.getMaintenanceIntervalUnit();
- if(maintenanceIntervalUnit!=null && !"".equals(maintenanceIntervalUnit) && "天".equals(maintenanceIntervalUnit)){
- Integer day = Integer.valueOf(maintenanceInterval);
- // 当前时间+day天
- LocalDateTime time1 = LocalDateTime.now().plusDays(day);
- tErpMaintenanceReminder.setMaintenanceTime(time1);
- }else if(maintenanceIntervalUnit!=null && !"".equals(maintenanceIntervalUnit) && "月".equals(maintenanceIntervalUnit)){
- Integer day = Integer.valueOf(maintenanceInterval);
- // 当前时间+day月
- LocalDateTime time1 = LocalDateTime.now().plusMonths(day);
- tErpMaintenanceReminder.setMaintenanceTime(time1);
- }else if(maintenanceIntervalUnit!=null && !"".equals(maintenanceIntervalUnit) && "年".equals(maintenanceIntervalUnit)){
- Integer day = Integer.valueOf(maintenanceInterval);
- // 当前时间+day年
- LocalDateTime time1 = LocalDateTime.now().plusYears(day);
- tErpMaintenanceReminder.setMaintenanceTime(time1);
+ tErpMaintenanceReminder.setClinicSupplierId(reminder.getClinicSupplierId());
+ tErpMaintenanceReminder.setMaintenanceType(reminder.getMaintenanceType());
+ tErpMaintenanceReminder.setWarehousingBatchId(warehousingBatchId);
+ tErpMaintenanceReminder.setMaintenancePersonId(user.getUserId().intValue());
+
+ erpMaintenanceReminderService.save(tErpMaintenanceReminder);
+ }else {
+ TErpSupplierWarehousingBatch byId = erpSupplierWarehousingBatchService.getById(warehousingBatchId);
+ String goodsId = erpSupplierWarehousingService.getById(byId.getWarehousingId()).getGoodsId();
+ TErpMaintenanceReminder tErpMaintenanceReminder = new TErpMaintenanceReminder();
+ TErpGoods byId1 = erpGoodsService.getById(goodsId);
+ String maintenanceInterval = byId1.getMaintenanceInterval();
+ String maintenanceIntervalUnit = byId1.getMaintenanceIntervalUnit();
+ if(maintenanceIntervalUnit!=null && !"".equals(maintenanceIntervalUnit) && "天".equals(maintenanceIntervalUnit)){
+ Integer day = Integer.valueOf(maintenanceInterval);
+ // 当前时间+day天
+ LocalDateTime time1 = LocalDateTime.now().plusDays(day);
+ tErpMaintenanceReminder.setMaintenanceTime(time1);
+ }else if(maintenanceIntervalUnit!=null && !"".equals(maintenanceIntervalUnit) && "月".equals(maintenanceIntervalUnit)){
+ Integer day = Integer.valueOf(maintenanceInterval);
+ // 当前时间+day月
+ LocalDateTime time1 = LocalDateTime.now().plusMonths(day);
+ tErpMaintenanceReminder.setMaintenanceTime(time1);
+ }else if(maintenanceIntervalUnit!=null && !"".equals(maintenanceIntervalUnit) && "年".equals(maintenanceIntervalUnit)){
+ Integer day = Integer.valueOf(maintenanceInterval);
+ // 当前时间+day年
+ LocalDateTime time1 = LocalDateTime.now().plusYears(day);
+ tErpMaintenanceReminder.setMaintenanceTime(time1);
+ }
+
+ tErpMaintenanceReminder.setClinicSupplierId(reminder.getClinicSupplierId());
+ tErpMaintenanceReminder.setMaintenanceType(reminder.getMaintenanceType());
+ tErpMaintenanceReminder.setWarehousingBatchId(warehousingBatchId);
+ tErpMaintenanceReminder.setMaintenancePersonId(user.getUserId().intValue());
+
+ erpMaintenanceReminderService.save(tErpMaintenanceReminder);
}
-
- tErpMaintenanceReminder.setClinicSupplierId(reminder.getClinicSupplierId());
- tErpMaintenanceReminder.setMaintenanceType(reminder.getMaintenanceType());
- tErpMaintenanceReminder.setWarehousingBatchId(warehousingBatchId);
- tErpMaintenanceReminder.setMaintenancePersonId(user.getUserId().intValue());
-
- erpMaintenanceReminderService.save(tErpMaintenanceReminder);
}
return R.ok();
--
Gitblit v1.7.1