From d590a1e24854438bb6af71ff85f6b87c089be837 Mon Sep 17 00:00:00 2001
From: zxy <zhouxy@11.com>
Date: Thu, 2 Apr 2026 18:28:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(wmsstorage):=20=E4=BF=AE=E5=A4=8D=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E5=AF=BC=E5=87=BA=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=B9=B6=E8=B0=83=E6=95=B4=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=88=97=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wmsstorage/WmsStorageServiceImpl.java     | 19 ++++++++++---------
 .../src/views/heli/wmsstorage/index.vue       | 18 +++++++++---------
 .../src/views/heli/xzdstoragelog/index.vue    | 16 ++++++++--------
 3 files changed, 27 insertions(+), 26 deletions(-)

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 957ac827..fd95156b 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
@@ -78,15 +78,16 @@ public class WmsStorageServiceImpl implements WmsStorageService {
 //        wmsStorageDetailMapper.delete(WmsStorageDetailDO::getXzdWmsId, id);
 
         //  storageLogService
-        StorageLogDO storageLogDO = storageLogMapper.selectOne(StorageLogDO::getXzdStockId, wmsStorage.getId());
-        if (storageLogDO != null) {
-            storageLogDO.setIsExport(0);
-            storageLogDO.setUpdater("");
-            storageLogDO.setUpdateTime(LocalDateTime.now());
-            storageLogDO.setXzdStockId(null);
-            storageLogDO.setXzdStockNo(null);
-            storageLogDO.setIncoiceCode(null);
-            storageLogMapper.updateById(storageLogDO);
+        List<StorageLogDO> logDOS = storageLogMapper.selectList(StorageLogDO::getXzdStockId, wmsStorage.getId());
+        Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
+        for (StorageLogDO logDO : logDOS) {
+            logDO.setIsExport(0);
+            logDO.setUpdater(String.valueOf(loginUserId));
+            logDO.setUpdateTime(LocalDateTime.now());
+            logDO.setXzdStockId(null);
+            logDO.setXzdStockNo(null);
+            logDO.setIncoiceCode(null);
+            storageLogMapper.updateById(logDO);
         }
     }
 
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/index.vue
index 1aecdc02..c40edc8a 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/index.vue
@@ -23,7 +23,7 @@
           v-model="queryParams.stockType"
           placeholder="请选择单据类型"
           clearable
-          class="!w-240px"
+          class="!w-260px"
         >
           <el-option
             v-for="item in HeliStockTypeDict"
@@ -34,7 +34,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="单据状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-260px">
           <el-option
             v-for="item in HeliStorageStatusDict"
             :key="item.value"
@@ -90,7 +90,7 @@
           {{ getHeliStockTypeLabel(scope.row.stockType) }}
         </template>
       </el-table-column>
-      <el-table-column fixed="left" label="单据状态" min-width="140" align="center" prop="status">
+      <el-table-column fixed="left" label="单据状态" min-width="100" align="center" prop="status">
         <template #default="scope">
           <el-tag v-if="scope.row.status === 1" type="success">
             <Icon icon="ep:check" class="mr-5px" />
@@ -105,22 +105,22 @@
       <el-table-column
         label="单据编号"
         fixed="left"
-        min-width="220"
+        min-width="140"
         align="center"
         prop="stockNo"
       />
-      <el-table-column label="仓库" min-width="200" align="center" prop="whName" />
+      <el-table-column label="仓库" min-width="180" align="center" prop="whName" />
       <el-table-column label="业务日期" width="120" align="center" prop="busiDate">
         <template #default="scope">
           {{ formatDate(scope.row.busiDate, 'YYYY-MM-DD') }}
         </template>
       </el-table-column>
-      <el-table-column label="供应商名称" min-width="300" align="center" prop="supplierName" />
-      <el-table-column label="价格类型" min-width="160" align="center" prop="priceType" />
-      <el-table-column label="部门" min-width="500" align="center" prop="deptName" />
+      <el-table-column label="供应商名称" min-width="250" align="center" prop="supplierName" />
+      <el-table-column label="价格类型" min-width="130" align="center" prop="priceType" />
+      <el-table-column label="部门" min-width="400" align="center" prop="deptName" />
       <!--      <el-table-column label="业务类型" align="center" prop="busiType" />-->
       <!--      <el-table-column label="备注" align="center" prop="description" />-->
-      <el-table-column label="辅助项" min-width="200" align="center" prop="auItem" />
+      <el-table-column label="辅助项" min-width="180" align="center" prop="auItem" />
       <el-table-column label="操作" align="center" width="150" fixed="right">
         <template #default="scope">
           <el-button
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/xzdstoragelog/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/xzdstoragelog/index.vue
index efb626ee..b6c3193d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/xzdstoragelog/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/xzdstoragelog/index.vue
@@ -16,7 +16,7 @@
           <el-date-picker
             v-model="queryParams.createTime"
             :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            class="!w-280px"
+            class="!w-260px"
             end-placeholder="结束日期"
             start-placeholder="开始日期"
             type="daterange"
@@ -29,7 +29,7 @@
             placeholder="物料编号"
             clearable
             @keyup.enter="handleQuery"
-            class="!w-240px"
+            class="!w-260px"
           />
         </el-form-item>
         <el-form-item label="物料名称" prop="matName">
@@ -46,7 +46,7 @@
             v-model="queryParams.stockType"
             placeholder="请选择单据类型"
             clearable
-            class="!w-280px"
+            class="!w-260px"
           >
             <el-option
               v-for="item in HeliStockTypeDict"
@@ -61,7 +61,7 @@
             v-model="queryParams.isExport"
             placeholder="请选择状态"
             clearable
-            class="!w-240px"
+            class="!w-260px"
           >
             <el-option
               v-for="item in HeliStorageIsExportDict"
@@ -126,13 +126,13 @@
         height="calc(100vh - 410px)"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="50" :selectable="checkSelectable" />
+        <el-table-column type="selection" width="40" :selectable="checkSelectable" />
         <el-table-column type="index" width="60" label="序号" align="center" fixed="left" />
         <el-table-column
           label="单据类型"
           align="center"
           prop="stockMode"
-          min-width="110"
+          min-width="100"
           fixed="left"
         >
           <template #default="scope">
@@ -143,7 +143,7 @@
           label="单据状态"
           align="center"
           prop="stockMode"
-          min-width="110"
+          min-width="100"
           fixed="left"
         >
           <template #default="scope">
@@ -158,7 +158,7 @@
           label="单据编号"
           align="center"
           prop="xzdStockNo"
-          min-width="220"
+          min-width="130"
         />
 
         <el-table-column label="物料编码" align="center" prop="matCode" min-width="200">