From e8ed1a91c77ab62a924f12acd55777f227bacd7e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 21 十一月 2025 17:15:17 +0800
Subject: [PATCH] 工位组删除后,其下工位移动到默认组
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/OutputStatisticsServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/OutputStatisticsServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/OutputStatisticsServiceImpl.java
index c4ec774..37a64cc 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/OutputStatisticsServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/OutputStatisticsServiceImpl.java
@@ -26,14 +26,14 @@
import com.qianwen.smartman.common.constant.ShiftConstant;
import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
import com.qianwen.smartman.common.utils.MessageUtils;
-import com.qianwen.smartman.modules.cps.convert.WorkstationConvert;
-import com.qianwen.smartman.modules.cps.dto.ShiftInfoDTO;
-import com.qianwen.smartman.modules.cps.entity.Workstation;
-import com.qianwen.smartman.modules.cps.enums.WorkstationTypeEnum;
-import com.qianwen.smartman.modules.cps.mapper.WorkstationMapper;
-import com.qianwen.smartman.modules.cps.service.IShiftDetailService;
-import com.qianwen.smartman.modules.cps.service.IWorkstationService;
-import com.qianwen.smartman.modules.cps.vo.WorkstationVO;
+import com.qianwen.smartman.modules.smis.convert.WorkstationConvert;
+import com.qianwen.smartman.modules.smis.dto.ShiftInfoDTO;
+import com.qianwen.smartman.modules.smis.entity.Workstation;
+import com.qianwen.smartman.modules.smis.enums.WorkstationTypeEnum;
+import com.qianwen.smartman.modules.smis.mapper.WorkstationMapper;
+import com.qianwen.smartman.modules.smis.service.IShiftDetailService;
+import com.qianwen.smartman.modules.smis.service.IWorkstationService;
+import com.qianwen.smartman.modules.smis.vo.WorkstationVO;
import com.qianwen.smartman.modules.mdc.dto.IntervalDateDto;
import com.qianwen.smartman.modules.mdc.dto.StatisticsWrapperDto;
import com.qianwen.smartman.modules.mdc.entity.SuperAggregate;
@@ -98,7 +98,9 @@
List<SuperAggregateOutput> superAggregateList = FilterOffUtils.filterOffDay(superAggregateOutputByNaturalDate, OpenTypeEnums.OUT_PUT);
StatisticsWrapperDto statisticsWrapperDto = new StatisticsWrapperDto(superAggregateList, statisticsAnalysisQueryVO, intervalDates, workstationPage, MdcConstant.OUTPUT);
- return this.wrapper.entityVO(statisticsWrapperDto);
+
+ StatisticsVO result = this.wrapper.entityVO(statisticsWrapperDto);
+ return result;
}
@Override
--
Gitblit v1.9.3