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

1.派工明细未保存返回超出设备每日最大运行时长信息时，项目名称和子项目名称不显示

Browse Source 
2.增加生产派工只查生产派工，装配派工只查装配派工
3.优化先输入工时后选择设备不走监听问题
This commit is contained in:
think 2025-02-07 17:14:16 +08:00
parent d8e05c2bab
commit d7a5498850
4 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskDispatchDetailTotalVO.java
View File

@ -105,4 +105,9 @@ public class TaskDispatchDetailTotalVO {
@Schema(description = "每日最大运行时长")
private BigDecimal maxLongTime;
@Schema(description = "派工类型 生产任务|装配任务 PRODUCTION|ASSEMBLE")
private String dispatchType;
}

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

@ -266,6 +266,10 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
}
// 创建一个新的实例
MPJLambdaWrapper<TaskDispatchDetailDO> query2 = new MPJLambdaWrapper<>();
//增加一个关联查询条件 ，装配派工只查装配派工，生产派工只查生产派工
query2.selectAll(TaskDispatchDetailDO.class);
query2.leftJoin(TaskDispatchDO.class,"a",TaskDispatchDO::getId,TaskDispatchDetailDO::getDispatchId)
.eq(TaskDispatchDO::getDispatchType,pageTotalVO.getDispatchType());
query2.eq(TaskDispatchDetailDO::getDeviceModel, pageTotalVO.getDeviceModel())
.and(wrapper -> {
wrapper.ge(TaskDispatchDetailDO::getStartTime, startDate)

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

@ -686,6 +686,7 @@ const clearWatches = () => {
watches = []; // 重新初始化
};
watch(
() => formData.value.taskDispatchDetails,
(newDetails) => {
@ -708,11 +709,27 @@ watch(
console.log(`第 ${index + 1} 行的预计工时变化为: ${newWorkTime}`);
console.log("detail==", detail)
if(detail.startTime){
//设置派工类型
detail.dispatchType = "ASSEMBLE";
openDialogWT(detail);
}
}
);
watches.push(unwatch); // 存储当前的取消监听函数
//制造设备监听
const unwatchDeviceModel = watch(
() => detail.deviceModel,
(newDeviceModel) => {
console.log(`第 ${index + 1} 行的制造设备变化为: ${newDeviceModel}`);
console.log("detail==", detail);
if (detail.startTime) {
//设置派工类型
detail.dispatchType = "ASSEMBLE";
openDialogWT(detail);
}
}
);
watches.push(unwatchDeviceModel);
});
}, {
deep: true
@ -726,6 +743,13 @@ const openDialogWT = async (dataParam) => {
dataList.value = [];
if (data.total !== 0) {
dataList.value = data.list; // 将获取到的数据存储到 dataList
for(var a=0;a<dataList.value.length;a++){
//处理未保存当前派工明细的情况下项目名称和子项目名称显示为空
if(dataList.value[a].projectName == null){
dataList.value[a].projectName = formData.value.projectName;
dataList.value[a].projectSubName = formData.value.projectSubName;
}
}
console.log("dataList.value==", dataList.value)
dialogTableVisible.value = true; // 打开弹框
} else {

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

@ -755,11 +755,27 @@ watch(
console.log(`第 ${index + 1} 行的预计工时变化为: ${newWorkTime}`);
console.log("detail=", detail.startTime)
if(detail.startTime){
//设置派工类型
detail.dispatchType = "PRODUCTION";
openDialogWT(detail);
}
}
);
watches.push(unwatch); // 存储当前的取消监听函数
//制造设备监听
const unwatchDeviceModel = watch(
() => detail.deviceModel,
(newDeviceModel) => {
console.log(`第 ${index + 1} 行的制造设备变化为: ${newDeviceModel}`);
console.log("detail==", detail);
if (detail.startTime) {
//设置派工类型
detail.dispatchType = "PRODUCTION";
openDialogWT(detail);
}
}
);
watches.push(unwatchDeviceModel);
});
}, {
deep: true
@ -773,6 +789,13 @@ const openDialogWT = async (dataParam) => {
dataList.value = [];
if (data.total !== 0) {
dataList.value = data.list; // 将获取到的数据存储到 dataList
for(var a=0;a<dataList.value.length;a++){
//处理未保存当前派工明细的情况下项目名称和子项目名称显示为空
if(dataList.value[a].projectName == null){
dataList.value[a].projectName = formData.value.projectName;
dataList.value[a].projectSubName = formData.value.projectSubName;
}
}
console.log("dataList.value==", dataList.value)
dialogTableVisible.value = true; // 打开弹框
} else {