From caf567becb6378f848b3b930821a4b38cb7564a5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 10 九月 2024 12:43:20 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
index 8bb3370..0a23ee7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java
@@ -59,7 +59,6 @@
for (Map<String, Object> item : ReworkMap) {
item.put("reworkTeam", "");
List<BasicDataProduce> basicCategory = new ArrayList<>();
-
List<BasicDataProduce> basicDataProduceList = basicDateProduceMapper.SelectWorkBasicTeams(item.get("reworkProcesses").toString());
for (BasicDataProduce basicDataProduce : basicDataProduceList) {
if (Objects.equals(basicDataProduce.getBasicData().getBasicName(), item.get("reworkProcesses"))) {
@@ -161,7 +160,13 @@
}
}
-
+ //淇濆瓨鏃ュ織
+ Log log = new Log();
+ log.setContent(object.toString());
+ log.setFunction("updateRework杩斿伐瀹℃牳");
+ log.setOperatorId((String) object.get("userId"));
+ log.setOperator((String) object.get("userName"));
+ logService.saveLog(log);
return saveState;
}
--
Gitblit v1.8.0