From ed3ce5c8f6e1f7ac1aad3218ab5e518fc95cdb0f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 10 九月 2024 10:26:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml |   14 +++++---------
 1 files changed, 5 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 81466cb..01d1242 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -52,6 +52,7 @@
         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}
             <if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
@@ -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" >
@@ -559,7 +554,7 @@
 
 
     <select id="getmaximum" >
-        select count(*) from mm.finished_operate_log where operate_type =#{type} and date(operate_time)=CURDATE()
+        select count(*) from (select * from mm.finished_operate_log where operate_type =#{type} and date(operate_time)=CURDATE() group by operation_order_number) zu
     </select>
 
     <insert id="insertIntFinishedOperateLog"  useGeneratedKeys="true" >
@@ -571,10 +566,11 @@
                                             operator,
                                             quantity,
                                             operate_time,
-                                            status
+                                            status,
+                                            remarks
         )
         values (
-                   #{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"鍏ュ簱",#{userName},#{flowCard.inventoryQuantity},now(),"鏈鏍�"
+                   #{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"鍏ュ簱",#{userName},#{flowCard.inventoryQuantity},now(),"鏈鏍�",#{container}
                )
     </insert>
 

--
Gitblit v1.8.0