From 97147c3155ef75e344cfbfc9752d08228cbabc64 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 25 三月 2025 08:26:38 +0800
Subject: [PATCH] 提交后端报工转移程序

---
 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml |   44 ++++++++++++++++++++++++++++++++------------
 1 files changed, 32 insertions(+), 12 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 5fc2cbc..1cfa8bc 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -172,6 +172,7 @@
         mi.inventory_quantity AS inventoryQuantity,
         ou.not_use_count AS availableQuantity,
         ou.not_use_count AS planQuantity,
+        ou.not_use_count AS outboundQuantity,
         mi.id,
         mi.inventory_organization as inventoryOrganization,
         mi.material_code AS materialCode,
@@ -703,15 +704,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>
 
@@ -957,13 +970,13 @@
             </if>
 
             <if test="materialLog.inventoryId != null and materialLog.inventoryId != ''">
-                and  ml.inventoryId regexp  #{materialLog.inventoryId}
+                and  ml.inventory_id regexp  #{materialLog.inventoryId}
             </if>
             <if test="materialLog.materialCode != null and materialLog.materialCode != ''">
-                and  ml.materialCode regexp  #{materialLog.materialCode}
+                and  ml.material_code regexp  #{materialLog.materialCode}
             </if>
             <if test="materialLog.materialName != null and materialLog.materialName != ''">
-                and  ml.materialName regexp  #{materialLog.materialName}
+                and  ml.material_name regexp  #{materialLog.materialName}
             </if>
             <if test="materialLog.producer != null and materialLog.producer != ''">
                 and  ml.producer regexp  #{materialLog.producer}
@@ -982,6 +995,9 @@
             </if>
             <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
@@ -1018,13 +1034,13 @@
             </if>
 
             <if test="materialLog.inventoryId != null and materialLog.inventoryId != ''">
-                and  ml.inventoryId regexp  #{materialLog.inventoryId}
+                and  ml.inventory_id regexp  #{materialLog.inventoryId}
             </if>
             <if test="materialLog.materialCode != null and materialLog.materialCode != ''">
-                and  ml.materialCode regexp  #{materialLog.materialCode}
+                and  ml.material_code regexp  #{materialLog.materialCode}
             </if>
             <if test="materialLog.materialName != null and materialLog.materialName != ''">
-                and  ml.materialName regexp  #{materialLog.materialName}
+                and  ml.material_name regexp  #{materialLog.materialName}
             </if>
             <if test="materialLog.producer != null and materialLog.producer != ''">
                 and  ml.producer regexp  #{materialLog.producer}
@@ -1086,13 +1102,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,
@@ -1111,5 +1127,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