From e55a701f5d4807a84eecc6aff5f69e35e9ee6af4 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 11 七月 2024 17:02:49 +0800
Subject: [PATCH] 提交

---
 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml |   40 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 37 insertions(+), 3 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 b02c622..3adafe9 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -3,6 +3,16 @@
         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
            ifnull(SUBSTR(max(order_id) from 9),0)
@@ -11,6 +21,16 @@
         where
             date(a.create_time) = curdate()
         order by id desc,order_id	desc limit  1
+    </select>
+
+    <select id="selectMaxOrderIdByMonth">
+        select
+            ifnull(SUBSTR(order_id from 7),0)
+        from
+            `order` as a
+        where
+            date(a.create_time)  BETWEEN DATE_FORMAT(DATE(NOW()), '%Y-%m-01') AND DATE(NOW())
+        order by id desc	 limit  1
     </select>
     
 
@@ -38,7 +58,8 @@
             o.quantity = od.b,
             o.area = od.c,
             o.perimeter= od.aa,
-            o.other_money = ifnull(c.money,0)
+            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}
 
@@ -177,14 +198,20 @@
                 and o.delivery_address REGEXP #{order.deliveryAddress}
             </if>
         order by o.id desc
-        limit #{offset},#{pageSize}
     </select>
     
     <update id="reviewOrderById">
         update `order` set order_review = #{status},
                            verifier_id = #{userId},
-                           verifier = #{userName}
+                           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">
@@ -207,4 +234,11 @@
         where order_id = #{order.orderId}
     </update>
 
+    <update id="updateOrderPrintNumber">
+        update sd.`order` o
+            set o.printing_number=o.printing_number+1
+        where
+            o.order_id = #{orderId}
+
+    </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0