From ac1f5097b08b9db6531e8dfeff12c5caf251d98e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 01 八月 2024 15:49:23 +0800
Subject: [PATCH] 订单首页显示备注信息

---
 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml |   69 +++++++++++++++++++++++++++++++---
 1 files changed, 63 insertions(+), 6 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 b1bfec0..8715439 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -6,11 +6,11 @@
 
     <select id="selectOrder">
         select
-            count(*)
+            *
         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}
+            o.quantity=#{order.quantity} and o.area=#{order.area} and o.project=#{order.project} and o.customer_id=#{order.customerId}
     </select>
 
     <select id="selectMaxOrderId">
@@ -21,6 +21,15 @@
         where
             date(a.create_time) = curdate()
         order by id desc,order_id	desc limit  1
+    </select>
+
+    <select id="selectMaxOrderIdByMonth">
+        select
+            ifnull(SUBSTR(max(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())
     </select>
     
 
@@ -60,7 +69,7 @@
             *,
         ifnull(sum(fgi.quantity_available),0) as goodsQuantity
         from
-            `order` as o
+            sd.`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}
@@ -120,6 +129,27 @@
            <if test="order.deliveryAddress != null and order.deliveryAddress != ''">
                and o.delivery_address REGEXP #{order.deliveryAddress}
            </if>
+        <if test="order.delivery != null ">
+            and o.delivery = #{order.delivery}
+        </if>
+        <if test="order.processReview != null ">
+            and o.process_review = #{order.processReview}
+        </if>
+        <if test="order.orderReview != null ">
+            and o.order_review = #{order.orderReview}
+        </if>
+        <if test="order.productionOrder != null ">
+            and o.production_order = #{order.productionOrder}
+        </if>
+        <if test="order.processingCard != null ">
+            and o.processing_card = #{order.processingCard}
+        </if>
+        <if test="order.warehousing != null ">
+            and o.warehousing = #{order.warehousing}
+        </if>
+        <if test="order.processingNote != null and order.processingNote != ''">
+            and o.processing_note REGEXP #{order.processingNote}
+        </if>
         group by o.id
         order by o.id desc
         limit #{offset},#{pageSize}
@@ -132,7 +162,7 @@
         from
         `order` as o
         where date (o.create_time)>=#{startDate} and date(o.create_time) &lt;= #{endDate}
-            <if test="orderType!= null and orderType != ''">
+            <if test="orderType!= null and orderType != 0">
                 and o.create_order = #{orderType}
             </if>
 
@@ -187,8 +217,28 @@
             <if test="order.deliveryAddress != null and order.deliveryAddress != ''">
                 and o.delivery_address REGEXP #{order.deliveryAddress}
             </if>
+        <if test="order.delivery != null ">
+            and o.delivery = #{order.delivery}
+        </if>
+        <if test="order.processReview != null ">
+            and o.process_review = #{order.processReview}
+        </if>
+        <if test="order.orderReview != null ">
+            and o.order_review = #{order.orderReview}
+        </if>
+        <if test="order.productionOrder != null ">
+            and o.production_order = #{order.productionOrder}
+        </if>
+        <if test="order.processingCard != null ">
+            and o.processing_card = #{order.processingCard}
+        </if>
+        <if test="order.warehousing != null ">
+            and o.warehousing = #{order.warehousing}
+        </if>
+        <if test="order.processingNote != null and order.processingNote != ''">
+            and o.processing_note REGEXP #{order.processingNote}
+        </if>
         order by o.id desc
-        limit #{offset},#{pageSize}
     </select>
     
     <update id="reviewOrderById">
@@ -210,7 +260,7 @@
     </update>
 
     <update id="updateMoney">
-        update `order` set money = #{order.money} where order_id = #{order.orderId}
+        update `order` set money = #{order.money},calculate_type = #{order.calculateType} where order_id = #{order.orderId}
     </update>
 
     <update id="cancelOrder">
@@ -225,4 +275,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