From d39c0479c9ddd38dc36b3c2e29a4e5a3b24fd3d7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 02 七月 2024 17:06:28 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 362 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 298 insertions(+), 64 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 b42f279..83e2b61 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -49,6 +49,8 @@
<result column="g_type" property="glassTypes.type"/>-->
</resultMap>
+
+
<!-- 娴佺▼鍗＄鐞嗘煡璇�-->
<select id="selectFlowCard" resultMap="flowCardMap">
select
@@ -62,7 +64,8 @@
a.founder,
c.processing_note,
if(a.layout_status=0,'涓嶅彲鎺掔増',if(a.layout_status=1,'鍙帓鐗�','宸叉帓鐗�')) as layout_status
- from (select id,order_id,process_id,order_number, quantity,founder,layout_status,create_time from flow_card group by process_Id,order_number) as a left join sd.`order` as b on a.order_Id=b.order_id
+ from (select id,order_id,process_id,order_number, quantity,founder,layout_status,create_time from flow_card
+ group by process_Id,order_number) as a left join sd.`order` as b on a.order_Id=b.order_id
left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number
where a.create_time between #{selectTime1} and #{selectTime2}
<if test="flowCard.orderId != null and flowCard.orderId != ''">
@@ -186,17 +189,20 @@
<!-- 鍒嗘灦鏄庣粏鏌ヨ-->
<select id="detailsSelectMp">
select od.order_id,
- ogd.production_id,
- od.product_id,
- od.product_name,
- SUM( od.quantity) as quantity,
- SUM(od.compute_gross_area) as compute_gross_area,
- sum(od.perimeter) as perimeter
- from sd.order_detail as od left join
- (select order_id,order_number,production_id,splitting_status from sd.order_glass_detail
- GROUP BY order_id,order_number
- ) as ogd on od.order_id=ogd.order_id and od.order_number=ogd.order_number
- where od.order_id = #{orderId} and ogd.splitting_status=0
+ ogd.production_id,
+ od.product_id,
+ od.product_name,
+ SUM(od.quantity) as quantity,
+ SUM(od.compute_gross_area) as compute_gross_area,
+ round(sum(od.perimeter), 2) as perimeter
+ from sd.order_detail as od
+ left join
+ (select order_id, order_number, production_id, splitting_status
+ from sd.order_glass_detail
+ GROUP BY order_id, order_number) as ogd
+ on od.order_id = ogd.order_id and od.order_number = ogd.order_number
+ where od.order_id = #{orderId}
+ and ogd.splitting_status = 0
group by od.order_id, ogd.production_id
order by od.id desc
@@ -209,7 +215,7 @@
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)
+ and ogd.production_id = left(#{processId}, 11)
</update>
@@ -217,7 +223,7 @@
<update id="deleteFlowCardMp">
delete
from flow_card as fc
- where fc.production_id = left(#{processId},11)
+ where fc.production_id = left(#{processId}, 11)
</update>
<!-- 鍒嗘灦鏂板鏄庣粏鏌ヨ-->
@@ -362,13 +368,13 @@
od.width,
od.height,
od.quantity,
- round(od.width * od.height * od.quantity / 1000000, 2) as area,
- (od.quantity - IFNULL(ps.scheduling_quantity, 0)) as pendingProductionQuantity,
+ round(od.width * od.height * od.quantity / 1000000, 2) as area,
+ (od.quantity - IFNULL(ps.scheduling_quantity, 0)) as pendingProductionQuantity,
round(od.width * od.height * (od.quantity - IFNULL(ps.scheduling_quantity, 0)) / 1000000,
- 2) as pendingProductionArea,
- IFNULL(ps.scheduling_quantity, 0) as productionScheduledQuantity,
+ 2) as pendingProductionArea,
+ IFNULL(ps.scheduling_quantity, 0) as productionScheduledQuantity,
round(od.width * od.height * (IFNULL(ps.scheduling_quantity, 0)) / 1000000,
- 2) as productionScheduledArea,
+ 2) as productionScheduledArea,
od.product_name,
od.shape
from sd.order_detail as od
@@ -404,26 +410,38 @@
od.product_name,
ogd.glass_child,
fc.founder,
- date(fc.splitFrame_time) as splitFrame_time
+ date(fc.splitFrame_time) as splitFrame_time
from flow_card as fc
left join sd.order_glass_detail as ogd
on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
fc.technology_number = ogd.technology_number
left join sd.order_detail as od on od.order_id = ogd.order_id and od.order_number = ogd.order_number
where fc.process_id = #{processId}
- GROUP BY fc.order_id, fc.process_id, fc.order_number,fc.technology_number
- order by fc.order_number,fc.technology_number
+ GROUP BY fc.order_id, fc.process_id, fc.order_number, fc.technology_number
+ order by fc.order_number, fc.technology_number
</select>
<delete id="deleteReportingWork">
- delete from sd.order_process_detail
- where left(process_id,11) = left(#{processId},11)
+ delete
+ from sd.order_process_detail
+ where left(process_id, 11) = left(#{processId}, 11)
</delete>
<select id="selectPrintFlowCardMp">
- select * from sd.order where create_time between #{selectTime1} and #{selectTime2} and
- position(#{orderId} in order_id ) and position(#{project} in project)
- and processing_card=2
+ select *
+ from sd.order
+ where create_time between #{selectTime1} and #{selectTime2}
+ and position(#{orderId} in order_id)
+ and position(#{project} in project)
+ and processing_card = 2
+ order by create_time desc
+ </select>
+
+ <select id="selectPrintFlowCard">
+ select *
+ from pp.optimize_project
+ where create_time between #{selectTime1} and #{selectTime2}
+ and state >= 20
order by create_time desc
</select>
@@ -433,10 +451,11 @@
fc.process_id,
o.customer_name,
o.project,
+ fc.order_number,
ogd.technology_number,
ogd.glass_address,
- sum(od.quantity) as quantity,
- sum(ogd.total_area) as total_area,
+ sum(od.quantity) as quantity,
+ sum(ogd.total_area) as total_area,
od.product_name,
ogd.glass_child,
fc.founder,
@@ -462,17 +481,18 @@
od.product_name,
o.processing_note,
fc.process_id,
- SUM( od.quantity) as quantity,
- SUM(ogd.total_area) as gross_area,
- SUM(od.weight) as weight,
- #{technologyNumber} as technologyNumber,
- concat(fc.process_id,'/',#{technologyNumber}) as processIdNumber
+ SUM(od.quantity) as quantity,
+ round(SUM(ogd.total_area), 2) as gross_area,
+ round(SUM(ogd.child_width*ogd.child_height*od.quantity*p.thickness/1000000*2.5),2) as weight,
+ #{technologyNumber} as technologyNumber,
+ concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber
from flow_card as fc
left join sd.order_glass_detail as ogd
on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
fc.technology_number = ogd.technology_number
left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
left join sd.`order` as o on o.order_id = fc.order_id
+ left join sd.product as p on p.id=od.product_id
where fc.process_id = #{processId}
and fc.technology_number = #{technologyNumber}
group by fc.process_id, fc.technology_number
@@ -480,9 +500,9 @@
<select id="getDetailList">
select fc.order_number,
- concat(ogd.child_width, "*", ogd.child_height) as child_width,
+ concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
od.quantity,
- round(ogd.total_area,2) as total_area,
+ round(ogd.total_area, 2) as total_area,
od.perimeter,
od.bend_radius,
od.remarks
@@ -494,7 +514,7 @@
where fc.process_id = #{processId}
and fc.technology_number = #{technologyNumber}
group by fc.process_id, fc.order_number
- order by fc.order_number
+ order by IF(sort != NULL || sort != '', sort, fc.order_number)
</select>
<select id="getProcessList">
@@ -506,11 +526,14 @@
</select>
<update id="updateInventory">
- update flow_card set inventory_quantity=#{completedQuantity}
- where process_id = #{processId} and order_number = #{orderNumber} and technology_number = #{technologyNumber}
+ update flow_card
+ set inventory_quantity=#{completedQuantity}
+ where process_id = #{processId}
+ and order_number = #{orderNumber}
+ and technology_number = #{technologyNumber}
</update>
-<!-- 澶嶉�夋淇敼鎺掔増鐘舵��-->
+ <!-- 澶嶉�夋淇敼鎺掔増鐘舵��-->
<update id="updateComposing">
update flow_card as fc
set fc.layout_status=1
@@ -518,30 +541,241 @@
</update>
<select id="getPrintLabel">
- select c.customer_name,
- c.order_id,
+ select o.order_id,
+ o.customer_name,
+ o.project,
+ od.building_number,
+ od.processing_note,
+ od.width,
+ od.height,
+ ogd.glass_child,
e.type_name,
- b.remarks,
- c.project,
- a.child_width,
- a.child_height,
- sum(b.quantity) as quantity,
- a.glass_child,
- b.processing_note
- from sd.order_glass_detail as a
- left join sd.order_detail as b
- on a.order_id = b.order_id
- and a.order_number = b.order_number
- left join sd.`order` as c
- on c.order_id = a.order_id
- left join flow_card as d
- on d.order_id = a.order_id and d.order_number = a.order_number and
- d.technology_number = a.technology_number
- left join sd.product e
- on e.id = b.product_id
- where d.process_id = #{processId}
- and d.technology_number = #{technologyNumber}
- group by a.glass_child, a.child_width, a.child_height
- order by d.technology_number
+ opd.stock_id,
+ od.quantity
+ 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
+ on SUBSTR(opd.process_id, 1, 10) = od.order_id and opd.order_sort = od.order_number
+ left join sd.order_glass_detail ogd
+ on SUBSTR(opd.process_id, 1, 10) = ogd.order_id and opd.order_sort = ogd.order_number
+ left join sd.product p on od.product_id = p.id
+ left join sd.basic_glass_type e on e.type_id = p.type_id
+ where opd.project_no = #{projectNo}
+ order by opd.stock_id
</select>
+
+ <select id="getPrintLabel1">
+ select o.order_id ,
+ o.project,
+ o.customer_id ,
+ od.width,
+ od.height,
+ od.quantity,
+ od.order_number as orderNumber,
+ fc.technology_number as technologyNumber,
+ ogd.glass_child,
+ c.customer_abbreviation as customer_name,
+ ifnull(od.processing_note,'') as processing_note
+ 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
+ left join pp.flow_card as fc on o.order_id = fc.order_id and
+ od.order_number = fc.order_number and fc.technology_number=ogd.technology_number
+ left join sd.product pt on pt.id=od.product_id
+ left join sd.customer c on c.id=o.customer_id
+ where fc.process_id = #{processId}
+ and fc.technology_number=#{technologyNumber}
+ group by od.order_number,od.width,od.height
+ </select>
+
+ <select id="printFlowCardDetailsMp">
+ SELECT fc.process_id,
+ fc.order_number,
+ fc.technology_number,
+ ogd.glass_address,
+ ogd.child_width,
+ ogd.child_height,
+ fc.quantity,
+ ROUND(ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2) as area,
+ fc.sort
+ FROM flow_card AS fc
+ LEFT JOIN sd.order_glass_detail AS ogd ON fc.order_id = ogd.order_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
+ where fc.process_id = #{processId}
+ and fc.technology_number = #{technologyNumber}
+ order by IF(fc.sort != NULL || fc.sort != '', fc.sort, fc.order_number)
+ </select>
+
+ <update id="printSortMp">
+ update flow_card
+ set sort = #{sort}
+ where process_id = #{processId}
+ and order_number = #{orderNumber}
+ and technology_number = #{technologyNumber}
+ </update>
+
+ <select id="selectType">
+ select *
+ from pp.tag_style
+ </select>
+ <select id="getPrintTitle">
+ select value
+ from pp.tag_style as a
+ where a.name = #{type}
+ </select>
+
+ <select id="getCustomLabelDetailMp">
+ select #{name}
+ from #{form}
+ where order_id = #{id}
+ </select>
+
+ <resultMap id="orderDetial" type="com.example.erp.entity.sd.OrderDetail">
+ <result column="width" property="width"/>
+ <result column="height" property="height"/>
+ <result column="order_id" property="order.orderId"/>
+ <result column="project" property="order.project"/>
+ <result column="customer_id" property="order.customerId"/>
+ <result column="customer_name" property="order.customerName"/>
+ <result column="order_type" property="order.orderType"/>
+ <result column="order_classify" property="order.orderClassify"/>
+ <result column="batch" property="order.batch"/>
+ <result column="icon" property="order.icon"/>
+ <result column="pack_type" property="order.packType"/>
+ <result column="delivery_date" property="order.deliveryDate"/>
+ <result column="al_type" property="order.alType"/>
+ <result column="money" property="order.money"/>
+ <result column="contract_id" property="order.contractId"/>
+ <result column="customer_batch" property="order.customerBatch"/>
+ <result column="contacts" property="order.contacts"/>
+ <result column="delivery_address" property="order.deliveryAddress"/>
+ <result column="processing_note" property="processingNote"/>
+ <result column="quantity" property="quantity"/>
+ <result column="edging_type" property="edgingType"/>
+ <result column="product_name" property="productName"/>
+ <result column="building_number" property="buildingNumber"/>
+ </resultMap>
+
+ <select id="getPrintCustomData">
+ select o.order_id as orderId,
+ project,
+ customer_id as customerId,
+ o.customer_name as customerName,
+ order_type as orderType,
+ order_classify as orderClassify,
+ batch,
+ o.icon,
+ pack_type as packType,
+ delivery_date as deliveryDate,
+ al_type as alType,
+ money,
+ contract_id as contractId,
+ customer_batch customerBatch,
+ contacts,
+ delivery_address as deliveryAddress,
+ od.processing_note as processingNote,
+ width,
+ height,
+ od.quantity,
+ od.order_number as orderNumber,
+ fc.technology_number as technologyNumber,
+ od.building_number as buildingNumber,
+ od.product_name as productName,
+ od.edging_type as edgingType,
+ p.remarks,
+ c.customer_abbreviation as customerAbbreviation
+ from sd.order as o
+ left join sd.order_detail as od on o.order_id = od.order_id
+ left join flow_card as fc on o.order_id = fc.order_id and
+ od.order_number = fc.order_number
+ left join sd.product as p on p.id=od.product_id
+ left join sd.customer as c on c.id = o.customer_id
+ where fc.process_id = #{processId}
+ and fc.technology_number = #{technologyNumber}
+ group by od.order_number, width, height
+ order by IF(fc.sort != NULL || fc.sort != '', fc.sort, fc.order_number)
+ </select>
+
+ <select id="selectReplenishPrintMp">
+ select fc.id,
+ fc.order_id,
+ fc.process_id,
+ o.customer_name,
+ o.project,
+ fc.order_number,
+ ogd.technology_number,
+ ogd.glass_address,
+ pl.patch_num,
+ pl.patch_area,
+ pl.responsible_team,
+ pl.responsible_equipment,
+ pl.responsible_personnel,
+ pl.patch_type,
+ pl.patch_reason,
+ pl.patch_processes,
+ od.product_name,
+ ogd.glass_child
+ from flow_card as fc
+ left join sd.order_glass_detail as ogd
+ on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
+ ogd.technology_number = fc.technology_number
+ left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
+ left join sd.`order` as o on o.order_id = fc.order_id
+ left join patch_log as pl on pl.order_id = fc.order_id and pl.process_id = fc.process_id and
+ pl.order_sort = fc.order_number and
+ pl.technology_number = fc.technology_number
+ where pl.create_time between #{selectTime1} and #{selectTime2}
+ GROUP BY fc.process_id, ogd.technology_number
+ order by fc.process_id, ogd.technology_number
+ </select>
+
+ <select id="getRepairPrintCustomData">
+ select o.order_id as orderId,
+ project,
+ customer_id as customerId,
+ customer_name as customerName,
+ order_type as orderType,
+ order_classify as orderClassify,
+ batch,
+ o.icon,
+ pack_type as packType,
+ delivery_date as deliveryDate,
+ al_type as alType,
+ money,
+ contract_id as contractId,
+ customer_batch customerBatch,
+ contacts,
+ delivery_address as deliveryAddress,
+ od.processing_note as processingNote,
+ width,
+ height,
+ pl.patch_num as quantity,
+ pl.order_sort as orderNumber,
+ pl.technology_number as technologyNumber,
+ od.building_number as buildingNumber,
+ od.product_name as productName,
+ od.edging_type as edgingType
+
+ from sd.order as o
+ left join sd.order_detail as od on o.order_id = od.order_id
+ left join flow_card as fc on o.order_id = fc.order_id and
+ od.order_number = fc.order_number
+ left join patch_log as pl on pl.process_id = fc.process_id and pl.order_sort = fc.order_number and
+ pl.technology_number = fc.technology_number
+ where pl.process_id = #{processId}
+ and pl.technology_number = #{technologyNumber}
+ group by od.order_number, width, height
+ order by IF(fc.sort != NULL || fc.sort != '', fc.sort, pl.order_sort)
+ </select>
+
+ <select id="getGlassNumber">
+ select other_columns
+ from sd.order_detail as od
+ left join flow_card as fc on od.order_id = fc.order_id and od.order_number = fc.order_number
+ where fc.process_id = #{processId}
+ and fc.technology_number = #{technologyNumber}
+ order by IF(fc.sort != NULL || fc.sort != '', fc.sort, fc.order_number)
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0