From 950424e50bcd42cff0913fef387c537ba7dedfcc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 13 二月 2025 13:59:57 +0800
Subject: [PATCH] 修改流程卡分架界面落架顺序不正确问题，调整流程卡打印半径显示逻辑

---
 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml |   25 +++++++------------------
 1 files changed, 7 insertions(+), 18 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 0e3466d..81a02cf 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -84,7 +84,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,8 +102,7 @@
         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
@@ -112,16 +111,14 @@
 
     <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 +151,6 @@
             </if>
 
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialInventoryPageTotal">
@@ -170,7 +166,6 @@
 
         </where>
 
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialInventoryEngineering">
@@ -205,7 +200,6 @@
 
         </where>
 
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialInventoryEngineeringPageTotal">
@@ -224,7 +218,6 @@
 
         </where>
 
-        limit #{offset},#{pageSize};
     </select>
 
 
@@ -428,7 +421,6 @@
                 and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialOutboundEngineering" >
@@ -459,7 +451,6 @@
                 and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialOutboundDetailPageTotal">
@@ -473,7 +464,6 @@
                 and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
 
@@ -511,7 +501,6 @@
                 and rwd.returning_id regexp #{returningWarehouseDetail.returningId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectReturningWarehouseDetailPageTotal">

--
Gitblit v1.8.0