From a85bc05fb3a7dc9c67930a1b412cf5b1be172fd5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 19 十二月 2024 16:44:06 +0800
Subject: [PATCH] 修改报工新增为通过判断工序是否为复合工序报工

---
 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml |   65 ++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 17 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 675f6c9..6c8c158 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -58,7 +58,7 @@
         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
@@ -72,7 +72,7 @@
         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};
@@ -154,7 +154,6 @@
             </if>
 
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialInventoryPageTotal">
@@ -170,7 +169,6 @@
 
         </where>
 
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialInventoryEngineering">
@@ -205,7 +203,6 @@
 
         </where>
 
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialInventoryEngineeringPageTotal">
@@ -224,7 +221,6 @@
 
         </where>
 
-        limit #{offset},#{pageSize};
     </select>
 
 
@@ -428,7 +424,6 @@
                 and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialOutboundEngineering" >
@@ -459,7 +454,6 @@
                 and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectMaterialOutboundDetailPageTotal">
@@ -473,7 +467,6 @@
                 and modd.material_outbound_id regexp #{materialOutboundDetail.materialOutboundId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
 
@@ -511,7 +504,6 @@
                 and rwd.returning_id regexp #{returningWarehouseDetail.returningId}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getSelectReturningWarehouseDetailPageTotal">
@@ -549,16 +541,36 @@
         delete from mm.material_outbound_detail where material_outbound_id=#{materialOutboundId}
     </delete>
 
+    <delete id="deleteMaterialLog" >
+        delete from mm.material_log where operation_order_number=#{materialOutboundId}
+    </delete>
+
     <delete id="deleteReturningWarehouseDetail" >
         delete from mm.returning_warehouse_detail where returning_id=#{returningId}
     </delete>
 
+    <delete id="deleteReturningWarehouse" >
+        delete from mm.returning_warehouse where returning_id=#{returningId}
+    </delete>
+
     <select id="getMaximum" >
-        select count(*) from mm.material_outbound where  date(create_time)=CURDATE()
+        select
+            ifnull(SUBSTR(max(right(material_outbound_id,8)) from 7),0)
+        from
+            mm.material_outbound as a
+        where
+            date(a.create_time) = curdate()
+
     </select>
 
     <select id="getMaximums" >
-        select count(*) from mm.returning_warehouse where  date(create_time)=CURDATE()
+        select
+            ifnull(SUBSTR(max(right(returning_id,8)) from 7),0)
+        from
+            mm.returning_warehouse as a
+        where
+            date(a.create_time) = curdate()
+
     </select>
 
     <select id="getMaterialOutboundCount" >
@@ -747,13 +759,19 @@
     <update id="updateMaterialInventory" >
         update mm.material_inventory set inventory_quantity=inventory_quantity+#{materialInventory.inventoryQuantity},
                                          available_quantity=available_quantity+#{materialInventory.inventoryQuantity},
-                                         total_area=total_area+#{totalArea}
+                                         total_area=single_piece_area*inventory_quantity
                                      where  material_code=#{materialCode} and date_of_manufacture=#{materialInventory.dateOfManufacture}
     </update>
 
+    <update id="updateMaterialInventoryNull" >
+        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}
+    </update>
+
     <update id="updateMaterialInventoryReturning" >
-        update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity},
-                                         total_area=total_area+#{totalArea}
+        update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity}
        where  material_code=#{materialCode} and
                 date_of_manufacture=#{returningWarehouseDetail.dateOfManufacture}
 
@@ -761,8 +779,7 @@
     </update>
 
     <update id="updateMaterialInventoryReturningNull" >
-        update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity},
-                                         total_area=total_area+#{totalArea}
+        update mm.material_inventory set available_quantity=available_quantity+#{returningWarehouseDetail.returnQuantity}
         where  material_code=#{materialCode} and
             date_of_manufacture is null
 
@@ -1038,5 +1055,19 @@
 
     </select>
 
+    <select id="deleteMaterialInventory">
+        delete from
+        mm.material_inventory mi
+        <where>
+            <if test="ids != null and ids != ''">
+                and mi.id in
+                <foreach item="id" collection="ids" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+
+        </where>
+    </select>
+
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0