Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/inventory/InboundOrdersController.java

@@ -154,19 +154,17 @@ public class InboundOrdersController extends BaseController
      * @return 结果
      */
     @GetMapping("/countQuantity")
-    public TableDataInfo countQuantity(){
-        startPage();
+    public AjaxResult countQuantity(){
         List<InboundMaterialTotalVO> list = inboundOrdersService.countInboundMaterialQuantity();
-        return getDataTable(list);
+        return AjaxResult.success(list);
     }
     /**
      * 按金额统计本月入库物料Top前10
      * @return 结果
      */
     @GetMapping("/countMoney")
-    public TableDataInfo countMoney(){
-        startPage();
+    public AjaxResult countMoney(){
         List<InboundMaterialTotalVO> list = inboundOrdersService.countInboundMaterialMoney();
-        return getDataTable(list);
+        return AjaxResult.success(list);
     }
 }

ruoyi-inventory/src/main/java/com/ruoyi/inventory/controller/InventoryController.java

@@ -174,11 +174,10 @@ public class InventoryController extends BaseController
      * 统计库存物料超出预警值
      */
     @GetMapping("/exceed")
-    public TableDataInfo exceedWarnValue()
+    public AjaxResult exceedWarnValue()
     {
-        startPage();
         List<InventoryExceedWarnVO> list = inventoryService.selectInventoryExceedWarnList();
-        return getDataTable(list);
+        return AjaxResult.success(list);
     }
 
 

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

@@ -251,7 +251,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where io.order_status = 2
         group by m.id
         order by total_quantity desc
-        limit 10
     </select>
     <select id="countInboundMaterialMoney" resultMap="InboundMaterialTotalResultMap" parameterType="String">
         select m.material_name,sum(ioi.actual_quantity * ioi.unit_price) as total_money
@@ -261,6 +260,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where io.order_status = 2
         group by m.id
         order by total_money desc
-        limit 10
     </select>
 </mapper>
\ No newline at end of file