From 526721dd3acad281204e33d53b5168322ee31e56 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 20 六月 2025 11:34:55 +0800
Subject: [PATCH] 维修调度-报废库
---
src/main/java/com/whyc/service/WorkflowLinkService.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorkflowLinkService.java b/src/main/java/com/whyc/service/WorkflowLinkService.java
index 61817af..f3acc30 100644
--- a/src/main/java/com/whyc/service/WorkflowLinkService.java
+++ b/src/main/java/com/whyc/service/WorkflowLinkService.java
@@ -6,11 +6,9 @@
import com.whyc.dto.Response;
import com.whyc.mapper.*;
import com.whyc.pojo.db_user.User;
-import com.whyc.pojo.web_site.DeviceSpare;
-import com.whyc.pojo.web_site.WorkflowDevice;
-import com.whyc.pojo.web_site.WorkflowLink;
-import com.whyc.pojo.web_site.WorkflowMain;
+import com.whyc.pojo.web_site.*;
import com.whyc.util.CommonUtil;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -35,6 +33,8 @@
@Autowired
private DeviceSpareService deviceSpareService;
+ @Autowired
+ private DeviceScrapService deviceScrapService;
public void addBatch(List<WorkflowLink> links) {
@@ -81,23 +81,38 @@
mainInDB.setEndTime(now);
mainInDB.setEndReason(link.getDealReason());
mainService.updateById(mainInDB);
+
+ List<WorkflowDevice> deviceListInDB = deviceService.getByMainId(mainInDB.getId());
//鍏ュ簱
if(mainInDB.getType() == 2){
- List<WorkflowDevice> deviceListInDB = deviceService.getByMainId(mainInDB.getId());
List<DeviceSpare> spareList = new ArrayList<>();
deviceListInDB.forEach(device -> {
DeviceSpare spare = new DeviceSpare();
- spare.setName(device.getName());
+ /*spare.setName(device.getName());
spare.setModel(device.getModel());
spare.setVersion(device.getVersion());
spare.setQuantity(device.getQuantity());
spare.setBrand(device.getBrand());
spare.setType(device.getType());
- spare.setSupplier(device.getSupplier());
+ spare.setSupplier(device.getSupplier());*/
+ BeanUtils.copyProperties(device,spare);
spareList.add(spare);
});
- deviceSpareService.add(spareList);
+ deviceSpareService.addOrUpdate(spareList);
+ }else{ //杩涘叆鎶ュ簾搴�
+ List<DeviceScrap> scrapList = new ArrayList<>();
+ deviceListInDB.forEach(device -> {
+ DeviceScrap deviceScrap = new DeviceScrap();
+ BeanUtils.copyProperties(device,deviceScrap);
+ deviceScrap.setApplyUserId(mainInDB.getCreateUserId());
+ deviceScrap.setApplyUserName(mainInDB.getCreateUserName());
+ deviceScrap.setCreateTime(now);
+ deviceScrap.setMainId(mainInDB.getId());
+ scrapList.add(deviceScrap);
+ });
+ deviceScrapService.add(scrapList);
+
}
}else if(link.getStatus() == WorkflowEnum.LINK_STATUS_REJECT.getValue().intValue()){
mainInDB.setStatus(WorkflowEnum.MAIN_STATUS_END_REJECT.getValue());
--
Gitblit v1.9.1