From cb992aa36c364e5de08b47588123403a734cebcd Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期日, 29 十二月 2024 12:11:08 +0800
Subject: [PATCH] 修改工程打印流程卡
---
north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java | 2 +-
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 4 ++--
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml | 32 ++++++++++++++++----------------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
index 04c5fbf..0330191 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
@@ -129,7 +129,7 @@
List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber, String process);
- List<Map<String, Object>> getDetailListLikes(String processId, String technologyNumber, String process,Integer orderNumber,Integer quantity);
+ List<Map<String, Object>> getDetailListLikes(String processId, String technologyNumber, String process,String printProject,Integer quantity);
List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber, String orderId);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index 8775182..d3070e5 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -390,11 +390,11 @@
if(flowCard.getPatchState().equals(0)){
itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess(),flowCard.getOrderId()));
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getProcess());
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikes(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getProcess(),printProject,flowCard.getQuantity());
itemmap.put("detailList", detailList);
}else{
itemmap.put("detail", flowCardMapper.getPrimaryLists(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess(),flowCard.getOrderId(),flowCard.getQuantity()));
- List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikes(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getProcess(),flowCard.getOrderNumber(),flowCard.getQuantity());
+ List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikes(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getProcess(),printProject,flowCard.getQuantity());
itemmap.put("detailList", detailList);
}
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 9a10fac..b77fc0a 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -1318,9 +1318,9 @@
<select id="getDetailListLikes">
select fc.order_number,
concat(round(ogd.child_width), "*", round(ogd.child_height)) as child_width,
- #{quantity} as quantity,
- round(ogd.child_width*ogd.child_height*#{quantity}/1000000, 2) as total_area,
- round((ogd.child_width+ogd.child_height)*2*#{quantity}/1000, 2) as perimeter,
+ count(*) as quantity,
+ round(ogd.child_width*ogd.child_height*count(*)/1000000, 2) as total_area,
+ round((ogd.child_width+ogd.child_height)*2*count(*)/1000, 2) as perimeter,
if(od.shape=2,JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S04')),od.bend_radius) as bend_radius,
concat(IFNULL(od.processing_note, ''), IFNULL(od.remarks, '')) as remarks,
od.other_columns,
@@ -1330,20 +1330,20 @@
fc.technology_number,
IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
od.building_number
- 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.product_detail as pd
- on pd.prod_id = od.product_id and pd.glass_sort = ogd.technology_number
- left join flow_card_sort as fcs
- on fcs.process_id = fc.process_id and fcs.order_number = fc.order_number and
- fcs.technology_number = fc.technology_number
- and fcs.process = #{process}
- where fc.process_id = #{processId}
+ from optimize_detail opt left join flow_card as fc on opt.process_id = fc.process_id and opt.order_sort = fc.order_number and
+ opt.layer = fc.technology_number
+ 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.product_detail as pd
+ on pd.prod_id = od.product_id and pd.glass_sort = ogd.technology_number
+ left join flow_card_sort as fcs
+ on fcs.process_id = fc.process_id and fcs.order_number = fc.order_number and
+ fcs.technology_number = fc.technology_number
+ and fcs.process = #{process}
+ where opt.process_id = #{processId} and opt.project_no=#{printProject}
and position(fc.technology_number in #{technologyNumber})
- and fc.order_number=#{orderNumber}
group by fc.process_id, fc.order_number, fc.technology_number
order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
</select>
--
Gitblit v1.8.0