From f41e272c8e5378df6fd7a8d1d41ec8116983ebe2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 05 七月 2024 10:16:52 +0800
Subject: [PATCH] 提交

---
 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml |   70 +++++++++++++++++++++++++++++++---
 1 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
index 0b4cb11..4e31f15 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -3,26 +3,53 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.erp.mapper.sd.OrderMapper">
+
+    <select id="selectOrder">
+        select
+            *
+        from
+            sd.`order` as o
+        where
+            o.quantity=#{order.quantity} and o.area=#{order.area} and o.project=#{order.project} and o.customer_id=#{order.customerId} and o.money=#{order.money}
+    </select>
+
     <select id="selectMaxOrderId">
         select
-            COUNT(a.order_id)
+           ifnull(SUBSTR(max(order_id) from 9),0)
         from
             `order` as a
         where
             date(a.create_time) = curdate()
+        order by id desc,order_id	desc limit  1
     </select>
     
 
     <update id="updateOrderParameter">
         update `order` o
         left join
-            (select a.order_id,sum(a.perimeter) as aa,sum(a.quantity) as b,sum(a.compute_gross_area)  as c
-             from sd.order_detail as a group by a.order_id)  od
+            (select a.order_id,
+                    round(sum(a.perimeter),2) as aa,
+                    sum(a.quantity) as b,
+                    sum(a.compute_gross_area)  as c,
+                   sum(a.gross_amount) as 'detailAmount'
+             from sd.order_detail as a group by a.order_id
+            ) as od
             on o.order_id = od.order_id
+        left join (select oom.order_id,
+                          sum(oom.money) as 'money'
+                   from order_other_money as oom
+                   where
+                       oom.order_id = #{orderId}
+                   group by oom.order_id
+                   ) as c
+        on c.order_id = o.order_id
         set
+            o.money = ifnull(od.detailAmount,0)+ifnull(c.money,0),
             o.quantity = od.b,
             o.area = od.c,
-            o.perimeter= od.aa
+            o.perimeter= od.aa,
+            o.other_money = ifnull(c.money,0),
+            o.other_remarks = (select group_concat( distinct edging_type) from order_detail where order_id = #{orderId} and  edging_type is not null)
         where
             o.order_id = #{orderId}
 
@@ -30,9 +57,12 @@
     
     <select id="getOrderList">
         select
-            *
+            *,
+        ifnull(sum(fgi.quantity_available),0) as goodsQuantity
         from
             `order` as o
+        left join mm.finished_goods_inventory as  fgi
+        on o.order_id = fgi.order_id
         where  date(o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
 
           <if test="orderType!= null and orderType != ''">
@@ -90,7 +120,7 @@
            <if test="order.deliveryAddress != null and order.deliveryAddress != ''">
                and o.delivery_address REGEXP #{order.deliveryAddress}
            </if>
-
+        group by o.id
         order by o.id desc
         limit #{offset},#{pageSize}
     </select>
@@ -162,11 +192,37 @@
     </select>
     
     <update id="reviewOrderById">
-        update `order` set order_review = #{status} where order_id = #{id}
+        update `order` set order_review = #{status},
+                           verifier_id = #{userId},
+                           verifier = #{userName},
+                           update_time=now()
+                           where order_id = #{id}
+    </update>
+    <update id="reviewOrderByIds">
+        update `order` set order_review = #{status},process_review = #{status},
+                           verifier_id = null,
+                           verifier = null
+        where order_id = #{id}
     </update>
 
     <update id="reviewProcessById">
         update `order` set process_review = #{status} where order_id = #{id}
     </update>
 
+    <update id="updateMoney">
+        update `order` set money = #{order.money} where order_id = #{order.orderId}
+    </update>
+
+    <update id="cancelOrder">
+        update `order` as a set
+            a.create_order = - a.create_order,
+            a.process_review = - a.process_review,
+            a.order_review = - a.order_review,
+            a.production_order = - a.production_order,
+            a.processing_card =  - a.processing_card,
+            a.warehousing = - a.warehousing,
+            a.delivery = - a.delivery
+        where order_id = #{order.orderId}
+    </update>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0