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

Merge branch 'main' of http://120.48.141.82:3000/licq/heli-mes

Browse Source
This commit is contained in:
think 2025-01-23 17:38:37 +08:00
commit 29155e6a2d
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

@ -504,7 +504,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) {
// 如果超时，返回符合条件的结果

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

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

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

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