首页显示数量调整，库存查询调整

ruoyi-admin-vue/src/views/index.vue

@@ -28,7 +28,7 @@
           <el-table v-loading="loading" height="100%" :data="tableList">
             <el-table-column type="index" label="序号" align="center" width="100" fixed="left"/>
             <el-table-column label="物料名称" align="center" prop="materialName" :show-overflow-tooltip="true" width="200"/>
-            <el-table-column label="所属分类" align="center" prop="categoryName" :show-overflow-tooltip="true"  min-width="200" />
+            <!-- <el-table-column label="所属分类" align="center" prop="categoryName" :show-overflow-tooltip="true"  min-width="200" /> -->
             <el-table-column label="物料编码" align="center" prop="sapNo" :show-overflow-tooltip="true"  min-width="200" />
             <el-table-column label="当前库存" align="center" prop="quantity" :show-overflow-tooltip="true"  min-width="200" >
               <template slot-scope="scope">
@@ -47,7 +47,7 @@
 
       <div class="card-container-flex chart-container shadow">
         <div class="tip-title">
-          <div class="title-text">当前库存排名前10物料</div>
+          <div class="title-text">当前库存排名前5物料</div>
           <el-radio-group class="custom" v-model="kucunQueryType" size="mini" @change="kucunQueryTypeChange">
             <el-radio-button label="count">按数量</el-radio-button>
             <el-radio-button label="money">按金额</el-radio-button>
@@ -186,7 +186,7 @@ export default {
           this.rukuList = data.map(item =>({
             value:item.totalQuantity,
             name:item.materialName
-          })).splice(0,5).reverse()
+          })).reverse().splice(0,5).reverse()
         })
       }
       if(this.rukuRankType === 'money'){
@@ -196,7 +196,7 @@ export default {
           this.rukuList = data.map(item =>({
             value:item.totalMoney,
             name:item.materialName
-          })).splice(0,5).reverse()
+          })).reverse().splice(0,5).reverse()
         })
       }
     },
@@ -206,7 +206,7 @@ export default {
           let data = res.rows
           if(!data) return
           console.log('123123',data)
-          this.kucunList = data
+          this.kucunList = data.splice(0,5)
 
         })
       }
@@ -214,7 +214,7 @@ export default {
         inventoryTopTenByAmount().then(res=>{
           let data = res.rows
           if(!data) return
-          this.kucunList = data
+          this.kucunList = data.splice(0,5)
         })
       }
     },

ruoyi-inventory/src/main/resources/mapper/inventory/InventoryMapper.xml

@@ -218,7 +218,7 @@
         select tab.*, case when total_quantity < min_stock_level then '2' when total_quantity > max_stock_level then '1' else '3' end alterType from (
         <include refid="selectInventoryCount"/>
         <where>
-            and i.quantity > 0 and i.inventory_status = 1 and i.is_used = 1
+            and i.quantity != 0 and i.inventory_status = 1 and i.is_used = 1
             <if test="inventoryType != null "> and i.inventory_type = #{inventoryType}</if>
             <if test="materialId != null  and materialId != ''"> and m.material_code like concat('%', #{materialId}, '%')</if>
             <if test="batchId != null  and batchId != ''"> and i.batch_id like concat('%', #{batchId}, '%')</if>
@@ -326,7 +326,7 @@
     <select id="selectInventoryDetailList" parameterType="Inventory" resultMap="InventoryResult">
         <include refid="selectInventoryDetailVo"/>
         <where>
-            and i.quantity > 0 and i.inventory_status = 1 and i.is_used = 1
+            and i.quantity != 0 and i.inventory_status = 1 and i.is_used = 1
             <if test="inventoryType != null "> and i.inventory_type = #{inventoryType}</if>
             <if test="materialId != null  and materialId != ''"> and i.material_id = #{materialId}</if>
             <if test="batchId != null  and batchId != ''"> and i.batch_id like concat('%', #{batchId}, '%')</if>