From 27b3352a6a7f514c98cce083eded6c3bb9e3f519 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 15 一月 2025 10:50:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 539 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 405 insertions(+), 134 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 0e02dec..8eb9bba 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
@@ -5,24 +5,29 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.example.erp.common.Constants;
import com.example.erp.entity.pp.DamageDetails;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.entity.pp.ReportingWorkDetail;
import com.example.erp.entity.sd.Order;
-import com.example.erp.entity.sd.OrderDetail;
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;
+import com.example.erp.mapper.sd.OrderGlassDetailMapper;
import com.example.erp.mapper.sd.OrderMapper;
import com.example.erp.mapper.sd.OrderProcessDetailMapper;
+import com.example.erp.mapper.userInfo.LogMapper;
import com.example.erp.service.sd.OrderProcessDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.example.erp.service.userInfo.LogService;
+import com.example.erp.service.userInfo.SysErrorService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
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;
@@ -51,8 +56,15 @@
final
OrderProcessDetailService orderProcessDetailService;
+ final
+ LogService logService;
- public ReportingWorkService(ReportingWorkMapper reportingWorkMapper, BasicDateProduceMapper basicDateProduceMapper, DamageDetailsMapper damageDetailsMapper, ReportingWorkDetailMapper reportingWorkDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, OrderProcessDetailService orderProcessDetailService, OrderMapper orderMapper, FlowCardMapper flowCardMapper) {
+ 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, SysErrorService sysErrorService) {
this.reportingWorkMapper = reportingWorkMapper;
this.basicDateProduceMapper = basicDateProduceMapper;
this.damageDetailsMapper = damageDetailsMapper;
@@ -61,86 +73,150 @@
this.orderProcessDetailService = orderProcessDetailService;
this.orderMapper = orderMapper;
this.flowCardMapper = flowCardMapper;
+ 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 laminating = reportingWorkMapper.getProcessLaminating(process);
//鏌ヨ娴佺▼鍗″伐鑹烘祦绋�
- String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(processIdStr);
+ String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(processIdStr,technologyStr);
- //瀹氫箟-鐨勪綅缃�
- int index = technologicalProcess.indexOf("-");
- //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
- String interceptProcess = technologicalProcess.substring(0, index);
- String[] processList = technologicalProcess.split("->");
- int length = processList.length;
+ if (technologicalProcess!=null || !technologicalProcess.equals("")){
+ String[] processList = technologicalProcess.split("->");
+ //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
+ String interceptProcess = processList[0];
+ int length = processList.length;
- //瀹氫箟褰撳墠宸ュ簭涓婁笅宸ュ簭
- String previousProcess = "";
- String nextProcess = "";
+ //瀹氫箟褰撳墠宸ュ簭涓婁笅宸ュ簭
+ 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];
+ //寰幆璇ユ祦绋嬪崱宸ヨ壓娴佺▼
+ 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;
}
- //鑾峰彇褰撳墠宸ュ簭鐨勪笅涓�閬撳伐搴�
- 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(technologyStr,processIdStr));
+
+ //鍒ゆ柇鏈伐搴忔槸涓嶆槸绗竴閬撳伐搴�
+ if (interceptProcess.equals(process)) {
+ //鏄涓�閬撳伐搴忥紝鏌ヨ娴佺▼鍗℃暟鎹�
+ map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr, technologyStr, process,reportType));
+ } else {
+ ReportingWork retrievedData = (ReportingWork) map.get("data");
+ if (retrievedData!=null){
+ Integer reviewedState = retrievedData.getReviewedState();
+ //鏍规嵁瀹℃牳鐘舵�佹煡璇㈡湭瀹℃牳鏁版嵁
+ if (reviewedState==1){//宸插鏍�
+ //涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
+ List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process,previousProcess,laminating);
+ if(process.equals("涓┖")){
+ //鑾峰彇璇ユ祦绋嬪崱璁㈠崟鍙�
+ String orderId = reportingWorkMapper.selectOrderid(processIdStr);
+ 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 );
+ }else {
+ //涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
+ List<Map<String,String>> details = reportingWorkMapper.SelectReworlDetailMpReview(processIdStr, technologyStr, process,previousProcess,laminating);
+ if(process.equals("涓┖")){
+ String orderId = reportingWorkMapper.selectOrderid(processIdStr);
+ 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));
}
-
- //璁惧涓嬫媺妗�
- 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);
-
- //鍒ゆ柇鏈伐搴忔槸涓嶆槸绗竴閬撳伐搴�
- if (interceptProcess.equals(process)) {
- //鏄涓�閬撳伐搴忥紝鏌ヨ娴佺▼鍗℃暟鎹�
- map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr, technologyStr, process));
- } else {
- //涓嶆槸绗竴閬撳伐搴忥紝鏌ヨ鎶ュ伐鏁版嵁
- map.put("Detail", reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, 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;
}
//鏌ヨ宸ュ簭
- public Map<String, Object> SelectProcessSv() {
+ public Map<String, Object> SelectProcessSv(String userId) {
Map<String, Object> map = new HashMap<>();
- map.put("process", reportingWorkMapper.SelectProcessMp());
+ String process = reportingWorkMapper.selectUserProcess(userId);
+ if (process==null) {
+ map.put("process", reportingWorkMapper.SelectProcessMp());
+ }
+ else {
+ //瀵规寚瀹氬伐搴忓崟鐙煡璇�
+ if (process.equals("澶硅兌")){
+ map.put("process",reportingWorkMapper.getSelectProcessJiajiao() );
+ }
+ if (process.equals("鎶�鏈儴澶氭洸")){
+ map.put("process",reportingWorkMapper.getSelectProcessDuoqu() );
+ }
+ }
+
return map;
}
@@ -159,29 +235,28 @@
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) {
+ if (reviewState == 1) {//瀹℃牳閫氳繃
reportingWork.setReviewed(reportingWork.getCreator());
reportingWork.setReviewedState(1);
} else {
reportingWork.setReviewedState(0);
}
+ if(reportingWork.getReportingWorkTime()==null){
+ LocalDateTime localDateTime = LocalDateTime.now();
+ reportingWork.setReportingWorkTime(localDateTime);
+ }
+
+ reportingWork.setNextProcess(orderProcessDetailMapper.selectNextProcess(processIdStr[0],processIdStr[1],reportingWork.getThisProcess()));
//涓昏〃鎻掑叆
reportingWorkMapper.insert(reportingWork);
//鍓〃寰幆鎻掑叆锛屽苟涓旀彃鍏ユ鐮翠俊鎭〃銆傚啀鏍规嵁娆＄牬淇℃伅淇敼璁㈠崟鐜荤拑娴佺▼琛ㄧ殑瀹屽伐鏁伴噺涓庡埡鐮存暟閲�
reportingWorkDetails.forEach(reportingWorkDetail -> {
-// reportingWork.setThisProcessQuantity(
-// reportingWork.getThisProcessQuantity()
-// +reportingWorkDetail.getCompletedQuantity()
-// +reportingWorkDetail.getBreakageQuantity());
-// reportingWork.setThisCompletedQuantity(
-// reportingWork.getThisCompletedQuantity()+reportingWorkDetail.getCompletedQuantity());
-// reportingWork.setThisWornQuantity(
-// reportingWork.getThisWornQuantity()+reportingWorkDetail.getBreakageQuantity());
-
+ int qualityInsStatus = (int) reportingWorkJson.get("qualityInsStatus");
reportingWorkDetail.setReportingWorkId(reportingWorkId);
List<DamageDetails> damageDetails = reportingWorkDetail.getDamageDetails();
//娆＄牬鏄庣粏琛ㄦ彃鍏ユ暟鎹�
@@ -191,18 +266,26 @@
damageDetail.setOrderNumber(reportingWorkDetail.getOrderNumber());
damageDetail.setProcessId(reportingWork.getProcessId());
damageDetail.setTechnologyNumber(reportingWorkDetail.getTechnologyNumber());
- if (damageDetail.getResponsibleProcess() != reportingWork.getThisProcess()) {
+ //璺ㄥ伐搴忔鐮翠慨鏀硅川妫�鐘舵��
+ if (!damageDetail.getResponsibleProcess().equals(reportingWork.getThisProcess()) && qualityInsStatus==2) {
damageDetail.setQualityInsStatus(1);
}
damageDetailsMapper.insert(damageDetail);
});
}
//鏌ヨ娴佺▼鍗″伐鑹烘祦绋�
- String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(reportingWork.getProcessId());
+ String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(reportingWork.getProcessId(), reportingWorkDetail.getTechnologyNumber());
int index = technologicalProcess.indexOf("-");
- //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
- String interceptProcess = technologicalProcess.substring(0, index);
+ String interceptProcess = "";
+ if (index <0){
+ interceptProcess = technologicalProcess;
+ }
+ else {
+ //鑾峰彇宸ヨ壓娴佺▼绗竴涓伐搴�
+ interceptProcess = technologicalProcess.substring(0, index);
+ }
+
//鍒ゆ柇褰撳墠宸ュ簭鏄惁涓虹涓�閬撳伐搴忓伐搴忥紝浣跨敤娴佺▼鍗¤〃鏁伴噺鎴栬�呭皬鐗囨祦绋嬭〃涓婂伐搴忔暟閲�
int processNum = 0;
@@ -242,7 +325,7 @@
//鏍规嵁璁㈠崟id锛岃鍗曞簭鍙凤紝浠ュ強灏忕墖搴忓彿 鏇存柊灏忕墖娴佺▼鐨勫畬宸ユ暟閲忎互鍙婂埡鐮存暟閲�
LambdaUpdateWrapper<OrderProcessDetail> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(OrderProcessDetail::getOrderNumber, reportingWorkDetail.getOrderNumber())
- .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId().substring(0, 14))
+ .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId())
.eq(OrderProcessDetail::getOrderId, reportingWork.getOrderId())
.eq(OrderProcessDetail::getProcess, reportingWork.getThisProcess())
.eq(OrderProcessDetail::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber())
@@ -250,14 +333,13 @@
.setSql("reporting_work_num =reporting_work_num +" + orderProcessDetail.getReportingWorkNum())
.setSql("broken_num =broken_num +" + orderProcessDetail.getBrokenNum());
orderProcessDetailMapper.update(null, updateWrapper);
-
//鍒ゆ柇瀹屽伐鏁伴噺鍜屽埡鐮存暟閲忔槸鍚︿负0锛屼负0鍒欎笉鎻掑叆鍒版暟鎹簱
if (!(reportingWorkDetail.getCompletedQuantity() == 0 && reportingWorkDetail.getBreakageQuantity() == 0)) {
reportingWorkDetailMapper.insert(reportingWorkDetail);
}
//鏇存柊娴佺▼鍗¤〃鐨勬姤宸ユ暟閲�
- if (Objects.equals(reportingWork.getNextProcess(), "")) {
+ if (Objects.equals(reportingWork.getNextProcess(), "")|| Objects.equals(reportingWork.getNextProcess(), null)) {
LambdaUpdateWrapper<FlowCard> flowCardLambdaUpdateWrapper =
new LambdaUpdateWrapper<>();
flowCardLambdaUpdateWrapper
@@ -271,6 +353,13 @@
});
+ //淇濆瓨鏃ュ織
+ Log log = new Log();
+ log.setContent(reportingWorkMap.toString());
+ log.setFunction("saveReportingWork鎶ュ伐鏂板");
+ log.setOperatorId((String) reportingWorkJson.get("userId"));
+ log.setOperator((String) reportingWorkJson.get("userName"));
+ logService.saveLog(log);
return true;
}
@@ -278,17 +367,27 @@
public boolean ReviewReportingWorkSv(Map<String, String> reportingWork) {
String processId = reportingWork.get("processId");
-
- LambdaUpdateWrapper
+ 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");
+ String[] processIdStr = processId.split("/");
+//鍚堢墖宸ュ簭
+if (thisProcess.equals("澶硅兌") || thisProcess.equals("涓┖") || thisProcess.equals("鍖呰")){
+ LambdaUpdateWrapper
<ReportingWork> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper
- .eq(ReportingWork::getProcessId, processId.substring(0, 14))
+ .eq(ReportingWork::getProcessId, processIdStr[0])
.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(processIdStr[0],reportingWork.get("process"),technologyStr,userName);
-
+}
return true;
}
@@ -303,6 +402,8 @@
.eq(Order::getOrderId, reportingWork.getOrderId())));
reportingWork.setFlowCard(new FlowCard());
+
+
List<Map<String, Object>> reportingWorkDetails = reportingWorkMapper.selectByReportingWorkId(reportingWorkId, reportingWork.getNextProcess());
reportingWorkDetails.forEach(reportingWorkDetail -> {
List<DamageDetails> damageDetailsList = new ArrayList<>();
@@ -312,15 +413,20 @@
.eq(DamageDetails::getTechnologyNumber, reportingWorkDetail.get("technology_number"))
);
reportingWorkDetail.put("damageDetails", damageDetailsList);
+
});
-
Map<String, Object> map = new HashMap<>();
+ //鎶ュ伐涓昏〃
map.put("reportingWork", reportingWork);
+ //鎶ュ伐鏄庣粏
map.put("reportingWorkDetails", reportingWorkDetails);
+ //鎶ュ伐涓嬫媺妗嗘暟鎹�
map.put("basic", getReportingWorkBase(reportingWork.getProcessId(), reportingWork.getThisProcess()));
-
-
+ //鏍规嵁鎶ュ伐缂栧彿鑾峰彇灞�
+ map.put("layer", reportingWorkMapper.selectLayerByReportingWorkId(reportingWorkId));
+ map.put("numberList", flowCardMapper.getGlassNumber(reportingWorkMapper.selectLayerByReportingWorkId(reportingWorkId),reportingWork.getProcessId()));
+ map.put("title", "琛ョ墖鐘舵��");
return map;
}
@@ -332,8 +438,9 @@
map.put("deviceType", reportingWorkMapper.SelectWorkBasicDeviceMp(thisProcess));
//鐝粍涓嬫媺妗�
map.put("teamsType", reportingWorkMapper.SelectWorkBasicTeamsMp(thisProcess));
-
+ //娆＄牬绫诲瀷
map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype"));
+ //娆＄牬鍘熷洜
map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason"));
//鑾峰彇璇ユ祦绋嬪崱鍙峰巻鍙叉姤宸ュ伐搴�
@@ -356,6 +463,7 @@
JSONObject reportingWorkJson = new JSONObject(reportingWorkMap);
ReportingWork reportingWork = JSONObject.parseObject(JSONObject.toJSONString(reportingWorkJson.get("title")), ReportingWork.class);
List<ReportingWorkDetail> reportingWorkDetails = JSONArray.parseArray(JSONObject.toJSONString(reportingWorkJson.get("detail")), ReportingWorkDetail.class);
+
//鍒犻櫎鍒虹牬鏄庣粏琛ㄥ埡鐮存暟鎹�
damageDetailsMapper.delete(
new LambdaQueryWrapper<DamageDetails>()
@@ -368,14 +476,21 @@
.delete(new LambdaQueryWrapper<ReportingWorkDetail>()
.eq(ReportingWorkDetail::getReportingWorkId, reportingWork.getReportingWorkId()));
- //鏇寸粏鎶ュ伐涓昏〃
+ //鏇存柊鎶ュ伐涓昏〃
+ int qualityInsStatus = (int) reportingWorkJson.get("qualityInsStatus");
reportingWorkMapper.updateById(reportingWork);
reportingWorkDetails.forEach(reportingWorkDetail -> {
+ reportingWorkDetail.setReportingWorkId(reportingWork.getReportingWorkId());
List<DamageDetails> damageDetails = reportingWorkDetail.getDamageDetails();
//姣忎竴鏉℃姤宸ユ暟鎹惊鐜彃鍏ユ鐮存槑缁嗚〃
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")) {
@@ -387,6 +502,14 @@
}
//鎻掑叆鎶ュ伐鏁版嵁
reportingWorkDetailMapper.insert(reportingWorkDetail);
+ orderProcessDetailMapper.insertByReportingWorkDetail(reportingWorkDetail,reportingWork.getProcessId(),reportingWork.getThisProcess());
+ //淇敼鍖呰鏃朵慨鏀瑰簱瀛樻暟閲�
+ if (reportingWork.getNextProcess()==null || reportingWork.getNextProcess().isEmpty()){
+ //鑾峰彇璇ユ姤宸ヤ慨鏀瑰悗鐨勫彲鍏ュ簱鏁伴噺
+ Integer inventory = reportingWorkDetailMapper.selectInventory(reportingWork.getProcessId(),Integer.parseInt(reportingWorkDetail.getOrderNumber()),Integer.parseInt(reportingWorkDetail.getTechnologyNumber()),reportingWork.getThisProcess());
+ //淇敼娴佺▼鍗¤〃搴撳瓨鏁伴噺
+ flowCardMapper.updateInventory(reportingWork.getProcessId(),reportingWorkDetail.getOrderNumber(),reportingWorkDetail.getTechnologyNumber(),inventory);
+ }
});
//鑾峰彇璐ㄦ鏃堕棿
if (Objects.equals(reviewState, "review")) {
@@ -397,7 +520,15 @@
}
//淇敼灏忕墖娴佺▼琛ㄦ暟閲忎负鎶ュ伐鏄庣粏琛ㄦ暟閲�
- orderProcessDetailMapper.updateQuantity(reportingWork.getReportingWorkId(), reportingWork.getThisProcess(), "add");
+ //orderProcessDetailMapper.updateQuantity(reportingWork.getReportingWorkId(), reportingWork.getThisProcess(), "add");
+ //淇濆瓨鏃ュ織
+ Log log = new Log();
+ log.setContent(reportingWorkMap.toString());
+ log.setFunction("updateReportingWork鎶ュ伐淇敼");
+ log.setOperatorId((String) reportingWorkJson.get("userId"));
+ log.setOperator((String) reportingWorkJson.get("userName"));
+ logService.saveLog(log);
+
return true;
}
@@ -414,7 +545,7 @@
}
//鍒犻櫎鎶ュ伐
- public Boolean deleteWorkSv(String reportingWorkId, String processId, String thisProcess) {
+ public Boolean deleteWorkSv(String reportingWorkId, String processId, String thisProcess, String userId, String userName) {
if (!reportingWorkId.isEmpty() && !processId.isEmpty() && !thisProcess.isEmpty()) {
//鑾峰彇褰撳墠鎶ュ伐缂栧彿涓嬪伐搴�
String nextProcess = reportingWorkMapper.selectNextProcess(reportingWorkId);
@@ -422,54 +553,76 @@
Integer count = reportingWorkMapper.selectCountByProcessId(processId, nextProcess);
//鑾峰彇鏈�鍚庝竴閬撳伐搴�
String lastProcess = reportingWorkMapper.selectLastProcess(processId);
- //鍒ゆ柇鏄惁鏄叆搴撳伐搴�
- if (lastProcess.equals(thisProcess)) {//鏄叆搴撳伐搴�
- //鏌ヨ璇ユ祦绋嬪崱鏁伴噺銆佸彲鍏ュ簱鏁伴噺銆佸凡鍏ュ簱鏁伴噺
- Map<String, Object> list = reportingWorkMapper.selectReceiptQuantity(processId);
- if (list.get("quantity") == list.get("receiptQuantity")) {
- return false;
- } else {
- //杞崲绫诲瀷:宸插叆搴撴暟閲�
- Integer receiptQuantity = Integer.parseInt(list.get("receivedQuantity").toString());
- //杞崲绫诲瀷:鍙叆搴撴暟閲�
- Integer inventoryQuantity = Integer.parseInt(list.get("inventoryQuantity").toString());
- //鏌ヨ璇ユ姤宸ョ紪鍙锋湰宸ュ簭瀹屽伐鏁伴噺
- Integer completedQuantity = reportingWorkMapper.selectCompletedQuantity(reportingWorkId);
- //褰撹宸ュ簭瀹屽伐鏁伴噺灏忎簬绛変簬宸插叆搴撴暟閲忔椂
- //鍙叆搴撴暟閲�-宸插叆搴撴暟閲�>=鎶ュ伐缂栧彿鏈伐搴忓畬宸ユ暟閲�
- if (inventoryQuantity - receiptQuantity >= completedQuantity) {
+ //鑾峰彇鏄惁鏈夊凡琛ョ墖鎴栬繑宸�
+ Integer countStates= Integer.valueOf(reportingWorkMapper.getPatchConditionMp(reportingWorkId));
+ //鍒ゆ柇鏄惁鏈夎ˉ鐗囪繑宸ユ暟鎹�
+ if (countStates==0){
+ //鍒ゆ柇鏄惁鏄叆搴撳伐搴�
+ if (lastProcess.equals(thisProcess)) {//鏄叆搴撳伐搴�
+ //鏌ヨ璇ユ祦绋嬪崱鏁伴噺銆佸彲鍏ュ簱鏁伴噺銆佸凡鍏ュ簱鏁伴噺
+ Map<String, Object> list = reportingWorkMapper.selectReceiptQuantity(processId);
+ if (list.get("quantity") == list.get("receiptQuantity")) {
+ return false;
+ } else {
+ //杞崲绫诲瀷:宸插叆搴撴暟閲�
+ Integer receiptQuantity = Integer.parseInt(list.get("receivedQuantity").toString());
+ //杞崲绫诲瀷:鍙叆搴撴暟閲�
+ Integer inventoryQuantity = Integer.parseInt(list.get("inventoryQuantity").toString());
+ //鏌ヨ璇ユ姤宸ョ紪鍙锋湰宸ュ簭瀹屽伐鏁伴噺
+ Integer completedQuantity = reportingWorkMapper.selectCompletedQuantity(reportingWorkId);
+ //褰撹宸ュ簭瀹屽伐鏁伴噺灏忎簬绛変簬宸插叆搴撴暟閲忔椂
+ //鍙叆搴撴暟閲�-宸插叆搴撴暟閲�>=鎶ュ伐缂栧彿鏈伐搴忓畬宸ユ暟閲�
+ if (inventoryQuantity - receiptQuantity >= completedQuantity) {
+ //鏌ヨ褰撳墠鎶ュ伐缂栧彿瀹屽伐娆＄牬鏁伴噺鐨勬暟鎹�
+ List<Map<String, Object>> workDateList = reportingWorkMapper.reportingWorkDate(reportingWorkId);
+ for (Map<String, Object> item : workDateList) {
+ //鏇存柊娴佺▼鍗″彲鍏ュ簱鏁伴噺
+ reportingWorkMapper.updateInventoryQuantity(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"));
+ //鏇存柊鎶ュ伐娴佺▼琛ㄦ暟鎹�
+ reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
+ }
+ //鍒犻櫎鎶ュ伐锛屽皢瀹℃牳鐘舵�佹敼涓�-1
+ reportingWorkMapper.deleteWork(reportingWorkId);
+ //淇濆瓨鏃ュ織
+ Log log = new Log();
+ log.setContent(reportingWorkId+"-"+processId+"-"+thisProcess);
+ log.setFunction("deleteWork鎶ュ伐鍏ュ簱鍒犻櫎");
+ log.setOperatorId(userId);
+ log.setOperator(userName);
+ logService.saveLog(log);
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ } else {//涓嶆槸鍏ュ簱宸ュ簭
+ if (count == 0) {
//鏌ヨ褰撳墠鎶ュ伐缂栧彿瀹屽伐娆＄牬鏁伴噺鐨勬暟鎹�
List<Map<String, Object>> workDateList = reportingWorkMapper.reportingWorkDate(reportingWorkId);
for (Map<String, Object> item : workDateList) {
- //鏇存柊娴佺▼鍗″彲鍏ュ簱鏁伴噺
- reportingWorkMapper.updateInventoryQuantity(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"));
//鏇存柊鎶ュ伐娴佺▼琛ㄦ暟鎹�
reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
}
//鍒犻櫎鎶ュ伐锛屽皢瀹℃牳鐘舵�佹敼涓�-1
reportingWorkMapper.deleteWork(reportingWorkId);
+
+ //淇濆瓨鏃ュ織
+ Log log = new Log();
+ log.setContent(reportingWorkId+"-"+processId+"-"+thisProcess);
+ log.setFunction("deleteWork鎶ュ伐鍒犻櫎");
+ log.setOperatorId(userId);
+ log.setOperator(userName);
+ logService.saveLog(log);
return true;
} else {
return false;
}
}
-
- } else {//涓嶆槸鍏ュ簱宸ュ簭
- if (count == 0) {
- //鏌ヨ褰撳墠鎶ュ伐缂栧彿瀹屽伐娆＄牬鏁伴噺鐨勬暟鎹�
- List<Map<String, Object>> workDateList = reportingWorkMapper.reportingWorkDate(reportingWorkId);
- for (Map<String, Object> item : workDateList) {
- //鏇存柊鎶ュ伐娴佺▼琛ㄦ暟鎹�
- reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
- }
- //鍒犻櫎鎶ュ伐锛屽皢瀹℃牳鐘舵�佹敼涓�-1
- reportingWorkMapper.deleteWork(reportingWorkId);
- return true;
- } else {
- return false;
- }
}
-
+ else {
+ return false;
+ }
} else {
return false;
@@ -507,4 +660,122 @@
return map;
}
+
+ public String getPatchConditionSv(String reportingWorkId) {
+ 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())
+ .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