From 0beec72e2082dd20d172fcba23881640a086a89d Mon Sep 17 00:00:00 2001 From: zxy Date: Wed, 8 Apr 2026 10:50:26 +0800 Subject: [PATCH] =?UTF-8?q?feat(heli):=20=E6=96=B0=E5=A2=9E=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=8D=AE=E7=94=9F=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/module/heli/dal/mysql/storagelog/StorageLogMapper.java | 3 +-- .../mes-ui-admin-vue3/src/views/heli/xzdstoragelog/index.vue | 2 +- 2 files changed, 2 insertions(+), 3 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 222d64d3..ab34e1c4 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,8 +67,7 @@ public interface StorageLogMapper extends BaseMapperX { .orderByDesc(StorageLogDO::getId); query - .ne(WarehouseDO::getWhName, "虚拟仓库") -// .notIn(StorageLogDO::getStockMode, 24, 14) + .and(w -> w.ne(WarehouseDO::getWhName, "虚拟仓库").or().isNull(WarehouseDO::getWhName)) .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-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 a359e337..dbe40667 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 @@ -206,7 +206,7 @@ /> - +