From 4e8378a810220091e51aef35573fc56768b59a32 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 15 七月 2024 13:13:16 +0800
Subject: [PATCH] 新增发货报表导出客户简称字段
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
index 4e3bdbf..dc997a3 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -218,7 +218,6 @@
on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number
set ogd.splitting_status=0
where ogd.order_id = #{orderId}
- and ogd.production_id = left(#{processId}, 11)
</update>
@@ -226,7 +225,7 @@
<update id="deleteFlowCardMp">
delete
from flow_card as fc
- where fc.production_id = left(#{processId}, 11)
+ where fc.order_id = left(#{processId}, 10)
</update>
<!-- 鍒嗘灦鏂板鏄庣粏鏌ヨ-->
@@ -447,7 +446,7 @@
<delete id="deleteReportingWork">
delete
from sd.order_process_detail
- where left(process_id, 11) = left(#{processId}, 11)
+ where order_id = left(#{processId}, 10)
</delete>
<select id="selectPrintFlowCardMp">
@@ -587,14 +586,15 @@
o.project,
od.building_number,
od.processing_note,
- od.width,
- od.height,
+ ogd.child_width as width,
+ ogd.child_height as height,
ogd.glass_child,
ogd.process,
e.type_name,
opd.stock_id,
od.quantity,
- od.other_columns
+ od.other_columns,
+ od.bend_radius
from pp.optimize_detail opd
left join sd.`order` o on SUBSTR(opd.process_id, 1, 10) = o.order_id
left join sd.order_detail od
@@ -612,8 +612,8 @@
select o.order_id ,
o.project,
o.customer_id ,
- od.width,
- od.height,
+ ogd.child_width as width,
+ ogd.child_height as height,
od.quantity,
od.order_number as orderNumber,
fc.technology_number as technologyNumber,
@@ -623,7 +623,8 @@
ifnull(od.processing_note,'') as processing_note,
bgt.type_name,
od.other_columns,
- od.building_number
+ od.building_number,
+ od.bend_radius
from sd.order as o
left join sd.order_detail as od on o.order_id = od.order_id
left join sd.order_glass_detail as ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
--
Gitblit v1.8.0