From 7b90aa81239b862adf88db30b1af322f7b8de291 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 05 十二月 2025 09:26:14 +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 | 19 +------------------
1 files changed, 1 insertions(+), 18 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 e6ebc62..d3e2920 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
@@ -204,24 +204,7 @@
});
}
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