licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生产管理生产、装配任务派工单计划提醒问题处理

Browse Source
This commit is contained in:
MisG 2025-01-23 17:37:23 +08:00
parent 570c59d441
commit 3ded5085eb
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
View File

@ -477,7 +477,7 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
} }
} }
} }
BigDecimal hoursAverage = stWorkTimeTotal.divide(new BigDecimal(7), RoundingMode.HALF_UP); BigDecimal hoursAverage = stWorkTimeTotal.divide(new BigDecimal(7), 2, RoundingMode.HALF_UP);
// 判断是否超出最大时长 // 判断是否超出最大时长
if (hoursAverage.compareTo(maxTime) > 0) { if (hoursAverage.compareTo(maxTime) > 0) {
// 如果超时，返回符合条件的结果 // 如果超时，返回符合条件的结果

3
mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue
View File

@ -707,8 +707,10 @@ watch(
} }
console.log(`第 ${index + 1} 行的预计工时变化为: ${newWorkTime}`); console.log(`第 ${index + 1} 行的预计工时变化为: ${newWorkTime}`);
console.log("detail==", detail) console.log("detail==", detail)
if(detail.startTime){
openDialogWT(detail); openDialogWT(detail);
} }
}
); );
watches.push(unwatch); // 存储当前的取消监听函数 watches.push(unwatch); // 存储当前的取消监听函数
}); });
@ -719,7 +721,6 @@ watch(
const openDialogWT = async (dataParam) => { const openDialogWT = async (dataParam) => {
taskDD.value = null; taskDD.value = null;
taskDD.value = dataParam.startTime; taskDD.value = dataParam.startTime;
console.log("taskDD==", taskDD)
const data = await TaskDispatchApi.getTaskDispatchDetailListByWorkTime(dataParam); const data = await TaskDispatchApi.getTaskDispatchDetailListByWorkTime(dataParam);
//debugger //debugger
dataList.value = []; dataList.value = [];

5
mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue
View File

@ -753,9 +753,11 @@ watch(
return; return;
} }
console.log(`第 ${index + 1} 行的预计工时变化为: ${newWorkTime}`); console.log(`第 ${index + 1} 行的预计工时变化为: ${newWorkTime}`);
console.log("detail==", detail) console.log("detail=", detail.startTime)
if(detail.startTime){
openDialogWT(detail); openDialogWT(detail);
} }
}
); );
watches.push(unwatch); // 存储当前的取消监听函数 watches.push(unwatch); // 存储当前的取消监听函数
}); });
@ -766,7 +768,6 @@ watch(
const openDialogWT = async (dataParam) => { const openDialogWT = async (dataParam) => {
taskDD.value = null; taskDD.value = null;
taskDD.value = dataParam.startTime; taskDD.value = dataParam.startTime;
console.log("taskDD==", taskDD)
const data = await TaskdispatchApi.getTaskDispatchDetailListByWorkTime(dataParam); const data = await TaskdispatchApi.getTaskDispatchDetailListByWorkTime(dataParam);
//debugger //debugger
dataList.value = []; dataList.value = [];