From 55a0d0d63a61fcbe51062f7a606c5cd9c49dee90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=97=AD=E6=98=8E=5C73939?= <739390650@QQ.COM> Date: Fri, 19 Dec 2025 10:06:07 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/util/tasks/AcsErrorTask.java | 1 + .../service/util/tasks/BackInTask.java | 4 +-- .../service/util/tasks/MovePointTask.java | 1 + .../service/util/tasks/MoveTask.java | 2 +- .../service/util/tasks/PdaPointTask.java | 1 + .../service/util/tasks/StInTask.java | 1 + .../service/util/tasks/StOutTask.java | 1 + .../service/util/tasks/VehicleInTask.java | 1 + .../service/util/tasks/VehicleOutTask.java | 4 +-- .../src/views/dashboard/mixins/dashboard2.js | 36 ++++++++++++------- nladmin-ui/src/views/wms/st/inbill/index.vue | 32 ++++++++--------- nladmin-ui/src/views/wms/st/outbill/index.vue | 34 +++++++++--------- 12 files changed, 67 insertions(+), 51 deletions(-) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/AcsErrorTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/AcsErrorTask.java index 1e87b79..7015198 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/AcsErrorTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/AcsErrorTask.java @@ -149,6 +149,7 @@ public class AcsErrorTask extends AbstractTask { // 更新任务 taskObj.setRemark("已完成"); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); + taskObj.setUpdate_time(DateUtil.now()); taskService.updateById(taskObj); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java index 9f9ff48..0430114 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java @@ -5,10 +5,9 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import org.nl.common.exception.BadRequestException; -import org.nl.config.language.LangProcess; import org.nl.common.utils.CodeUtil; -import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; import org.nl.language.LangBehavior; import org.nl.wms.basedata_manage.service.IStructattrService; import org.nl.wms.basedata_manage.service.dao.Structattr; @@ -158,6 +157,7 @@ public class BackInTask extends AbstractTask { // 更新任务 taskObj.setRemark("已完成"); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); + taskObj.setUpdate_time(DateUtil.now()); taskService.updateById(taskObj); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MovePointTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MovePointTask.java index 40388c2..e56f544 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MovePointTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MovePointTask.java @@ -165,6 +165,7 @@ public class MovePointTask extends AbstractTask { // 更新任务 taskObj.setRemark("已完成"); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); + taskObj.setUpdate_time(DateUtil.now()); taskService.updateById(taskObj); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java index 7f9ba6f..727e3cb 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java @@ -8,7 +8,6 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CodeUtil; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; -import org.nl.config.language.LangProcess; import org.nl.language.LangBehavior; import org.nl.wms.sch_manage.enums.TaskStatus; import org.nl.wms.sch_manage.service.ISchBaseTaskService; @@ -148,6 +147,7 @@ public class MoveTask extends AbstractTask { // 更新任务状态 taskObj.setRemark("已完成"); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); + taskObj.setUpdate_time(DateUtil.now()); taskService.updateById(taskObj); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java index 816ae9b..a114db6 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java @@ -147,6 +147,7 @@ public class PdaPointTask extends AbstractTask { // // 更新任务 taskObj.setRemark("已完成"); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); + taskObj.setUpdate_time(DateUtil.now()); taskService.updateById(taskObj); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java index 7d8d25b..3efdb06 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java @@ -164,6 +164,7 @@ public class StInTask extends AbstractTask { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskObj.setRemark(LangBehavior.language("task.completed")); + taskObj.setUpdate_time(DateUtil.now()); taskService.updateById(taskObj); rawAssistIStorService.taskFinish(taskObj); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java index e523c3a..6846280 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java @@ -144,6 +144,7 @@ public class StOutTask extends AbstractTask { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskObj.setRemark("已完成"); + taskObj.setUpdate_time(DateUtil.now()); taskService.updateById(taskObj); outBillService.taskFinish(taskObj); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java index 21ec464..e98b576 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java @@ -157,6 +157,7 @@ public class VehicleInTask extends AbstractTask { // 更新任务 taskObj.setRemark("已完成"); taskObj.setTask_status(TaskStatus.FINISHED.getCode()); + taskObj.setUpdate_time(DateUtil.now()); taskService.updateById(taskObj); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java index 2ae1dde..aa2065a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java @@ -5,9 +5,8 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import org.nl.common.exception.BadRequestException; -import org.nl.config.language.LangProcess; -import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; import org.nl.language.LangBehavior; import org.nl.wms.basedata_manage.enums.BaseDataEnum; import org.nl.wms.sch_manage.enums.TaskStatus; @@ -133,6 +132,7 @@ public class VehicleOutTask extends AbstractTask { public void finishTask(SchBaseTask taskObj) { // 任务完成 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); + taskObj.setUpdate_time(DateUtil.now()); taskObj.setRemark("已完成"); taskService.updateById(taskObj); outBillService.taskFinish(taskObj); diff --git a/nladmin-ui/src/views/dashboard/mixins/dashboard2.js b/nladmin-ui/src/views/dashboard/mixins/dashboard2.js index edd2bca..a18ef4a 100644 --- a/nladmin-ui/src/views/dashboard/mixins/dashboard2.js +++ b/nladmin-ui/src/views/dashboard/mixins/dashboard2.js @@ -1,5 +1,19 @@ -import axios from 'axios' +import request from '@/utils/request' +export function getReportData(data) { + return request({ + url: '/api/bigScreen/getReportData', + method: 'get', + data + }) +} +export function getWeeklyData(data) { + return request({ + url: '/api/bigScreen/getWeeklyData', + method: 'get', + data + }) +} export default { /** * 获取仪表板报表数据 @@ -8,14 +22,12 @@ export default { */ async getReportData(params = {}) { try { - const response = await axios.get('/api/bigScreen/getReportData', { - params: { - dateRange: params.dateRange || '', - searchKey: params.searchKey || '', - ...params - } + const response = await getReportData({ + dateRange: params.dateRange || '', + searchKey: params.searchKey || '', + ...params }) - return response.data + return response } catch (error) { console.error('获取报表数据失败:', error) throw error @@ -29,13 +41,12 @@ export default { */ async getWeekData(params = {}) { try { - const response = await axios.get('/api/bigScreen/getWeeklyData', { - params: { + const response = await getWeeklyData( + { currentWeek: params.currentWeek || '', lastWeek: params.lastWeek || '', ...params - } - }) + }) return response.data } catch (error) { console.error('获取周对比数据失败:', error) @@ -54,7 +65,6 @@ export default { this.getReportData(params), this.getWeekData(params) ]) - // 返回Dashboard2.vue中期望的格式 return { stats: reportData && reportData.stats ? reportData.stats : undefined, diff --git a/nladmin-ui/src/views/wms/st/inbill/index.vue b/nladmin-ui/src/views/wms/st/inbill/index.vue index 13cffcb..81f35d1 100644 --- a/nladmin-ui/src/views/wms/st/inbill/index.vue +++ b/nladmin-ui/src/views/wms/st/inbill/index.vue @@ -156,28 +156,13 @@ :data="crud.data" highlight-current-row style="width: 100%;" + max-height="600" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange" @select="handleSelectionChange" @select-all="onSelectAll" > - - -