diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java
index efe6369..dad0757 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java
@@ -103,8 +103,10 @@ public class StorageController {
 
         // 获取最新的出入库信息
         StorageDO targetDo = storageService.getStorage(updateReqVO.getId());
-        int beforeStatus = updateReqVO.getBeforeStatus();
-
+        int beforeStatus=0;
+        if (updateReqVO.getStockType()==2){
+            beforeStatus = updateReqVO.getBeforeStatus();
+        }
         targetDo.setStatus(updateReqVO.getStatus());
 
         // 提交或者作废时记录相关操作人
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plan/PlanServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plan/PlanServiceImpl.java
index 9d17006..c179bca 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plan/PlanServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plan/PlanServiceImpl.java
@@ -277,10 +277,10 @@ private TaskReportMapper taskReportMapper;
         LambdaQueryWrapper<PlanTaskDO> planTaskWrapper = new LambdaQueryWrapper<>();
         planTaskWrapper.eq(PlanTaskDO::getProjectPlanId, id);
         List<PlanTaskDO> planTaskDOS = planTaskMapper.selectList(planTaskWrapper);
-        if (planTaskDOS==null){
+        if (planTaskDOS==null||planTaskDOS.size()==0){
             return false;
         }
-        if (list==null){
+        if (list==null||list.size()==0){
             return false;
         }
         for (PlanTaskDO taskDO : planTaskDOS) {
@@ -288,7 +288,7 @@ private TaskReportMapper taskReportMapper;
             LambdaQueryWrapper<PlanTaskBomDO> taskBomDOWrapper = new LambdaQueryWrapper<>();
             taskBomDOWrapper.eq(PlanTaskBomDO::getTaskId, taskDO.getId());
             List<PlanTaskBomDO> planTaskBomDOS = planTaskBomMapper.selectList(taskBomDOWrapper);
-            if (planTaskBomDOS==null){
+            if (planTaskBomDOS==null||planTaskBomDOS.size()==0){
                 return false;
             }
             for (PlanTaskBomDO planTaskBomDO : planTaskBomDOS) {
@@ -303,8 +303,8 @@ private TaskReportMapper taskReportMapper;
             }
             if (flag){
                 LambdaQueryWrapper<TaskDispatchDO> taskDispatchDOWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(TaskDispatchDO::getTaskId,taskDO.getId());
-                queryWrapper.ne(TaskDispatchDO::getDispatchStatus, TaskDispatchStatusEnum.TERMINATE.getCode());
+                taskDispatchDOWrapper.eq(TaskDispatchDO::getTaskId,taskDO.getId());
+                taskDispatchDOWrapper.ne(TaskDispatchDO::getDispatchStatus, TaskDispatchStatusEnum.TERMINATE.getCode());
                 List<TaskDispatchDO> taskList = taskDispatchMapper.selectList(taskDispatchDOWrapper);
                 list.addAll(taskList);
             }
@@ -313,7 +313,7 @@ private TaskReportMapper taskReportMapper;
             LambdaQueryWrapper<TaskDispatchDetailDO> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDO.getId());
             List<TaskDispatchDetailDO> detailDOS = taskDispatchDetailMapper.selectList(wrapper);
-            if (detailDOS==null){
+            if (detailDOS==null||detailDOS.size()==0){
                 return false;
             }
             for (TaskDispatchDetailDO detailDO : detailDOS) {
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorder/PurchaseOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorder/PurchaseOrderServiceImpl.java
index 40c041e..15113a8 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorder/PurchaseOrderServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseorder/PurchaseOrderServiceImpl.java
@@ -1,5 +1,6 @@
 package com.chanko.yunxi.mes.module.heli.service.purchaseorder;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.chanko.yunxi.mes.framework.security.core.LoginUser;
 import com.chanko.yunxi.mes.module.heli.controller.admin.orderyf.vo.OrderYfSaveReqVO;
 import com.chanko.yunxi.mes.module.heli.controller.admin.plan.vo.PlanPageReqVO;
@@ -210,7 +211,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
     @Override
     public PageResult<PurchaseOrderDO> getPurchaseOrderPageByStatus(PurchaseOrderPageReqVO pageReqVO) {
-        pageReqVO.setAuditor(getLoginUser().getId());
+        if (ObjectUtil.isNotEmpty(pageReqVO.getStatus())&&pageReqVO.getStatus()==2){
+            pageReqVO.setAuditor(getLoginUser().getId());
+        }
         return purchaseOrderMapper.selectPageByStatus(pageReqVO);
     }
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
index 8c3b1f0..18d21da 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
@@ -425,7 +425,6 @@ const handleClick = (event) => {
 const getList = async (arrMat) => {
    let flag=true
    let whName=''
-  console.log(formData.value.whId)
   for (let i = 0; i < whList.value.length; i++) {
     console.log(whList.value[i].id)
     if (whList.value[i].id==formData.value.whId){