From a85bc05fb3a7dc9c67930a1b412cf5b1be172fd5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 19 十二月 2024 16:44:06 +0800
Subject: [PATCH] 修改报工新增为通过判断工序是否为复合工序报工
---
north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 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 d6672cf..2d45565 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
@@ -298,4 +335,15 @@
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>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0