From 3c55debea2b60faf89acdf89074ffd135dc44d7e Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 08 四月 2025 17:37:19 +0800
Subject: [PATCH] 提交筛选日期调整

---
 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml |   55 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 9 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 6a98ee0..fc889c2 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -538,6 +538,10 @@
         delete from mm.material_log where operation_order_number=#{materialOutboundId}
     </delete>
 
+    <delete id="deleteMaterialLogById" >
+        delete from mm.material_log where id=#{id}
+    </delete>
+
     <delete id="deleteReturningWarehouseDetail" >
         delete from mm.returning_warehouse_detail where returning_id=#{returningId}
     </delete>
@@ -583,11 +587,11 @@
     </select>
 
     <select id="getMaterialInventoryCount" >
-        select count(*) from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
+        select * from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
     </select>
 
     <select id="getMaterialInventoryCountNull" >
-        select count(*) from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture is null
+        select * from mm.material_inventory where  material_code=#{materialCode} and date_of_manufacture is null
     </select>
 
     <select id="getMaterialInventoryCountId" >
@@ -704,15 +708,27 @@
         where id=#{inventoryId}
     </update>
 
-    <update id="updateMaterialInventoryInventoryOut">
+    <update id="updateMaterialInventoryInventoryPlanQuantityOut">
         update mm.material_inventory
         set inventory_quantity=inventory_quantity-#{quantity},plan_quantity=if(plan_quantity-#{quantity}>=0,plan_quantity-#{quantity},0),total_area=inventory_quantity*single_piece_area
         where id=#{inventoryId}
     </update>
 
-    <update id="updateMaterialInventoryInventoryInt">
+    <update id="updateMaterialInventoryInventoryPlanQuantityInt">
         update mm.material_inventory
         set inventory_quantity=inventory_quantity+#{quantity},plan_quantity=plan_quantity+#{quantity},total_area=inventory_quantity*single_piece_area
+        where id=#{inventoryId}
+    </update>
+
+    <update id="updateMaterialInventoryInventoryOut">
+        update mm.material_inventory
+        set inventory_quantity=inventory_quantity-#{quantity},total_area=inventory_quantity*single_piece_area
+        where id=#{inventoryId}
+    </update>
+
+    <update id="updateMaterialInventoryInventoryInt">
+        update mm.material_inventory
+        set inventory_quantity=inventory_quantity+#{quantity},total_area=inventory_quantity*single_piece_area
         where id=#{inventoryId}
     </update>
 
@@ -767,7 +783,21 @@
         update mm.material_inventory set inventory_quantity=inventory_quantity+#{materialInventory.inventoryQuantity},
                                          available_quantity=available_quantity+#{materialInventory.inventoryQuantity},
                                          total_area=single_piece_area*inventory_quantity
-        where  material_code=#{materialCode}
+        where  material_code=#{materialCode} and date_of_manufacture is null
+    </update>
+
+    <update id="updateMaterialInventoryOut" >
+        update mm.material_inventory set inventory_quantity=inventory_quantity-#{quantity},
+                                         available_quantity=available_quantity-#{quantity},
+                                         total_area=single_piece_area*inventory_quantity
+        where  material_code=#{materialCode} and date_of_manufacture=#{dateOfManufacture}
+    </update>
+
+    <update id="updateMaterialInventoryNullOut" >
+        update mm.material_inventory set inventory_quantity=inventory_quantity-#{quantity},
+                                         available_quantity=available_quantity-#{quantity},
+                                         total_area=single_piece_area*inventory_quantity
+        where  material_code=#{materialCode} and date_of_manufacture is null
     </update>
 
     <update id="updateMaterialInventoryReturning" >
@@ -984,6 +1014,9 @@
             <if test="materialLog.remarks != null and materialLog.remarks != ''">
                 and ml.remarks regexp #{materialLog.remarksr}
             </if>
+            <if test="materialLog.projectNo != null and materialLog.projectNo != ''">
+                and ml.project_no regexp #{materialLog.projectNo}
+            </if>
         </where>
         order by ml.id desc
         limit #{offset},#{pageSize};
@@ -1087,13 +1120,13 @@
         </where>
     </select>
 
-    <select id="updateMaterialOutboundOptimizeUses">
+    <update id="updateMaterialOutboundOptimizeUses">
         update mm.material_outbound_detail set outbound_quantity=outbound_quantity+#{quantity} where use_id=#{useId};
-    </select>
+    </update>
 
-    <select id="updateOptimizeUsesMes">
+    <update id="updateOptimizeUsesMes">
         update pp.optimize_use set not_use_count=not_use_count-#{quantity} where id=#{useId};
-    </select>
+    </update>
 
     <insert id="insertMaterialOutboundDetailOptimizeUses"  useGeneratedKeys="true" >
         insert into mm.material_outbound_detail (material_outbound_id,material_outbound_number,material_code,use_id,inventory_id,inventory_organization,
@@ -1112,5 +1145,9 @@
                )
     </insert>
 
+    <select id="selectProjectNo">
+        select project_no from pp.optimize_use where id=#{useId};
+    </select>
+
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0