From 0bc7e73b3fc23c115b7f2010a0018c42bd403b1a Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 09 七月 2025 11:19:20 +0800
Subject: [PATCH] 流程卡打印按落架顺序倒序查询

---
 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml |   39 ++++++++++++++++++++++++++++++++++++---
 1 files changed, 36 insertions(+), 3 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 0a1965e..099785e 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -247,6 +247,12 @@
             <if test="materialOutbound.reviewed != null and materialOutbound.reviewed != ''">
                 and mo.reviewed regexp #{materialOutbound.reviewed}
             </if>
+            <if test="materialOutbound.project != null and materialOutbound.project != ''">
+                and mo.project regexp #{materialOutbound.project}
+            </if>
+            <if test="materialOutbound.batch != null and materialOutbound.batch != ''">
+                and mo.batch regexp #{materialOutbound.batch}
+            </if>
         </where>
         order by mo.create_time desc
         limit #{offset},#{pageSize};
@@ -280,6 +286,12 @@
             </if>
             <if test="materialOutbound.reviewed != null and materialOutbound.reviewed != ''">
                 and mo.reviewed regexp #{materialOutbound.reviewed}
+            </if>
+            <if test="materialOutbound.project != null and materialOutbound.project != ''">
+                and mo.project regexp #{materialOutbound.project}
+            </if>
+            <if test="materialOutbound.batch != null and materialOutbound.batch != ''">
+                and mo.batch regexp #{materialOutbound.batch}
             </if>
         </where>
     </select>
@@ -612,11 +624,11 @@
 
     <insert id="insertMaterialOutbound"  useGeneratedKeys="true" >
         insert into mm.material_outbound(material_outbound_id,material_requisition_personnel,material_requisition_team,order_id,outbound_type,
-                                         warehouse_manager,material_requisition_date,reviewed_state,create_time)
+                                         warehouse_manager,material_requisition_date,reviewed_state,create_time,project,batch)
         values (
                   #{number} ,#{materialOutbound.materialRequisitionPersonnel},#{materialOutbound.materialRequisitionTeam},
                 #{materialOutbound.orderId},#{materialOutbound.outboundType},#{materialOutbound.warehouseManager},#{materialOutbound.materialRequisitionDate},
-                   0,now()
+                   0,now(),#{materialOutbound.project},#{materialOutbound.batch}
                )
     </insert>
 
@@ -627,7 +639,9 @@
             order_id=#{materialOutbound.orderId},
             outbound_type=#{materialOutbound.outboundType},
             warehouse_manager=#{materialOutbound.warehouseManager},
-            material_requisition_date=#{materialOutbound.materialRequisitionDate}
+            material_requisition_date=#{materialOutbound.materialRequisitionDate},
+            project=#{materialOutbound.project},
+            batch=#{materialOutbound.batch}
         where material_outbound_id = #{number}
     </insert>
 
@@ -1231,4 +1245,23 @@
           AND date( ml.operate_time )>= #{startDate} and date(ml.operate_time) &lt;= #{endDate}
           and ml.operate_type=#{type}
     </select>
+
+
+    <select id="getSelectMaterialInventoryMes">
+        select
+            mi.id,
+            mi.material_code AS materialCode,
+            mi.producer,
+            sum(mi.available_quantity) AS availableQuantity,
+            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.width')) AS width,
+            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.height')) AS height,
+            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.thickness')) AS thickness,
+            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.name')) AS name,
+            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.model')) AS model,
+            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.unit')) AS unit
+        from mm.material_inventory mi left join mm.material_store ms on mi.material_code=ms.id
+        where mi.available_quantity>0
+        group by mi.material_code
+        order by mi.id desc
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0