From 0e44317af217b4b9afa9541fc71f85f11e3be29d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 03 九月 2024 16:32:21 +0800
Subject: [PATCH] 补片返工审核修改以及添加日志
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java | 8 +++++++-
north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java | 3 ++-
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 20 ++++++++++++--------
3 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
index 8151205..ae834dd 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
@@ -2,6 +2,7 @@
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
+import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -9,7 +10,7 @@
import java.util.Map;
@Mapper
-public interface PatchLogMapper {
+public interface PatchLogMapper extends MPJBaseMapper<PatchLog> {
List<Map<String,Object>> SelectReplenish(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,String startDate,String endDate,PatchLog patchLog);
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 0dce214..4267c03 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
@@ -142,14 +142,18 @@
List<PatchLog> patchLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("patchLog")), PatchLog.class);
if (!patchLoglist.isEmpty()){
for (PatchLog patchLog : patchLoglist) {
-
-
- ReportingWork reportingWork = reportingWorkMapper
- .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
- //淇敼灏忕墖娴佺▼鍗℃暟閲�
- patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
- //瀹℃牳
- patchMapper.updateReplenish(patchLog,userName);
+ PatchLog patchLog1=patchMapper.selectOne(new QueryWrapper<PatchLog>().eq("id",patchLog.getId()));
+ //鍒ゆ柇鏄惁宸茬粡瀹℃牳
+ if(patchLog1.getReviewStatus()==0){
+ ReportingWork reportingWork = reportingWorkMapper
+ .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
+ //淇敼灏忕墖娴佺▼鍗℃暟閲�
+ patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
+ //瀹℃牳
+ patchMapper.updateReplenish(patchLog,userName);
+ }else{
+ saveState = false;
+ }
Log log = new Log();
log.setContent(object.toString());
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..6b82402 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
@@ -161,7 +161,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