From f38b9b10de303806a8d27734dbbf0ff8815dba49 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 08 三月 2024 19:37:30 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 be57c41..6362316 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
@@ -3,11 +3,14 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PatchLog;
+import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.entity.pp.Rework;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.pp.PatchLogMapper;
+import com.example.erp.mapper.pp.ReportingWorkMapper;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,11 +26,20 @@
@DS("pp")
@Transactional(rollbackFor = Exception.class)
public class ReplenishService {
- @Autowired
+ final
PatchLogMapper patchMapper;
- @Autowired
+ final
SysErrorService sysErrorService;
+
+ final
+ ReportingWorkMapper reportingWorkMapper;
+
+ public ReplenishService(PatchLogMapper patchMapper, SysErrorService sysErrorService, ReportingWorkMapper reportingWorkMapper) {
+ this.patchMapper = patchMapper;
+ this.sysErrorService = sysErrorService;
+ this.reportingWorkMapper = reportingWorkMapper;
+ }
public List<Map<String, Object>> getSelectReplenish(Integer pageNum, Integer pageSize) {
@@ -114,9 +126,12 @@
if (!patchLoglist.isEmpty()){
for (PatchLog patchLog : patchLoglist) {
//瀹℃牳
- patchMapper.updateReplenish(patchLog,userName);
+ patchMapper.updateReplenish(patchLog,userName);
+ ReportingWork reportingWork = reportingWorkMapper
+ .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
+ System.out.println(reportingWork.getReportingWorkId());
//淇敼灏忕墖娴佺▼鍗℃暟閲�
- patchMapper.updateOrderProcessDetail(patchLog);
+ patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
}
}
--
Gitblit v1.8.0