From 9da523001f61c6c6e777594c3c95c14d249abad4 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 八月 2024 09:11:51 +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/FlowCardService.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index b74585e..a4f9f41 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -8,9 +8,11 @@
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.entity.sd.OrderProcessDetail;
+import com.example.erp.entity.userInfo.Log;
import com.example.erp.mapper.pp.FlowCardMapper;
import com.example.erp.mapper.sd.OrderGlassDetailMapper;
import com.example.erp.mapper.sd.OrderProcessDetailMapper;
+import com.example.erp.service.userInfo.LogService;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.stereotype.Service;
@@ -35,11 +37,14 @@
OrderGlassDetailMapper orderGlassDetailMapper;
final
OrderProcessDetailMapper orderProcessDetailMapper;
+ final
+ LogService logService;
- public FlowCardService(FlowCardMapper flowCardMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper) {
+ public FlowCardService(FlowCardMapper flowCardMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper,LogService logService) {
this.flowCardMapper = flowCardMapper;
this.orderGlassDetailMapper = orderGlassDetailMapper;
this.orderProcessDetailMapper = orderProcessDetailMapper;
+ this.logService= logService;
}
//娴佺▼鍗＄鐞嗘煡璇�
@@ -66,7 +71,7 @@
}
//鍒犻櫎娴佺▼鍗�
- public Boolean deleteFlowCardSv(String orderId, String processId) {
+ public Boolean deleteFlowCardSv(String orderId, String processId, String userId, String userName) {
if (!orderId.isEmpty() && !processId.isEmpty()) {
//鍒ゆ柇璇ユ祦绋嬪崱鏄惁鎶ュ伐
Integer count = flowCardMapper.reportingWorkCount(processId);
@@ -87,6 +92,14 @@
//淇敼璁㈠崟琛ㄥ垎鏋剁姸鎬佷负1,鍒犻櫎閮ㄥ垎
flowCardMapper.updateProcessingCard(orderId, 1);
}
+
+ //淇濆瓨鏃ュ織
+ Log log = new Log();
+ log.setContent(orderId+processId);
+ log.setFunction("deleteFlowCardSv娴佺▼鍗″垹闄�");
+ log.setOperatorId(userId);
+ log.setOperator(userName);
+ logService.saveLog(log);
return true;
} else {
return false;
@@ -167,7 +180,13 @@
//璧嬪�艰鍗曞伐鑹鸿〃
orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);
}
-
+ //淇濆瓨鏃ュ織
+ Log log = new Log();
+ log.setContent(object.toString());
+ log.setFunction("addFlowCardSv娴佺▼鍗℃柊澧�");
+ log.setOperatorId((String) object.get("userId"));
+ log.setOperator((String) object.get("userName"));
+ logService.saveLog(log);
return true;
} else {
return false;
--
Gitblit v1.8.0