From e95c13d311cb226455c009673ac89ca78e3ffdc1 Mon Sep 17 00:00:00 2001
From: Ledo <Watch13755@#.>
Date: Fri, 21 Feb 2025 10:51:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E6=9F=A5=E8=AF=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=8F=8Abom=E5=AE=A1=E6=A0=B8=E4=BA=BA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../heli/dal/mysql/taskdispatch/TaskDispatchMapper.java       | 1 +
 .../heli/service/taskdispatch/TaskDispatchServiceImpl.java    | 4 +++-
 mes-ui/mes-ui-admin-vue3/src/views/heli/shenhe/ShenheForm.vue | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java
index 1b793dc..6fa52ea 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java
@@ -58,6 +58,7 @@ public interface TaskDispatchMapper extends BaseMapperX<TaskDispatchDO> {
                 .leftJoin(PlanTaskBomDO.class, "i", wrapper -> wrapper.eq(PlanTaskBomDO::getTaskId, PlanTaskDO::getId).eq(PlanTaskBomDO::getBomDetailId, TaskDispatchDO::getBomDetailId))
                 .leftJoin(AdminUserDO.class, "u1", AdminUserDO::getId, PlanTaskBomDO::getOwner)
                 .orderByDesc(TaskDispatchDO::getId)
+                .eq(ProjectOrderSubDO::getDeleted,0)
                 .disableSubLogicDel();
 
         query.like(!StringUtils.isEmpty(reqVO.getCode()), TaskDispatchDO::getCode, reqVO.getCode())
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
index 466d381..765dc15 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java
@@ -15,6 +15,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthing
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.equipmanufacture.EquipManufactureDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.fpuserdetail.FpUserDetailDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO;
+import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO;
@@ -268,7 +269,8 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
         for (TaskDispatchDO taskDispatchDO : list) {
             Integer num ;
             if (numMap.get(taskDispatchDO.getProjectSubId())==null){
-                 num = projectOrderSubMapper.selectById(taskDispatchDO.getProjectSubId()).getAmount();
+                ProjectOrderSubDO projectOrderSubDO = projectOrderSubMapper.selectById(taskDispatchDO.getProjectSubId());
+                num = projectOrderSubMapper.selectById(taskDispatchDO.getProjectSubId()).getAmount();
                 numMap.put(taskDispatchDO.getProjectSubId(),num);
             }else {
                 num= numMap.get(taskDispatchDO.getProjectSubId());
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/shenhe/ShenheForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/shenhe/ShenheForm.vue
index a06fa58..50a6fbc 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/shenhe/ShenheForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/shenhe/ShenheForm.vue
@@ -37,7 +37,7 @@ v-for="dicts in getIntDictOptions(DICT_TYPE.HELI_SHENHE)" :key="dicts.value"
 <script setup lang="ts">
 import * as ShenheApi from '@/api/heli/shenhe'
 import { getIntDictOptions, getStrDictOptions, DICT_TYPE, getDictLabel } from '@/utils/dict'
-	import UserSelect from '@/views/heli/hlvuestyle/userSelect.vue'
+	import UserSelect from '@/views/heli/hlvuestyle/userSelectAll.vue'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗