From d898b8a901f94aad9498bb2c4e54c328e0a14c95 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 27 三月 2025 14:54:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 38 ++++++------
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 22 +++++++
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 96 +++++++++++++++++--------------
3 files changed, 93 insertions(+), 63 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index b5a0586..7ce0e0f 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -339,6 +339,13 @@
},
{field: 'completed', width: 90, title:t('reportingWorks.completed'),},
{field: 'onceBroken', width: 90, title: t('reportingWorks.onceBroken'),},
+ {
+ field: 'reviewed_state',
+ title: t('processCard.reviewedState'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
],
//琛ㄥ崟楠岃瘉
@@ -1150,7 +1157,20 @@
//缁戝畾涓嬫柟琛ㄦ牸
detail.value = res.data.Detail
- xGrid.value.reloadData(detail.value)
+ // 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
+ let modifiedCollection = detail.value.map(item => {
+ if (item.reviewed_state === 1) {
+ return { ...item, reviewed_state: "宸插鏍�" };
+ }
+ else if (item.reviewed_state === 0) {
+ return { ...item, reviewed_state: "鏈鏍�" };
+ }
+ else {
+ // 鍏朵粬鎯呭喌淇濇寔涓嶅彉
+ return item;
+ }
+ });
+ xGrid.value.reloadData(modifiedCollection)
} else {
ElMessage.warning(res.msg)
}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 6c787c9..a46593e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -153,7 +153,7 @@
if (retrievedData!=null){
Integer reviewedState = retrievedData.getReviewedState();
//鏍规嵁瀹℃牳鐘舵�佹煡璇㈡湭瀹℃牳鏁版嵁
- if (reviewedState==1){//宸插鏍�
+ // if (reviewedState==1){//宸插鏍�
//涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process,previousProcess,laminating);
if(process.equals("涓┖")){
@@ -171,24 +171,24 @@
});
}
map.put("Detail",details );
- }else {
- //涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
- List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMpReview(processIdStr, technologyStr, process,previousProcess,laminating);
- if(process.equals("涓┖")){
- String orderId = reportingWorkMapper.selectOrderid(processIdStr);
- details.forEach( detail -> {
- Integer glassId = orderGlassDetailMapper.
- getMinIdByGroup(orderId,
- String.valueOf(detail.get("order_number")),
- String.valueOf(detail.get("group")));
- int listGlassId = Integer.parseInt(String.valueOf(detail.get("glassId")));
- if(listGlassId !=glassId){
- detail.put("rowClass","latter");
- }
- });
- }
- map.put("Detail",details );
- }
+// }else {
+// //涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
+// List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMpReview(processIdStr, technologyStr, process,previousProcess,laminating);
+// if(process.equals("涓┖")){
+// String orderId = reportingWorkMapper.selectOrderid(processIdStr);
+// details.forEach( detail -> {
+// Integer glassId = orderGlassDetailMapper.
+// getMinIdByGroup(orderId,
+// String.valueOf(detail.get("order_number")),
+// String.valueOf(detail.get("group")));
+// int listGlassId = Integer.parseInt(String.valueOf(detail.get("glassId")));
+// if(listGlassId !=glassId){
+// detail.put("rowClass","latter");
+// }
+// });
+// }
+// map.put("Detail",details );
+// }
}
}
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index a25e7bb..3bfc25b 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -189,56 +189,55 @@
<!-- 闈炵涓�閬撳伐搴忔姤宸ユ槑缁嗘煡璇�-->
<select id="SelectReworlDetailMp">
SELECT
- fc.order_number,
- ogd.glass_child,
- ogd.technology_number,
- ogd.glass_address,
- fc.quantity AS quantity_card,
- ogd.child_width,
- ogd.child_height,
+ fc.order_number,
+ ogd.glass_child,
+ ogd.technology_number,
+ ogd.glass_address,
+ fc.quantity AS quantity_card,
+ ogd.child_width,
+ ogd.child_height,
if(od.shape=1,'鏅舰',if(od.shape=2,'寮傚舰','')) as shape,
- if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num ) < 0,
- 0,
+ if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num ) < 0,
+ 0,
odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as quantity,
- if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) < 0,
- 0,
+ if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) < 0,
+ 0,
odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as completedQuantity,
- odpd.reporting_work_num as completed,
- odpd.broken_num as onceBroken,
- ogd.`group`,
- if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
- od.other_columns,
- ogd.id as 'glassId'
+ odpd.reporting_work_num as completed,
+ odpd.broken_num as onceBroken,
+ ogd.`group`,
+ if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 鍒ゆ柇鏄惁宸茬粡瀹屾垚锛屽凡缁忓畬鎴愪笉搴忓彿鍜屽悓搴忓彿鏁伴噺鐩稿悓鎵嶈兘鎻愪氦
+ od.other_columns,
+ ogd.id as 'glassId',IFNULL(rws.reviewed_state,0) as reviewed_state
FROM
- sd.order_detail AS od
+ sd.order_detail AS od
LEFT JOIN sd.order_glass_detail AS ogd
- ON od.order_id = ogd.order_id
- AND od.order_number = ogd.order_number
+ ON od.order_id = ogd.order_id
+ AND od.order_number = ogd.order_number
<if test="process == '澶硅兌'">
AND ogd.`group` = (select `group`
- from sd.order_glass_detail
- where order_id = ogd.order_id
- and order_number = ogd.order_number
- and POSITION(technology_number in #{technologyStr})
- limit 1)
+ from sd.order_glass_detail
+ where order_id = ogd.order_id
+ and order_number = ogd.order_number
+ and POSITION(technology_number in #{technologyStr})
+ limit 1)
</if>
-
LEFT JOIN flow_card AS fc
- ON fc.order_id = ogd.order_id
- and fc.production_id=ogd.production_id
- AND fc.order_number = ogd.order_number
- AND fc.technology_number = ogd.technology_number
+ ON fc.order_id = ogd.order_id
+ and fc.production_id=ogd.production_id
+ AND fc.order_number = ogd.order_number
+ AND fc.technology_number = ogd.technology_number
left join sd.order_process_detail as odpd
- ON odpd.order_id = fc.order_id
- AND odpd.order_number = fc.order_number
- AND odpd.technology_number = fc.technology_number
- and odpd.process_id = fc.process_id
+ ON odpd.order_id = fc.order_id
+ AND odpd.order_number = fc.order_number
+ AND odpd.technology_number = fc.technology_number
+ and odpd.process_id = fc.process_id
left join sd.order_process_detail as odpds
- ON odpds.id = odpd.id-1
+ ON odpds.id = odpd.id-1
left join
- (SELECT
+ (SELECT
sum(rw.rework_num) as 'patchNumSum',
rw.process_id,rw.order_sort,rw.technology_number,
rwk.this_process
@@ -251,16 +250,27 @@
and rw.review_status=1
and rw.process_id = #{processIdStr}
GROUP BY rw.process_id,rw.order_sort,rw.technology_number) as c
- on c.process_id = fc.process_id
- and c.order_sort = fc.order_number
- and c.technology_number = fc.technology_number
-
- WHERE
- fc.process_id = #{processIdStr}
+ on c.process_id = fc.process_id
+ and c.order_sort = fc.order_number
+ and c.technology_number = fc.technology_number
+ left join (select reviewed_state as reviewed_state ,
+ process_id,a.reporting_work_id,b.technology_number,b.order_number
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id = b.reporting_work_id
+ where this_process=#{previousProcess} and process_id= #{processIdStr}
<if test="laminating != 'laminating'">
- AND POSITION(fc.technology_number in #{technologyStr})
+ AND POSITION(b.technology_number in #{technologyStr})
</if>
+ GROUP BY a.reporting_work_id,b.order_number,b.technology_number
+ ) as rws
+ on rws.process_id = fc.process_id and rws.order_number=fc.order_number and rws.technology_number=fc.technology_number
+ WHERE
+ fc.process_id = #{processIdStr}
+
AND odpd.process = #{process}
+ <if test="laminating != 'laminating'">
+ AND POSITION(fc.technology_number in #{technologyStr})
+ </if>
order by fc.order_number
</select>
--
Gitblit v1.8.0