From c25ef736f5b3701cc91ac88e9d278b45d9b4035c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 13 二月 2025 14:55:31 +0800
Subject: [PATCH] 补充

---
 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml |   48 ++++++++++++++++--------------------------------
 1 files changed, 16 insertions(+), 32 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..7e2ab2e 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -62,7 +62,6 @@
 
         </where>
         order by mi.id desc
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialInventoryDatePageTotal">
@@ -75,7 +74,6 @@
                  and mi.available_quantity>0
 
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
 
@@ -84,8 +82,8 @@
         ou.id as useId,
         ou.project_no as projectNo,
         mi.inventory_quantity AS inventoryQuantity,
-        mi.plan_quantity AS availableQuantity,
-        mi.plan_quantity AS planQuantity,
+        mi.available_quantity AS availableQuantity,
+        ou.not_use_count AS planQuantity,
         mi.id,
         mi.inventory_organization as inventoryOrganization,
         mi.material_code AS materialCode,
@@ -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}
+            ou.not_use_count>0 and 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">
@@ -178,8 +170,8 @@
         ou.id as useId,
         ou.project_no as projectNo,
         mi.inventory_quantity AS inventoryQuantity,
-        mi.plan_quantity AS availableQuantity,
-        mi.plan_quantity AS planQuantity,
+        ou.not_use_count AS availableQuantity,
+        ou.not_use_count AS planQuantity,
         mi.id,
         mi.inventory_organization as inventoryOrganization,
         mi.material_code AS materialCode,
@@ -205,7 +197,6 @@
 
         </where>
 
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialInventoryEngineeringPageTotal">
@@ -224,7 +215,6 @@
 
         </where>
 
-        limit #{offset},#{pageSize};
     </select>
 
 
@@ -257,7 +247,7 @@
                 and mo.reviewed regexp #{materialOutbound.reviewed}
             </if>
         </where>
-        order by mo.reviewed_state desc,mo.create_time desc
+        order by mo.create_time desc
         limit #{offset},#{pageSize};
     </select>
 
@@ -291,7 +281,6 @@
                 and mo.reviewed regexp #{materialOutbound.reviewed}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
 
@@ -373,7 +362,6 @@
                 and rw.batch regexp #{returningWarehouse.batch}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialOutbound">
@@ -428,11 +416,11 @@
                 and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialOutboundEngineering" >
         select
+        ou.id as useId,
         ou.project_no as  projectNo,
         modd.inventory_id as id,
         modd.inventory_organization as inventoryOrganization,
@@ -459,7 +447,6 @@
                 and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialOutboundDetailPageTotal">
@@ -473,7 +460,6 @@
                 and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
 
@@ -511,7 +497,6 @@
                 and rwd.returning_id regexp #{returningWarehouseDetail.returningId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectReturningWarehouseDetailPageTotal">
@@ -525,7 +510,6 @@
                 and rwd.returning_id regexp #{returningWarehouseDetail.returningId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
 
@@ -696,14 +680,14 @@
     </insert>
 
     <update id="updateMaterialInventoryAvailableOptOut">
-        update mm.material_inventory
-        set available_quantity=available_quantity-#{quantity}
+        update pp.optimize_use
+        set not_use_count=not_use_count-#{quantity}
         where id=#{useId}
     </update>
 
     <update id="updateMaterialInventoryAvailableOptInt">
-        update mm.material_inventory
-        set available_quantity=available_quantity+#{quantity}
+        update pp.optimize_use
+        set not_use_count=not_use_count+#{quantity}
         where id=#{useId}
     </update>
 

--
Gitblit v1.8.0