root/yuenanFuJia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:细节优化

Browse Source
This commit is contained in:
郑旭明\73939
2025-12-19 10:06:07 +08:00
parent 8d84f85025
commit 55a0d0d63a
12 changed files with 67 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/AcsErrorTask.java
View File

@@ -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);
}

4
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java
View File

@@ -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);
}

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MovePointTask.java
View File

@@ -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);
}

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java
View File

@@ -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);
}

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java
View File

@@ -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);
}

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java
View File

@@ -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);
}

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java
View File

@@ -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);
}

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java
View File

@@ -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);
}

4
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java
View File

@@ -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);

36
nladmin-ui/src/views/dashboard/mixins/dashboard2.js
View File

@@ -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,

32
nladmin-ui/src/views/wms/st/inbill/index.vue
View File

@@ -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"
>
<el-table-column type="selection" width="55" />
<el-table-column
v-permission="['admin','inbill:del','inbill:edit']"
:label="$t('wms.st.inbill.operation')"
width="115"
align="center"
fixed="right"
>
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
:disabled-edit="canUd(scope.row)"
:disabled-dle="canUd(scope.row)"
/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="bill_code" width="130" :label="$t('wms.st.inbill.bill_code')">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
@@ -208,6 +193,21 @@
<el-table-column :label="$t('wms.st.inbill.allocated_time')" align="center" prop="dis_time" width="150" />
<el-table-column :label="$t('wms.st.inbill.confirmed_by')" align="center" prop="confirm_optname" width="150" />
<el-table-column :label="$t('wms.st.inbill.confirmed_time')" align="center" prop="confirm_time" width="150" />
<el-table-column
v-permission="['admin','inbill:del','inbill:edit']"
:label="$t('wms.st.inbill.operation')"
width="115"
align="center"
>
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
:disabled-edit="canUd(scope.row)"
:disabled-dle="canUd(scope.row)"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />

34
nladmin-ui/src/views/wms/st/outbill/index.vue
View File

@@ -159,28 +159,12 @@
:data="crud.data"
style="width: 100%;"
:highlight-current-row="true"
max-height="600"
@selection-change="crud.selectionChangeHandler"
@current-change="handleCurrentChange"
@select="handleSelectionChange"
@select-all="onSelectAll"
>
<el-table-column
v-permission="['admin','checkoutbill:del','checkoutbill:edit']"
:label="$t('wms.st.outbill.operation')"
width="250"
align="center"
fixed="right"
>
<template slot-scope="scope">
<udOperation
:data="scope.row"
style="display: inline"
:permission="permission"
:disabled-edit="canUd(scope.row)"
:disabled-dle="canUd(scope.row)"
/>
</template>
</el-table-column>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="bill_code" width="130" :label="$t('wms.st.outbill.bill_code')">
<template slot-scope="scope">
@@ -209,6 +193,22 @@
<el-table-column show-overflow-tooltip :label="$t('wms.st.outbill.allocated_time')" align="center" prop="dis_time" width="140" />
<el-table-column show-overflow-tooltip :label="$t('wms.st.outbill.confirmed_by')" align="center" prop="confirm_optname" />
<el-table-column show-overflow-tooltip :label="$t('wms.st.outbill.confirmed_time')" align="center" prop="confirm_time" width="140" />
<el-table-column
v-permission="['admin','checkoutbill:del','checkoutbill:edit']"
:label="$t('wms.st.outbill.operation')"
width="250"
align="center"
>
<template slot-scope="scope">
<udOperation
:data="scope.row"
style="display: inline"
:permission="permission"
:disabled-edit="canUd(scope.row)"
:disabled-dle="canUd(scope.row)"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />