From d7a5498850dbceff54137f6e46b26e0e9457d677 Mon Sep 17 00:00:00 2001 From: think <1787994136@qq.com> Date: Fri, 7 Feb 2025 17:14:16 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B4=BE=E5=B7=A5=E6=98=8E=E7=BB=86=E6=9C=AA?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=BF=94=E5=9B=9E=E8=B6=85=E5=87=BA=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=AF=8F=E6=97=A5=E6=9C=80=E5=A4=A7=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=97=B6=E9=95=BF=E4=BF=A1=E6=81=AF=E6=97=B6=EF=BC=8C=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E5=92=8C=E5=AD=90=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=8D=E6=98=BE=E7=A4=BA=202.=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=94=9F=E4=BA=A7=E6=B4=BE=E5=B7=A5=E5=8F=AA=E6=9F=A5?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=B4=BE=E5=B7=A5=EF=BC=8C=E8=A3=85=E9=85=8D?= =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E5=8F=AA=E6=9F=A5=E8=A3=85=E9=85=8D=E6=B4=BE?= =?UTF-8?q?=E5=B7=A5=203.=E4=BC=98=E5=8C=96=E5=85=88=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E5=B7=A5=E6=97=B6=E5=90=8E=E9=80=89=E6=8B=A9=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E4=B8=8D=E8=B5=B0=E7=9B=91=E5=90=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/TaskDispatchDetailTotalVO.java | 5 ++++ .../TaskDispatchDetailMapper.java | 4 ++++ .../src/views/heli/taskdispatch/detail.vue | 24 +++++++++++++++++++ .../views/heli/taskdispatch/detailDialog.vue | 23 ++++++++++++++++++ 4 files changed, 56 insertions(+) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskDispatchDetailTotalVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskDispatchDetailTotalVO.java index 87ee314..723b1c0 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskDispatchDetailTotalVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskDispatchDetailTotalVO.java @@ -105,4 +105,9 @@ public class TaskDispatchDetailTotalVO { @Schema(description = "每日最大运行时长") private BigDecimal maxLongTime; + + @Schema(description = "派工类型 生产任务|装配任务 PRODUCTION|ASSEMBLE") + private String dispatchType; + + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java index c9aaff1..7e0c86c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java @@ -266,6 +266,10 @@ public interface TaskDispatchDetailMapper extends BaseMapperX 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) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue index 00d7af0..a9944ef 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue @@ -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 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