From 153d165114fb17722853629dfdc9c1d59b73e439 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 31 三月 2024 19:48:00 +0800
Subject: [PATCH] mdc ok
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/wrapper/WorkstationFeedBackDetailWrapper.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/wrapper/WorkstationFeedBackDetailWrapper.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/wrapper/WorkstationFeedBackDetailWrapper.java
index f9a94b7..3be44ef 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/wrapper/WorkstationFeedBackDetailWrapper.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/wrapper/WorkstationFeedBackDetailWrapper.java
@@ -4,6 +4,9 @@
import com.qianwen.smartman.common.enums.GlobalWcsTypeEnum;
import com.qianwen.core.mp.support.BaseEntityWrapper;
import com.qianwen.core.tool.utils.SpringUtil;
+import com.qianwen.smartman.modules.cps.entity.Employee;
+import com.qianwen.smartman.modules.cps.entity.GlobalWcs;
+import com.qianwen.smartman.modules.cps.entity.Workstation;
import com.qianwen.smartman.modules.cps.service.IEmployeeService;
import com.qianwen.smartman.modules.cps.service.IGlobalWcsService;
import com.qianwen.smartman.modules.cps.service.IWorkstationService;
@@ -13,7 +16,6 @@
import com.qianwen.smartman.modules.mdc.service.IWorkstationFeedbackService;
import com.qianwen.smartman.modules.mdc.vo.WorkstationFeedBackDetailVO;
-/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/mdc/wrapper/WorkstationFeedBackDetailWrapper.class */
public class WorkstationFeedBackDetailWrapper extends BaseEntityWrapper<WorkstationFeedbackDetail, WorkstationFeedBackDetailVO> {
private static final IWorkstationFeedbackService feedbackService = (IWorkstationFeedbackService) SpringUtil.getBean(IWorkstationFeedbackService.class);
private static final IEmployeeService employeeService = (IEmployeeService) SpringUtil.getBean(IEmployeeService.class);
@@ -33,6 +35,16 @@
vo.setEndTime(detail.getEndTime());
vo.setFeedbackTime(feedback.getFeedbackTime());
vo.setFeedbackDesc(feedback.getRemark());
+
+ Optional.<GlobalWcs>ofNullable(globalWcsService.getByCode(detail.getWcs(), GlobalWcsTypeEnum.FEEDBACK)).map(GlobalWcs::getName)
+ .ifPresent(vo::setWcsDesc);
+ Optional.<Long>ofNullable(feedback.getFeedUser()).map(employeeService::cachedById).map(Employee::getName).ifPresent(vo::setFeedUser);
+ Optional.<Long>ofNullable(feedback.getEndFeedUser()).map(employeeService::cachedById).map(Employee::getName).ifPresent(vo::setEndFeedUser);
+ Optional.<Workstation>ofNullable(workstationService.getById(feedback.getWorkstationId())).ifPresent(station -> vo.setWorkstationName(station.getName()));
+
+ vo.setCanDelete(Boolean.valueOf((!feedback.getStatus().equals(FeedbackStatus.SYNCING) && !feedback.getStatus().equals(FeedbackStatus.WAIT_SYNC))));
+
+ /*
Optional map = Optional.ofNullable(globalWcsService.getByCode(detail.getWcs(), GlobalWcsTypeEnum.FEEDBACK)).map((v0) -> {
return v0.getName();
});
@@ -62,6 +74,7 @@
vo.setWorkstationName(station.getName());
});
vo.setCanDelete(Boolean.valueOf((feedback.getStatus().equals(FeedbackStatus.SYNCING) || feedback.getStatus().equals(FeedbackStatus.WAIT_SYNC)) ? false : true));
+ */
return vo;
}
}
--
Gitblit v1.9.3