From edca6e6425e38e2ec87b08f164fb3c68dd195da6 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 23 五月 2025 15:36:19 +0800
Subject: [PATCH] 修改字段excel配置
---
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateProcessStatServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateProcessStatServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateProcessStatServiceImpl.java
index 6544ed3..55507be 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateProcessStatServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlate/ApsPlateProcessStatServiceImpl.java
@@ -2,12 +2,15 @@
import java.math.BigDecimal;
import java.time.*;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
+import cn.hutool.core.util.IdUtil;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.SecurityUtils;
+import com.aps.core.domain.ApsPlate.ApsPlateStandardRequireBomOrderDetail;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.mapper.ApsPlateProcessStatMapper;
@@ -104,14 +107,14 @@
/**
* 淇濆瓨閽ｉ噾缁熻鏁版嵁
*/
- @Transactional
@Override
- public void savePlateProcessStat() {
+ public List<ApsPlateProcessStat> computePlateProcessStat() {
String batchNum = IdUtils.fastSimpleUUID();
List<ApsPlateProcessStat> tempList = apsPlateProcessStatMapper.queryTempStat();
Map<String, List<ApsPlateProcessStat>> groupByOrderNo = tempList.stream().collect(groupingBy(ApsPlateProcessStat::getWorkOrderNo));
Boolean hasBefore = false;
LocalDateTime now = LocalDateTime.now();
+ List<ApsPlateProcessStat> totalList=new ArrayList<>();
for (Map.Entry<String, List<ApsPlateProcessStat>> entry : groupByOrderNo.entrySet()) {
List<ApsPlateProcessStat> statPerOrder = entry.getValue();
/*num 涓烘牴鎹畬宸ユ椂闂存帓搴忓嚭鐨勫簭鍙凤紝鎸夋鎺掑簭锛屽彲淇濊瘉鏄寜瀹屽伐鏃堕棿鍊掑彊鎺掑垪*/
@@ -176,13 +179,12 @@
}
}
last = stat;
- apsPlateProcessStatMapper.insertApsPlateProcessStat(stat);
+ totalList.add(stat);
+ //apsPlateProcessStatMapper.insertApsPlateProcessStat(stat);
}
hasBefore=false;
-
}
- apsPlateProcessStatMapper.removeOtherStat(batchNum);
-
+ return totalList;
}
--
Gitblit v1.9.3