From 152ed52be6432e0abc449f5349daf1ea8e41efe6 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 29 七月 2024 15:01:26 +0800
Subject: [PATCH] 修改订单主页面的加工要求筛选

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
index 038e89b..b73c226 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -52,8 +52,9 @@
         from (select *
         from mm.finished_operate_log aa where aa.operate_type = #{type}  and aa.status!='宸蹭綔搴�') fol
         left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
+        left join sd.`order` o on o.order_id=fol.order_id
         <where>
-            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
+            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate} and o.delivery = 0
             <if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
                 and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
             </if>
@@ -100,7 +101,7 @@
                 and fol.remarks regexp #{finishedOperateLog.remarksr}
             </if>
         </where>
-        order by fol.`status` desc
+        order by fol.operate_time desc
         limit #{offset},#{pageSize};
     </select>
 
@@ -159,7 +160,6 @@
             </if>
         </where>
         order by fol.`status` desc
-        limit #{offset},#{pageSize};
     </select>
 
     <update id="updateToExamine">
@@ -297,8 +297,6 @@
                 and fol.remarks regexp #{finishedOperateLog.remarksr}
             </if>
         </where>
-        order by fol.`status` desc
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getselectAllocateFinishedOperateLog" resultMap="selectFinishedGoodsInventory" >
@@ -404,7 +402,6 @@
                 and fol.operate_time regexp #{finishedOperateLog.operateTime}
             </if>
         </where>
-        limit #{offset},#{pageSize};
     </select>
 
 
@@ -545,8 +542,6 @@
                 and fol.remarks regexp #{finishedOperateLog.remarksr}
             </if>
         </where>
-        order by fol.`status` desc
-        limit #{offset},#{pageSize};
     </select>
 
     <select id="getselectFinishedOperateLog" >
@@ -648,7 +643,7 @@
                )
     </insert>
 
-    <select id="exportFinishedOperateLogReport" resultMap="selectFinishedGoodsInventory">
+    <select id="exportFinishedOperateLogReport">
         select fol.id,
                fol.operation_order_number,
                fol.order_id,
@@ -677,5 +672,23 @@
 
     </select>
 
+    <insert id="insertOrderFinishedOperateLog"  useGeneratedKeys="true" >
+        insert into mm.finished_operate_log(operation_order_number,
+                                            order_id,
+                                            process_id,
+                                            operation_number,
+                                            operate_type,
+                                            operator,
+                                            quantity,
+                                            operate_time,
+                                            status
+        )
+        values (
+                   #{oddNumber} ,#{orderDetail.orderId},"",#{orderDetail.orderNumber},"鍏ュ簱",#{userName},#{orderDetail.quantity},now(),"鏈鏍�"
+               )
+    </insert>
+
+
+
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0