From 3ab330b8aefb3cd781c9b8730b4ab7ac65e7e9d7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 三月 2025 09:14:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 101 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 91 insertions(+), 10 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 402aeac..8fdd80e 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -10,28 +10,65 @@
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}
+ o.quantity=#{order.quantity} and o.area=#{order.area} and trim(o.project)=trim(#{order.project}) and o.customer_id=#{order.customerId}
</select>
<select id="selectMaxOrderId">
select
- ifnull(SUBSTR(max(order_id) from 9),0)
+ ifnull(SUBSTR(max(right(order_id,8)) from 7),0)
from
`order` as a
where
date(a.create_time) = curdate()
- order by id desc,order_id desc limit 1
+ /*order by order_id desc,order_id desc limit 1*/
</select>
<select id="selectMaxOrderIdByMonth">
select
- ifnull(SUBSTR(max(order_id) from 7),0)
+ ifnull(SUBSTR(max(right(order_id,8)) from 5),0)
from
`order` as a
where
date(a.create_time) BETWEEN DATE_FORMAT(DATE(NOW()), '%Y-%m-01') AND DATE(NOW())
</select>
-
+
+ <select id="selectMaxOrderIdByYear">
+ select
+ ifnull(SUBSTR(max(right(order_id,8)) from 3),0)
+ from
+ `order` as a
+ where
+ year(a.create_time) = year(now())
+ and a.id>400
+ </select>
+
+ <select id="selectOrderIdMin">
+ select count(*) from sd.`order` where SUBSTR(order_id,3,11)>#{substringInt}
+ </select>
+
+ <select id="selectOrderIdIs">
+ select count(*) from sd.`order` where SUBSTR(order_id,3,11)=#{substringInt}
+ </select>
+
+ <select id="selectOrderIdDay">
+ select count(*) from sd.`order` where order_id=#{oldOrderId} and SUBSTR(#{oldOrderId},9,2)=01
+ </select>
+
+ <select id="selectOrderIdMonth">
+ select count(*) from sd.`order` where order_id=#{oldOrderId} and SUBSTR(#{oldOrderId},7,4)=0001
+ </select>
+
+ <select id="selectOrderIdYear">
+ select count(*) from sd.`order` where order_id=#{oldOrderId} and SUBSTR(#{oldOrderId},5,2)=000001
+ </select>
+
+ <select id="selectOrderId">
+ select * from sd.`order` where order_id=#{orderId}
+ </select>
+
+ <update id="updateOrderId">
+ update sd.`order` set order_id=#{newOrderId} where order_id=#{oldOrderId}
+ </update>
<update id="updateOrderParameter">
update `order` o
@@ -65,8 +102,8 @@
</update>
<select id="getOrderList">
- select
- *,
+ select * from (select
+ o.*,
ifnull(sum(fgi.quantity_available),0) as goodsQuantity
from
sd.`order` as o
@@ -159,16 +196,38 @@
and o.processing_note REGEXP #{order.processingNote}
</if>
group by o.id
- order by o.id desc
+ ) as acc
+ order by
+ <if test="orderBy == null ">
+ id desc
+ </if>
+ <if test="orderBy == 'desc'">
+ ${field} desc
+ </if>
+ <if test="orderBy == 'asc'">
+ ${field}
+ </if>
limit #{offset},#{pageSize}
</select>
<select id="getPageTotal">
select
CEILING(count(o.id)/#{pageSize}) as 'pageTotal',
- count(o.id) as 'total'
+ count(o.id) as 'dataTotal',
+ sum(o.quantity) as quantity,
+ sum(o.area) as area,
+ sum(o.money) as money,
+ ifnull(fgi.goodsQuantity ,0) as goodsQuantity ,
+ ROUND(sum(perimeter),2) as perimeter,
+ #{pageSize} as pageSize
from
`order` as o
+ left join(
+ select order_id,
+ ifnull(sum(quantity_available),0) as goodsQuantity
+ from mm.finished_goods_inventory group by order_id
+ ) as fgi
+ on o.order_id = fgi.order_id
where date (o.create_time)>=#{startDate} and date(o.create_time) <= #{endDate}
<if test="orderType!= null and orderType != 0">
and o.create_order = #{orderType}
@@ -271,12 +330,19 @@
where order_id = #{id}
</update>
+ <update id="backReviewOrderById">
+ update `order` set order_review = 0,
+ 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},calculate_type = #{order.calculateType} where order_id = #{order.orderId}
+ update `order` set money = #{order.money},calculate_type = #{order.calculateType},other_money=#{order.otherMoney} where order_id = #{order.orderId}
</update>
<update id="cancelOrder">
@@ -298,4 +364,19 @@
o.order_id = #{orderId}
</update>
+
+ <select id="selectDifferentSize">
+ select a.order_number,count(a.order_number),a.order_id from(select order_id,order_number
+ from sd.order_glass_detail ogd
+ where ogd.order_id = #{orderId}
+ group by ogd.order_number,ogd.child_height,child_width)
+ as a
+ group by a.order_number
+ having count(a.order_number) > 1
+ </select>
+
+ <select id="searchOrderWarehousing">
+ select warehousing from `order`
+ where order_id = #{orderId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0