From d2e11d8ef4eccf41ae0fadc2bd57317308ca0b64 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 12 二月 2025 16:54:13 +0800
Subject: [PATCH] 修改物料库存不分页

---
 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml |   32 +++++++++-----------------------
 1 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
index 54c7a66..17c2508 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -58,11 +58,10 @@
         ms.json
         from mm.material_inventory mi left join mm.material_store ms on mi.material_code=ms.id
         <where>
-                date(mi.create_time)>=#{startDate} and date(mi.create_time) &lt;= #{endDate} and mi.available_quantity>0
+                 and mi.available_quantity>0
 
         </where>
         order by mi.id desc
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialInventoryDatePageTotal">
@@ -72,10 +71,9 @@
         from
         mm.material_inventory mi
         <where>
-                date(mi.create_time)>=#{startDate} and date(mi.create_time) &lt;= #{endDate} and mi.available_quantity>0
+                 and mi.available_quantity>0
 
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
 
@@ -84,7 +82,7 @@
         ou.id as useId,
         ou.project_no as projectNo,
         mi.inventory_quantity AS inventoryQuantity,
-        mi.plan_quantity AS availableQuantity,
+        mi.available_quantity AS availableQuantity,
         mi.plan_quantity AS planQuantity,
         mi.id,
         mi.inventory_organization as inventoryOrganization,
@@ -102,26 +100,22 @@
         ms.json from pp.optimize_use ou left join mm.material_inventory mi on ou.raw_stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
         left join pp.optimize_project op on op.project_no=ou.project_no
         <where>
-            mi.plan_quantity>0 and op.state>=100 and
-            date(ou.create_time)>=#{startDate} and date(ou.create_time) &lt;= #{endDate}
+            mi.plan_quantity>0 and op.state>=100 and ou.state=1
 
         </where>
         order by ou.id desc
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialInventoryEngineeringDatePageTotal">
         select
-        CEILING(count(id)/#{pageSize}) as 'pageTotal',
-        count(id) as 'total'
-        from
-        pp.optimize_use ou
+        CEILING(count(ou.id)/#{pageSize}) as 'pageTotal',
+        count(ou.id) as 'total'
+        from pp.optimize_use ou left join mm.material_inventory mi on ou.raw_stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
+        left join pp.optimize_project op on op.project_no=ou.project_no
         <where>
-            ou.not_use_count>0 and ou.state=1 and
-            date(ou.create_time)>=#{startDate} and date(ou.create_time) &lt;= #{endDate}
+            mi.plan_quantity>0 and op.state>=100 and ou.state=1
 
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
 
@@ -154,7 +148,6 @@
             </if>
 
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialInventoryPageTotal">
@@ -170,7 +163,6 @@
 
         </where>
 
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialInventoryEngineering">
@@ -205,7 +197,6 @@
 
         </where>
 
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialInventoryEngineeringPageTotal">
@@ -224,7 +215,6 @@
 
         </where>
 
-        limit #{offset},#{pageSize};
     </select>
 
 
@@ -428,7 +418,6 @@
                 and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialOutboundEngineering" >
@@ -459,7 +448,6 @@
                 and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialOutboundDetailPageTotal">
@@ -473,7 +461,6 @@
                 and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
 
@@ -511,7 +498,6 @@
                 and rwd.returning_id regexp #{returningWarehouseDetail.returningId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectReturningWarehouseDetailPageTotal">

--
Gitblit v1.8.0