From edbef358d313cd6d3a4f2910a0f06de3271fc899 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Sun, 4 Feb 2024 09:10:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=88=97=E8=A1=A8=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E8=99=9A=E6=8B=9F=E7=89=A9=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

物料列表去掉虚拟物料
---
 .../dal/mysql/material/MaterialMapper.java    |  3 +-
 .../src/views/heli/storagecheck/materials.vue | 31 ++++++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java
index 22df73e2..5f65903e 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java
@@ -33,6 +33,7 @@ public interface MaterialMapper extends BaseMapperX<MaterialDO> {
                 .like(!StringUtils.isEmpty(reqVO.getCode()), MaterialDO::getCode, reqVO.getCode())
                 .eq(!StringUtils.isEmpty(reqVO.getMaterialType()), MaterialDO::getMaterialType, reqVO.getMaterialType())
                 .eq(reqVO.getStatus() != null, MaterialDO::getStatus, reqVO.getStatus())
+                .eq(true,MaterialDO::getVirtualPart,"N")
                 .eq(!StringUtils.isEmpty(reqVO.getVirtualPart()), MaterialDO::getVirtualPart, reqVO.getVirtualPart());
 
         return selectPage(reqVO, query);
@@ -40,7 +41,7 @@ public interface MaterialMapper extends BaseMapperX<MaterialDO> {
 
     default List<Map<String, Object>> selectSimpleList() {
 
-        return selectMaps(new QueryWrapper<MaterialDO>().select("id", "name","short_name","code","material_type","spec","unit","brand").lambda());
+        return selectMaps(new QueryWrapper<MaterialDO>().select("id", "name","short_name","code","material_type","spec","unit","brand").eq("virtual_part","N").lambda());
 
     }
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue
index a369365e..2db48a09 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue
@@ -1,7 +1,17 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form  :model="list" v-loading="formLoading" label-width="0" >
-      <el-table ref="matSubFormRef" :data="list" class="hl-table"  @selection-change="handleSelectionChange" :row-key="getRowKeys" min-width="1800">
+    <ContentWrap>
+      物料类型：<el-select v-model="queryReqVo.matType" placeholder="物料类型" clearable class="!w-240px">
+            <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_MATERIAL_TYPE)" :key="dict.label"
+              :label="dict.label" :value="dict.label" />
+          </el-select>
+          物料名称/编码：<el-input v-model="queryReqVo.matCode" placeholder="物料名称/编码"  class="!w-240px" />
+          <el-button @click="handleQuery">
+            <Icon icon="ep:search" class="mr-5px" /> 搜索
+          </el-button><el-button @click="resetQuery">
+            <Icon icon="ep:refresh" class="mr-5px" /> 重置
+          </el-button>
+      <el-table ref="matSubFormRef" :data="list" v-loading="formLoading" class="hl-table"  @selection-change="handleSelectionChange" :row-key="getRowKeys" min-width="1800">
         <el-table-column type="selection" width="55" :reserve-selection="true" :selectable="row=>chkboxEnable"  />
         <el-table-column prop="no" label="序号" min-width="120" align="center" />
         <el-table-column prop="matCode" label="物料编码" min-width="120" align="center" />
@@ -15,8 +25,9 @@
         <el-table-column prop="storageOkQty" label="库存数量" min-width="120" align="center" />
         <el-table-column prop="matUnit" label="库存单位" min-width="120" align="center" />
       </el-table>
-    </el-form>
-    <template #footer>
+   
+  </ContentWrap>
+  <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
@@ -55,7 +66,17 @@ const queryReqVo = reactive({
   matCode: undefined,
   matType: undefined
 })
-
+/** 搜索按钮操作 */
+const handleQuery = async () => {
+  const data = await StorageLogApi.getStorageNowList(queryReqVo)
+  list.value = data
+}
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryReqVo.matCode = ''
+  queryReqVo.matType = ''
+  handleQuery()
+}
 /** 打开弹窗 */
 const open = async (noZero: number, whId?: number, isAll?: number) => {
   dialogVisible.value = true