From 71f90ed3a2eeea97b20cd095cc34a1f64dac5c81 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 26 十一月 2025 11:21:39 +0800
Subject: [PATCH] 提交 计算方式进度
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
index 2479568..a0099f2 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
@@ -211,7 +211,8 @@
//鍒ゆ柇鏄惁宸茬粡瀹℃牳
if(patchLog1.getReviewStatus()==0){
ReportingWork reportingWork = reportingWorkMapper
- .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
+ .selectOne(new QueryWrapper<ReportingWork>()
+ .eq("reporting_work_id",patchLog.getReportingWorkId()));
//淇敼灏忕墖娴佺▼鍗℃暟閲�
patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
//瀹℃牳
@@ -287,7 +288,15 @@
}
else{//灏忕墖鏍囩
Map<String, Object> itemmap = new HashMap<>();
- itemmap.put("data", flowCardMapper.getRepairPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId(),flowCard.getOrderNumber()));
+ List<Map<String,Object>> customDataSemi =flowCardMapper.getRepairPrintCustomDataSemi(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId(),flowCard.getOrderNumber());
+ for (Map<String, Object> dataMap : customDataSemi) {
+ dataMap.put("newList", flowCardMapper.getgetPrintCustomDataSemiSp(
+ flowCard.getProcessId(),
+ dataMap.get("technologyNumber").toString(),
+ flowCard.getOrderNumber()
+ ));
+ }
+ itemmap.put("data", customDataSemi);
list.add(itemmap);
}
--
Gitblit v1.8.0