From d111849e6e78ed02a63661e31c81dadd65f53104 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 01 十二月 2025 13:28:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 82791e5..0f99f24 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
@@ -161,6 +161,8 @@
//宸ヨ壓娴佺▼
map.put("technologicalProcess", technologicalProcess);
+ //鑾峰彇鏈嶅姟鍣ㄦ椂闂�
+ map.put("reportingWorkTiem", LocalDateTime.now());
//璁惧涓嬫媺妗�
map.put("device", reportingWorkMapper.SelectWorkBasicDeviceMp(process));
//鐝粍涓嬫媺妗�
@@ -187,7 +189,7 @@
// if (reviewedState==1){//宸插鏍�
//涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, splitTechNumbers(technologyStr), process,previousProcess,laminating);
- if(process.equals("涓┖")){
+ if(laminating.equals("stepD")){
//鑾峰彇璇ユ祦绋嬪崱璁㈠崟鍙�
String orderId = reportingWorkMapper.selectOrderid(processIdStr);
details.forEach( detail -> {
@@ -746,6 +748,14 @@
JSONObject reportingWorkJson = new JSONObject(reportingWorkMap);
ReportingWork reportingWork = JSONObject.parseObject(JSONObject.toJSONString(reportingWorkJson.get("title")), ReportingWork.class);
List<ReportingWorkDetail> reportingWorkDetails = JSONArray.parseArray(JSONObject.toJSONString(reportingWorkJson.get("detail")), ReportingWorkDetail.class);
+
+
+ ReportingWork reportingWork1 = reportingWorkMapper.selectOne(new LambdaQueryWrapper<ReportingWork>()
+ .eq(ReportingWork::getReportingWorkId, reportingWork.getReportingWorkId()));
+ reportingWork.setCreatorId(reportingWork1.getCreatorId());
+ reportingWork.setCreator(reportingWork1.getCreator());
+ reportingWork.setUpdateTime(LocalDateTime.now());
+
//鏌ヨ璇ユ姤宸ユ槸鍚︿负鎶ュ伐杞Щ璁㈠崟
Integer transferState = reportingWorkMapper.selectReviewedState(reportingWork.getReportingWorkId());
if (transferState !=3){
@@ -904,7 +914,7 @@
} catch (Exception e) {
e.printStackTrace();
- throw new RuntimeException("骞惰鏌ヨ鎶ュ伐璁板綍寮傚父锛�" + e.getMessage(), e);
+ throw new RuntimeException("鎶ュ伐鏌ヨ骞惰鏌ヨ鎶ュ伐璁板綍寮傚父锛�" + e.getMessage(), e);
}
return result;
@@ -1690,6 +1700,8 @@
stringRedisTemplate.rename(key, "upload:" + key);
});
}
+ }else{
+ return;
}
//娣诲姞鏆傚仠鏃堕棿锛屾柟寮忚幏鍙杕ap鏃讹紝redis涓暟鎹繕鍦ㄥ彉鍖�
Thread.sleep(200);
--
Gitblit v1.8.0