From be8a84dd3610443ebc82a9c75f888920b882bf01 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 13 九月 2024 11:38:59 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 308 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 221 insertions(+), 87 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 37e49bf..f7f1e84 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -13,6 +13,7 @@
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderProcessDetail;
import com.example.erp.entity.userInfo.Log;
+import com.example.erp.entity.userInfo.SysError;
import com.example.erp.exception.ServiceException;
import com.example.erp.mapper.pp.*;
import com.baomidou.dynamic.datasource.annotation.DS;
@@ -22,9 +23,12 @@
import com.example.erp.mapper.userInfo.LogMapper;
import com.example.erp.service.sd.OrderProcessDetailService;
import com.example.erp.service.userInfo.LogService;
+import com.example.erp.service.userInfo.SysErrorService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
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;
import java.time.LocalDateTime;
@@ -58,9 +62,10 @@
final LogMapper logMapper;
private final OrderGlassDetailMapper orderGlassDetailMapper;
+ private final SysErrorService sysErrorService;
- public ReportingWorkService(ReportingWorkMapper reportingWorkMapper, BasicDateProduceMapper basicDateProduceMapper, DamageDetailsMapper damageDetailsMapper, ReportingWorkDetailMapper reportingWorkDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, OrderProcessDetailService orderProcessDetailService, OrderMapper orderMapper, FlowCardMapper flowCardMapper, LogService logService, LogMapper logMapper, OrderGlassDetailMapper orderGlassDetailMapper) {
+ public ReportingWorkService(ReportingWorkMapper reportingWorkMapper, BasicDateProduceMapper basicDateProduceMapper, DamageDetailsMapper damageDetailsMapper, ReportingWorkDetailMapper reportingWorkDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, OrderProcessDetailService orderProcessDetailService, OrderMapper orderMapper, FlowCardMapper flowCardMapper, LogService logService, LogMapper logMapper, OrderGlassDetailMapper orderGlassDetailMapper, SysErrorService sysErrorService) {
this.reportingWorkMapper = reportingWorkMapper;
this.basicDateProduceMapper = basicDateProduceMapper;
this.damageDetailsMapper = damageDetailsMapper;
@@ -72,100 +77,103 @@
this.logService = logService;
this.logMapper = logMapper;
this.orderGlassDetailMapper = orderGlassDetailMapper;
+ this.sysErrorService = sysErrorService;
}
- public Map<String, Object> AddSelectLastWorkSv(String processIdStr, String technologyStr, String process) {
+ public Map<String, Object> AddSelectLastWorkSv(String processIdStr, String technologyStr, String process, String reportType) {
Map<String, Object> map = new HashMap<>();
//鏌ヨ娴佺▼鍗″伐鑹烘祦绋�
String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(processIdStr,technologyStr);
+ if (technologicalProcess!=null || !technologicalProcess.equals("")){
+ String[] processList = technologicalProcess.split("->");
+ //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
+ String interceptProcess = processList[0];
+ int length = processList.length;
+ //瀹氫箟褰撳墠宸ュ簭涓婁笅宸ュ簭
+ String previousProcess = "";
+ String nextProcess = "";
- String[] processList = technologicalProcess.split("->");
- //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
- String interceptProcess = processList[0];
- int length = processList.length;
-
- //瀹氫箟褰撳墠宸ュ簭涓婁笅宸ュ簭
- String previousProcess = "";
- String nextProcess = "";
-
- //寰幆璇ユ祦绋嬪崱宸ヨ壓娴佺▼
- for (int i = 0; i < length; i++) {
- //褰撳埌褰撳墠宸ュ簭鏃�
- if (processList[i].equals(process)) {
- //鑾峰彇褰撳墠宸ュ簭鐨勪笂涓�閬撳伐搴�
- if (i - 1 < 0) {
- previousProcess = "";
- } else {
- previousProcess = processList[i - 1];
- }
- //鑾峰彇褰撳墠宸ュ簭鐨勪笅涓�閬撳伐搴�
- if (i + 1 > length - 1) {
- nextProcess = "";
- } else {
- nextProcess = processList[i + 1];
- }
- //鏌ヨ褰撳墠宸ュ簭鐨勮〃澶存暟鎹�
- map.put("data", reportingWorkMapper.AddSelectLastWorkMp(processIdStr, technologyStr, previousProcess, nextProcess, process));
- map.put("thisProcess", processList);
- break;
- }
- }
-
- //宸ヨ壓娴佺▼
- map.put("technologicalProcess", technologicalProcess);
-
- //璁惧涓嬫媺妗�
- map.put("device", reportingWorkMapper.SelectWorkBasicDeviceMp(process));
- //鐝粍涓嬫媺妗�
- map.put("teams", reportingWorkMapper.SelectWorkBasicTeamsMp(process));
-
- map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype"));
- map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason"));
-
- //鏌ヨ鏈伐搴忔姤宸ラ渶瑕佸摢鍑犲眰锛屼笂宸ュ簭鏄粈涔�
- String obtainTechnology = reportingWorkMapper.SelectWorkTechnologyMp(processIdStr);
-
- map.put("numberList", flowCardMapper.getGlassNumber(Integer.valueOf(technologyStr),processIdStr));
-
- //鍒ゆ柇鏈伐搴忔槸涓嶆槸绗竴閬撳伐搴�
- if (interceptProcess.equals(process)) {
- //鏄涓�閬撳伐搴忥紝鏌ヨ娴佺▼鍗℃暟鎹�
- map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr, technologyStr, process));
- } else {
- //涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
- List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process);
- if(process.equals("涓┖")){
- String orderId = processIdStr.substring(0,10);
- details.forEach( detail -> {
- Integer glassId = orderGlassDetailMapper.
- getMinIdByGroup(orderId,
- String.valueOf(detail.get("order_number")),
- String.valueOf(detail.get("group")));
- int listGlassId = Integer.parseInt(String.valueOf(detail.get("glassId")));
- if(listGlassId !=glassId){
- detail.put("rowClass","latter");
+ //寰幆璇ユ祦绋嬪崱宸ヨ壓娴佺▼
+ for (int i = 0; i < length; i++) {
+ //褰撳埌褰撳墠宸ュ簭鏃�
+ if (processList[i].equals(process)) {
+ //鑾峰彇褰撳墠宸ュ簭鐨勪笂涓�閬撳伐搴�
+ if (i - 1 < 0) {
+ previousProcess = "";
+ } else {
+ previousProcess = processList[i - 1];
}
- });
+ //鑾峰彇褰撳墠宸ュ簭鐨勪笅涓�閬撳伐搴�
+ if (i + 1 > length - 1) {
+ nextProcess = "";
+ } else {
+ nextProcess = processList[i + 1];
+ }
+ //鏌ヨ褰撳墠宸ュ簭鐨勮〃澶存暟鎹�
+ map.put("data", reportingWorkMapper.AddSelectLastWorkMp(processIdStr, technologyStr, previousProcess, nextProcess, process,reportType));
+ map.put("thisProcess", processList);
+ break;
+ }
}
+ //宸ヨ壓娴佺▼
+ map.put("technologicalProcess", technologicalProcess);
- map.put("Detail",details );
+ //璁惧涓嬫媺妗�
+ map.put("device", reportingWorkMapper.SelectWorkBasicDeviceMp(process));
+ //鐝粍涓嬫媺妗�
+ map.put("teams", reportingWorkMapper.SelectWorkBasicTeamsMp(process));
+
+ map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype"));
+ map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason"));
+
+ //鏌ヨ鏈伐搴忔姤宸ラ渶瑕佸摢鍑犲眰锛屼笂宸ュ簭鏄粈涔�
+ String obtainTechnology = reportingWorkMapper.SelectWorkTechnologyMp(processIdStr);
+
+ map.put("numberList", flowCardMapper.getGlassNumber(Integer.valueOf(technologyStr),processIdStr));
+
+ //鍒ゆ柇鏈伐搴忔槸涓嶆槸绗竴閬撳伐搴�
+ if (interceptProcess.equals(process)) {
+ //鏄涓�閬撳伐搴忥紝鏌ヨ娴佺▼鍗℃暟鎹�
+ map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr, technologyStr, process,reportType));
+ } else {
+ //涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
+ List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process,previousProcess);
+ if(process.equals("涓┖")){
+ String orderId = processIdStr.substring(0,10);
+ details.forEach( detail -> {
+ Integer glassId = orderGlassDetailMapper.
+ getMinIdByGroup(orderId,
+ String.valueOf(detail.get("order_number")),
+ String.valueOf(detail.get("group")));
+ int listGlassId = Integer.parseInt(String.valueOf(detail.get("glassId")));
+ if(listGlassId !=glassId){
+ detail.put("rowClass","latter");
+ }
+ });
+ }
+
+
+ map.put("Detail",details );
+ }
+
+ // 绗竴閬撳伐搴忥紙娴佺▼鍗℃暟+琛ョ墖鏁伴噺-瀹屽伐鏁�-娆＄牬鏁�-杩斿伐鏈畬鎴愭暟-绂佺敤鏁伴噺锛�
+
+ // 鍚庣画宸ュ簭锛堜笂宸ュ簭鎶ュ伐鏁�-瀹屽伐鏁�-娆＄牬鏁�-杩斿伐鏈畬鎴愭暟锛�
+
+ //鑾峰彇璇ユ祦绋嬪崱鍙峰巻鍙叉姤宸ュ伐搴�
+ String historyProcess = reportingWorkMapper.historyProcessMp(processIdStr);
+ //鍘嗗彶鎶ュ伐宸ュ簭璁惧
+ map.put("historyDevice", reportingWorkMapper.historyDeviceMp(historyProcess, process));
+ //鍘嗗彶鎶ュ伐宸ュ簭鐝粍
+ map.put("historyTeams", reportingWorkMapper.historyTeamsMp(processIdStr, process));
+ //鍘嗗彶宸ュ簭
+ map.put("historyProcess", reportingWorkMapper.SelectHistoryProcessMp(historyProcess, process));
}
- // 绗竴閬撳伐搴忥紙娴佺▼鍗℃暟+琛ョ墖鏁伴噺-瀹屽伐鏁�-娆＄牬鏁�-杩斿伐鏈畬鎴愭暟-绂佺敤鏁伴噺锛�
- // 鍚庣画宸ュ簭锛堜笂宸ュ簭鎶ュ伐鏁�-瀹屽伐鏁�-娆＄牬鏁�-杩斿伐鏈畬鎴愭暟锛�
-
- //鑾峰彇璇ユ祦绋嬪崱鍙峰巻鍙叉姤宸ュ伐搴�
- String historyProcess = reportingWorkMapper.historyProcessMp(processIdStr);
- //鍘嗗彶鎶ュ伐宸ュ簭璁惧
- map.put("historyDevice", reportingWorkMapper.historyDeviceMp(historyProcess, process));
- //鍘嗗彶鎶ュ伐宸ュ簭鐝粍
- map.put("historyTeams", reportingWorkMapper.historyTeamsMp(processIdStr, process));
- //鍘嗗彶宸ュ簭
- map.put("historyProcess", reportingWorkMapper.SelectHistoryProcessMp(historyProcess, process));
return map;
}
@@ -191,7 +199,8 @@
String formattedDate = dateFormat.format(currentDate);
String reportingWorkId = "BG" + formattedDate + formattedNumber;
reportingWork.setReportingWorkId(reportingWorkId);
- reportingWork.setProcessId(reportingWork.getProcessId().substring(0, 14));
+ String[] processIdStr = reportingWork.getProcessId().split("/");
+ reportingWork.setProcessId(processIdStr[0]);
int reviewState = (int) reportingWorkJson.get("type");
if (reviewState == 1) {
@@ -200,6 +209,8 @@
} else {
reportingWork.setReviewedState(0);
}
+
+ reportingWork.setNextProcess(orderProcessDetailMapper.selectNextProcess(processIdStr[0],processIdStr[1],reportingWork.getThisProcess()));
//涓昏〃鎻掑叆
reportingWorkMapper.insert(reportingWork);
//鍓〃寰幆鎻掑叆锛屽苟涓旀彃鍏ユ鐮翠俊鎭〃銆傚啀鏍规嵁娆＄牬淇℃伅淇敼璁㈠崟鐜荤拑娴佺▼琛ㄧ殑瀹屽伐鏁伴噺涓庡埡鐮存暟閲�
@@ -213,7 +224,7 @@
// reportingWork.setThisWornQuantity(
// reportingWork.getThisWornQuantity()+reportingWorkDetail.getBreakageQuantity());
-
+ int qualityInsStatus = (int) reportingWorkJson.get("qualityInsStatus");
reportingWorkDetail.setReportingWorkId(reportingWorkId);
List<DamageDetails> damageDetails = reportingWorkDetail.getDamageDetails();
//娆＄牬鏄庣粏琛ㄦ彃鍏ユ暟鎹�
@@ -223,7 +234,8 @@
damageDetail.setOrderNumber(reportingWorkDetail.getOrderNumber());
damageDetail.setProcessId(reportingWork.getProcessId());
damageDetail.setTechnologyNumber(reportingWorkDetail.getTechnologyNumber());
- if (!damageDetail.getResponsibleProcess().equals(reportingWork.getThisProcess())) {
+ //璺ㄥ伐搴忔鐮翠慨鏀硅川妫�鐘舵��
+ if (!damageDetail.getResponsibleProcess().equals(reportingWork.getThisProcess()) && qualityInsStatus==2) {
damageDetail.setQualityInsStatus(1);
}
damageDetailsMapper.insert(damageDetail);
@@ -264,6 +276,7 @@
//鍒ゆ柇鏄惁澶т簬褰撳墠鏁伴噺骞朵笖鎶涘嚭寮傚父
if (processNum < (reportingWorkDetail.getBreakageQuantity() + reportingWorkDetail.getCompletedQuantity())) {
+ System.out.println(processNum+"--"+reportingWorkDetail.getBreakageQuantity()+"--"+reportingWorkDetail.getCompletedQuantity());
Map<String, Object> map = new HashMap<>();
map.put("orderNumber", reportingWorkDetail.getOrderNumber());
map.put("technologyNumber", reportingWorkDetail.getOrderNumber());
@@ -325,20 +338,23 @@
String processId = reportingWork.get("processId");
String thisProcess = reportingWork.get("thisProcess");
+ String userName=reportingWork.get("userName");
int index = processId.lastIndexOf("/") + 1;
String result = processId.substring(index);
+ String technologyStr = reportingWork.get("technologyStr");
-if (thisProcess.equals("澶硅兌") || thisProcess.equals("涓┖") || thisProcess.equals("浠撳偍")){
+if (thisProcess.equals("澶硅兌") || thisProcess.equals("涓┖") || thisProcess.equals("鍖呰")){
LambdaUpdateWrapper
<ReportingWork> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper
.eq(ReportingWork::getProcessId, processId.substring(0, 14))
.eq(ReportingWork::getThisProcess, reportingWork.get("process"))
.eq(ReportingWork::getReviewedState, 0)
- .setSql("reviewed_state =1");
+ .setSql("reviewed_state =1")
+ .set(ReportingWork::getReviewed, userName);
reportingWorkMapper.update(null, updateWrapper);
}else {
- reportingWorkMapper.ReviewReportingWorkMp(processId.substring(0, 14),reportingWork.get("process"),result);
+ reportingWorkMapper.ReviewReportingWorkMp(processId.substring(0, 14),reportingWork.get("process"),technologyStr,userName);
}
return true;
@@ -426,6 +442,7 @@
.eq(ReportingWorkDetail::getReportingWorkId, reportingWork.getReportingWorkId()));
//鏇寸粏鎶ュ伐涓昏〃
+ int qualityInsStatus = (int) reportingWorkJson.get("qualityInsStatus");
reportingWorkMapper.updateById(reportingWork);
reportingWorkDetails.forEach(reportingWorkDetail -> {
reportingWorkDetail.setReportingWorkId(reportingWork.getReportingWorkId());
@@ -433,7 +450,11 @@
//姣忎竴鏉℃姤宸ユ暟鎹惊鐜彃鍏ユ鐮存槑缁嗚〃
if (damageDetails != null && !damageDetails.isEmpty()) {
damageDetails.forEach(damageDetail -> {
- if (!Objects.equals(reportingWork.getThisProcess(), damageDetail.getResponsibleProcess())) {
+ damageDetail.setReportingWorkId(reportingWork.getReportingWorkId());
+ damageDetail.setProcessId(reportingWork.getProcessId());
+ damageDetail.setOrderNumber(reportingWorkDetail.getOrderNumber());
+ damageDetail.setTechnologyNumber(reportingWorkDetail.getTechnologyNumber());
+ if (!Objects.equals(reportingWork.getThisProcess(), damageDetail.getResponsibleProcess()) && qualityInsStatus==2) {
damageDetail.setQualityInsStatus(1);
}
if (Objects.equals(reviewState, "review")) {
@@ -608,4 +629,117 @@
String count=reportingWorkMapper.getPatchConditionMp(reportingWorkId);
return count;
}
+ @Transactional(rollbackFor = Exception.class , noRollbackFor = ServiceException.class)
+ public Boolean mesReportingWorkSv(Map<String,Object> reportingWorkMap) {
+ //璁剧疆鍥炴粴鐐�
+ Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+ try{
+ //鎺ユ敹瑙ｆ瀽涓婚檮琛ㄤ俊鎭�
+ JSONObject reportingWorkJson = new JSONObject(reportingWorkMap);
+ ReportingWork reportingWork = JSONObject.parseObject(JSONObject.toJSONString(reportingWorkJson.get("title")), ReportingWork.class);
+ ReportingWorkDetail reportingWorkDetail =JSON.parseObject(JSONObject.toJSONString(reportingWorkJson.get("detail")), ReportingWorkDetail.class);
+ //鑾峰彇鍙姤鏁伴噺
+ int processNum = reportingWorkMapper.selectGlassProcessNum(
+ reportingWorkDetail.getOrderNumber(),
+ reportingWorkDetail.getTechnologyNumber(),
+ reportingWork.getProcessId(),
+ reportingWork.getThisProcess()
+ );
+ //鍒ゆ柇鏄惁澶т簬褰撳墠鏁伴噺骞朵笖鎶涘嚭寮傚父
+ if (processNum < (reportingWorkDetail.getBreakageQuantity() + reportingWorkDetail.getCompletedQuantity())) {
+ return false;
+ }
+ //鏌ヨ鎶ュ伐鏁版嵁
+ List<ReportingWork> ReportingWorks = reportingWorkMapper.selectJoinList(ReportingWork.class,
+ new MPJLambdaWrapper<ReportingWork>()
+ .select(ReportingWork::getReportingWorkId)
+ .leftJoin(ReportingWorkDetail.class, ReportingWorkDetail::getReportingWorkId, ReportingWork::getReportingWorkId)
+ .eq(ReportingWork::getProcessId,reportingWork.getProcessId())
+ .eq(ReportingWork::getThisProcess,reportingWork.getThisProcess())
+ .eq(ReportingWork::getDeviceName,reportingWork.getDeviceName())
+ .eq(ReportingWork::getReviewedState,0)//瀹℃牳鐘舵�佺瓑浜�0锛屾湭鍒犻櫎
+ .eq(ReportingWork::getThisWornQuantity,0)
+ .eq(ReportingWorkDetail::getTechnologyNumber,reportingWorkDetail.getTechnologyNumber())
+ .orderByDesc(ReportingWork::getId)
+
+ );
+
+
+ //鍒ゆ柇鎶ュ伐琛ㄦ槸鍚﹀瓨鍦紝涓嶅瓨鍦ㄥ垯鏂板鎶ュ伐涓诲壇琛ㄦ暟鎹紝瀛樺湪鍒欎慨鏀瑰壇琛ㄦ暟鎹�
+ if(ReportingWorks.isEmpty()){
+ //鑾峰彇褰撳墠鏈�澶ф姤宸ュ崟鍙风敓鎴愭姤宸ュ崟鍙�
+ String formattedNumber = String.format("%04d", reportingWorkMapper.selectMaxReportingWorkId() + 1);
+ //鏍煎紡鍖栧綋鍓嶆棩鏈�
+ Date currentDate = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
+ String formattedDate = dateFormat.format(currentDate);
+ String reportingWorkId = "BG" + formattedDate + formattedNumber;
+
+ reportingWork.setReportingWorkId(reportingWorkId);
+ reportingWorkDetail.setReportingWorkId(reportingWorkId);
+
+ reportingWorkMapper.insert(reportingWork);
+ reportingWorkDetailMapper.insert(reportingWorkDetail);
+ }else{
+
+ ReportingWorkDetail reportingWorkDetail1 = reportingWorkDetailMapper.selectOne(
+ new LambdaQueryWrapper<ReportingWorkDetail>()
+ .eq(ReportingWorkDetail::getReportingWorkId,ReportingWorks.get(0).getReportingWorkId())
+ .eq(ReportingWorkDetail::getOrderNumber,reportingWorkDetail.getOrderNumber())
+ .eq(ReportingWorkDetail::getTechnologyNumber,reportingWorkDetail.getTechnologyNumber())
+ );
+
+ if(reportingWorkDetail1 == null){
+ reportingWorkDetail.setReportingWorkId(ReportingWorks.get(0).getReportingWorkId());
+ reportingWorkDetailMapper.insert(reportingWorkDetail);
+ }else{
+ LambdaUpdateWrapper<ReportingWorkDetail> detailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ detailLambdaUpdateWrapper.eq(ReportingWorkDetail::getReportingWorkId, ReportingWorks.get(0).getReportingWorkId() )
+ .eq(ReportingWorkDetail::getOrderNumber,reportingWorkDetail.getOrderNumber())
+ .eq(ReportingWorkDetail::getTechnologyNumber,reportingWorkDetail.getTechnologyNumber())
+ .setSql("completed_quantity = completed_quantity+" + reportingWorkDetail.getCompletedQuantity());
+ reportingWorkDetailMapper.update(null, detailLambdaUpdateWrapper);
+ }
+
+
+
+
+ LambdaUpdateWrapper<ReportingWork> reportingWorkLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ reportingWorkLambdaUpdateWrapper
+ .eq(ReportingWork::getReportingWorkId, ReportingWorks.get(0).getReportingWorkId() )
+ .setSql("this_completed_quantity = this_completed_quantity+" + reportingWorkDetail.getCompletedQuantity());
+ reportingWorkMapper.update(null, reportingWorkLambdaUpdateWrapper);
+
+ }
+
+
+
+ OrderProcessDetail orderProcessDetail = new OrderProcessDetail();
+ orderProcessDetail.setBrokenNum(reportingWorkDetail.getBreakageQuantity());
+ orderProcessDetail.setReportingWorkNum(reportingWorkDetail.getCompletedQuantity());
+ orderProcessDetail.setReportingWorkNumCount(reportingWorkDetail.getCompletedQuantity());
+
+ //鏍规嵁璁㈠崟id锛岃鍗曞簭鍙凤紝浠ュ強灏忕墖搴忓彿 鏇存柊灏忕墖娴佺▼鐨勫畬宸ユ暟閲忎互鍙婂埡鐮存暟閲�
+ LambdaUpdateWrapper<OrderProcessDetail> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(OrderProcessDetail::getOrderNumber, reportingWorkDetail.getOrderNumber())
+ .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId().substring(0, 14))
+ .eq(OrderProcessDetail::getOrderId, reportingWork.getOrderId())
+ .eq(OrderProcessDetail::getProcess, reportingWork.getThisProcess())
+ .eq(OrderProcessDetail::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber())
+ .setSql("reporting_work_num_count = reporting_work_num_count +" + orderProcessDetail.getReportingWorkNum())
+ .setSql("reporting_work_num =reporting_work_num +" + orderProcessDetail.getReportingWorkNum());
+
+ orderProcessDetailMapper.update(null, updateWrapper);
+ return true;
+ } catch (Exception e) {
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ //灏嗗紓甯镐紶鍏ユ暟鎹簱
+ SysError sysError = new SysError();
+ sysError.setError(e +Arrays.toString(e.getStackTrace()));
+ sysError.setFunc("姹夌幓mes鎶ュ伐");
+ sysErrorService.insert(sysError);
+ throw new ServiceException(Constants.Code_500, "鏁版嵁璇锋眰寮傚父锛岃妫�鏌�");
+
+ }
+ }
}
--
Gitblit v1.8.0