From a3dfc8966bb702c4ccb20f2a2afda7b7c39bd98d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 06 十一月 2024 15:17:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 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 b73c226..c760ba5 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -54,7 +54,7 @@
         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} and o.delivery = 0
+            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
             <if test="finishedOperateLog.operationOrderNumber != null and finishedOperateLog.operationOrderNumber != ''">
                 and fol.operation_order_number regexp #{finishedOperateLog.operationOrderNumber}
             </if>
@@ -431,7 +431,7 @@
         from mm.finished_operate_log aa where  aa.status!='宸蹭綔搴�') fol
         left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
         <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 fol.operate_type=#{type}
             <if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
                 and fol.operate_type regexp #{finishedOperateLog.operateType}
             </if>
@@ -492,7 +492,7 @@
         from mm.finished_operate_log aa where  aa.status!='宸蹭綔搴�') fol
         left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
         <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 fol.operate_type=#{type}
             <if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
                 and fol.operate_type regexp #{finishedOperateLog.operateType}
             </if>
@@ -554,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" >
@@ -566,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>
 
@@ -668,7 +669,7 @@
         from (select *
               from mm.finished_operate_log aa where  aa.status!='宸蹭綔搴�') fol
                  left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
-        where  date(fol.operate_time)>=#{dates[0]} and date(fol.operate_time) &lt;= #{dates[1]}
+        where  date(fol.operate_time)>=#{dates[0]} and date(fol.operate_time) &lt;= #{dates[1]} and fol.operate_type=#{type}
 
     </select>
 
@@ -688,6 +689,10 @@
                )
     </insert>
 
+    <delete id="updateOrderFinishedOperateLog"  >
+        update  mm.finished_operate_log set status="宸蹭綔搴�" where order_id=#{orderDetail.orderId} and operation_number=#{orderDetail.orderNumber} and operate_type="鍏ュ簱";
+    </delete>
+
 
 
 

--
Gitblit v1.8.0