From f268121e9fe9116c19f84412b3ea992d68acf542 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 18 七月 2025 14:05:26 +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 | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 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 a5ae3ad..4a12860 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml
@@ -104,7 +104,8 @@
<select id="getOrderList">
select * from (select
o.*,
- ifnull(sum(fgi.quantity_available),0) as goodsQuantity
+ ifnull(sum(fgi.quantity_available),0) as goodsQuantity,
+ if(DATEDIFF(o.delivery_date, CURDATE()) < 3 and o.delivery < 2, 'timeOut','' ) as timeOut
from
sd.`order` as o
left join mm.finished_goods_inventory as fgi
@@ -379,4 +380,56 @@
select warehousing from `order`
where order_id = #{orderId}
</select>
+
+ <select id="getProcessIdByOptimizeHeatDetail">
+ select process_id from pp.optimize_heat_detail as a
+ where a.project_no = #{projectId}
+ and a.layout_id = #{layoutId}
+ and a.sort = #{sort}
+ </select>
+
+ <select id="scannerGlassInfo">
+ select c.order_id as orderId,
+ b.order_number as orderNumber,
+ b.technology_number as technologyNumber,
+ a.process_id as processId,
+ c.customer_name as customerName,
+ concat(a.width," * " , a.height) as size,
+ b.area,
+ b.glass_child as glassChild,
+ d.product_name as productName,
+ d.building_number as buildingNumber,
+ d.remarks as remarks,
+ d.processing_note as processingNote
+ from pp.optimize_heat_detail as a
+ left join sd.order_glass_detail as b
+ on b.order_number = a.order_sort
+ and b.technology_number = a. layer
+ and b.order_id = #{orderId}
+ left join sd.order as c
+ on c.order_id = b.order_id
+ left join sd.order_detail as d
+ on c.order_id = d.order_id
+ and d.order_number = a.order_sort
+ where a.project_no = #{projectNo}
+ and a.layout_id = #{layoutId}
+ and a.sort = #{sort}
+ </select>
+
+
+ <insert id="saveOrderFile">
+ insert into sd.order_file (order_id,order_number,file_name,file_data,create_time) values(#{orderId},#{orderNumber},#{fileName},#{dxfData},now())
+ </insert>
+
+ <select id="selectOrderFile">
+ select * from sd.order_file
+ where order_id = #{orderId} and order_number = #{orderNumber}
+
+ </select>
+
+ <select id="selectOrderFileList">
+ select * from sd.order_file
+ where order_id = #{orderId}
+
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0