From 761aa895b2955a13a8d3d56405336404bca18451 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 23 七月 2024 11:58:22 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 3ad6e45..35d0d51 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -10,7 +10,7 @@
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">
@@ -70,7 +70,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) <= #{endDate}
@@ -130,6 +130,27 @@
<if test="order.deliveryAddress != null and order.deliveryAddress != ''">
and o.delivery_address REGEXP #{order.deliveryAddress}
</if>
+ <if test="order.delivery != null and order.delivery != ''">
+ and o.delivery = #{order.delivery}
+ </if>
+ <if test="order.createOrder != null and order.createOrder != ''">
+ and o.create_order = #{order.createOrder}
+ </if>
+ <if test="order.processReview != null and order.processReview != ''">
+ and o.process_review = #{order.processReview}
+ </if>
+ <if test="order.orderReview != null and order.orderReview != ''">
+ and o.order_review = #{order.orderReview}
+ </if>
+ <if test="order.productionOrder != null and order.productionOrder != ''">
+ and o.production_order = #{order.productionOrder}
+ </if>
+ <if test="order.processingCard != null and order.processingCard != ''">
+ and o.processing_card = #{order.processingCard}
+ </if>
+ <if test="order.warehousing != null and order.warehousing != ''">
+ and o.warehousing = #{order.warehousing}
+ </if>
group by o.id
order by o.id desc
limit #{offset},#{pageSize}
--
Gitblit v1.8.0