From 00a6c486eb0f4aec35af265ff9851bff41f18bd2 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 18 三月 2024 16:43:26 +0800
Subject: [PATCH] 修改报工前端判断流程卡位数
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReworkService.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 a4132da..bd83963 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
@@ -14,6 +14,7 @@
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.text.SimpleDateFormat;
@@ -23,6 +24,7 @@
@Service
@DS("pp")
+@Transactional(rollbackFor = Exception.class)
public class ReworkService {
@Autowired
ReworkMapper reworkMapper;
@@ -39,11 +41,12 @@
List<Map<String, Object>> ReworkMap =reworkMapper.getSelectRework(offset,pageSize);
- List<BasicDataProduce> basicDataProduceList=basicDateProduceMapper.SelectWorkBasicTeams();
+
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"))){
basicCategory.add(basicDataProduce);
--
Gitblit v1.8.0