From 918c57e233e524c644fb27e3d95feabcf00f105c Mon Sep 17 00:00:00 2001
From: zxy <zhouxy@11.com>
Date: Fri, 3 Apr 2026 11:01:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(storagelog):=20=E4=BF=AE=E5=A4=8D=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E8=AE=B0=E5=BD=95=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=B9=B6=E5=AE=8C=E5=96=84=E4=BA=8B=E5=8A=A1=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/module/heli/dal/mysql/storagelog/StorageLogMapper.java  | 2 +-
 .../module/heli/service/wmsstorage/WmsStorageServiceImpl.java   | 1 +
 mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogMapper.java
index 3cc7cdac..7e885714 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogMapper.java
@@ -67,7 +67,7 @@ public interface StorageLogMapper extends BaseMapperX<StorageLogDO> {
                 .orderByDesc(StorageLogDO::getId);
 
         query
-                .notIn(StorageLogDO::getStockMode,24,14)
+                .notIn(StorageLogDO::getStockMode, 24, 14)
                 .like(!StringUtils.isEmpty(reqVO.getMatName()), StorageLogDO::getMatName, reqVO.getMatName())
                 .like(!StringUtils.isEmpty(reqVO.getMatCode()), MaterialDO::getCode, reqVO.getMatCode())
                 .eq(!StringUtils.isEmpty(reqVO.getStockType()), StorageLogDO::getStockType, reqVO.getStockType())
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/wmsstorage/WmsStorageServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/wmsstorage/WmsStorageServiceImpl.java
index fd95156b..ec95f050 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/wmsstorage/WmsStorageServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/wmsstorage/WmsStorageServiceImpl.java
@@ -63,6 +63,7 @@ public class WmsStorageServiceImpl implements WmsStorageService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteWmsStorage(Long id) {
         // 校验存在
         validateWmsStorageExists(id);
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
index 678b2438..4da4c04f 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
@@ -70,7 +70,7 @@
 
         <el-table-column label="物料编码" align="center" prop="matCode" min-width="250" >
           <template #default="scope">
-            <template v-if="scope.row.goodsType == 2">
+            <template v-if="scope.row.stock_mode == 11 ">
               <el-form-item class="mb-0px!">
                 <el-select
                   v-model="scope.row.matId"