From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 六月 2024 16:56:06 +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/ReworkService.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 8f22591..7054938 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
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.entity.pp.BasicDataProduce;
+import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.Rework;
import com.example.erp.entity.sd.Delivery;
import com.example.erp.entity.sd.OrderDetail;
@@ -13,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;
@@ -22,6 +24,7 @@
@Service
@DS("pp")
+@Transactional(rollbackFor = Exception.class)
public class ReworkService {
@Autowired
ReworkMapper reworkMapper;
@@ -38,11 +41,13 @@
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);
@@ -79,8 +84,8 @@
public Boolean saveRework(Map<String,Object> object) {
boolean saveState = true;
-
-
+ Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+ try {
String userName = "";
String userId = "";
if (object.get("userName") != null) {
@@ -89,18 +94,28 @@
if (object.get("userId") != null) {
userId = object.get("userId").toString();
}
+ //鑾峰彇鍗曞彿
+ String oddNumber= orderNumberSetting("杩斿伐");
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
List<Rework> reworklist = JSONArray.parseArray(JSONObject.toJSONString(object.get("rework")), Rework.class);
if (!reworklist.isEmpty()){
for (Rework rework : reworklist) {
- //鑾峰彇鍗曞彿
- String oddNumber= orderNumberSetting("杩斿伐");
- //娣诲姞鍑哄叆搴撹褰�
+ //娣诲姞杩斿伐璁板綍锛屼慨鏀规鐮存槑缁嗘暟閲�
reworkMapper.insertRework(rework,oddNumber);
- reworkMapper.updateReportingWorkDetail(rework);
+ reworkMapper.updateDamageDetails(rework);
}
}
+ } catch (Exception e) {
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ //灏嗗紓甯镐紶鍏ユ暟鎹簱
+ SysError sysError = new SysError();
+ sysError.setError(e.toString());
+ sysError.setFunc("saveOrder");
+ sysErrorService.insert(sysError);
+ saveState = false;
+
+ }
return saveState;
--
Gitblit v1.8.0