From 476bbed2a67ab164eb20762a7a70fc1547e1c29b Mon Sep 17 00:00:00 2001
From: zxy <zhouxy1921@11.com>
Date: Mon, 19 Jan 2026 11:59:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=8D=B3=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/storage/StorageController.java   |  6 +++++-
 .../src/views/heli/storage/outdex.vue                 | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

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 fc11b434..b2684e2d 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
@@ -158,6 +158,10 @@ public class StorageController {
         }
         updateReqVO = BeanUtils.toBean(targetDo, StorageSaveReqVO.class);
 
+        //出库即审核
+        if (updateReqVO.getStockType() == 2) {
+            updateReqVO.setStatus(4);
+        }
         storageService.updateStorage(updateReqVO);
         int status = targetDo.getStatus();
         StorageSaveReqVO saveReqVO;
@@ -265,7 +269,7 @@ public class StorageController {
             }
         }
         storageService.updateLogList(targetDo.getId(),status,targetDo.getStockType(),targetDo.getStockNo());
-        if (saveReqVO.getInOutFlag()){
+        if (saveReqVO.getInOutFlag() != null && saveReqVO.getInOutFlag()) {
             //增加出库日志
             storageService.updateLogList(targetDo.getId(), saveReqVO.getStatus(), saveReqVO.getStockType(), saveReqVO.getStockNo());
         }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/outdex.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/outdex.vue
index 90a35587..35f2ceb8 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/outdex.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/outdex.vue
@@ -127,6 +127,13 @@
             {{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}
           </template>
         </el-table-column>
+        <el-table-column label="即入即出" align="center" prop="inOutFlag" min-width="100" >
+          <template #default="scope">
+            <el-tag :type="scope.row.inOutFlag ? 'success' : 'info'">
+              {{ scope.row.inOutFlag ? '是' : '否' }}
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="领料人" align="center" prop="materialReceiver" min-width="120">
           <template #default="scope">
             {{ userList.find((user) => user.id === scope.row.materialReceiver)?.nickname }}
@@ -180,9 +187,13 @@
             <el-button link type="primary" @click="openDetail('update', scope.row.id)" v-if="scope.row.status != 3&&scope.row.status != 4">
               编辑
             </el-button>
+<!--            <el-button link type="danger" @click="handleDelete(scope.row.id)" v-if="scope.row.status == 4">-->
+<!--              作废-->
+<!--            </el-button>-->
             <el-button link type="primary" @click="openDetail('review', scope.row.id)">
               查看详情
             </el-button>
+
             <!-- <el-button
             link
             type="danger"