From 3abf7a08a772acf35499b51f0c0e783804fc14f4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 27 三月 2025 10:37:34 +0800
Subject: [PATCH] 报工新增查询添加显示上下工序接收审核状态
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
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 4d1ad8c..ea5f781 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 );
+// }
}
}
--
Gitblit v1.8.0