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 |  221 +++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 157 insertions(+), 64 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 881863c..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
@@ -24,7 +24,7 @@
 import com.example.erp.service.sd.OrderProcessDetailService;
 import com.example.erp.service.userInfo.LogService;
 import com.example.erp.service.userInfo.SysErrorService;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -81,6 +81,8 @@
 
     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,technologyStr);
 
@@ -124,38 +126,62 @@
             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));
+            map.put("numberList", flowCardMapper.getGlassNumber(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");
+                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 );
+                    }
                 }
-
-
-                map.put("Detail",details );
             }
 
             // 绗竴閬撳伐搴忥紙娴佺▼鍗℃暟+琛ョ墖鏁伴噺-瀹屽伐鏁�-娆$牬鏁�-杩斿伐鏈畬鎴愭暟-绂佺敤鏁伴噺锛�
@@ -171,15 +197,26 @@
             //鍘嗗彶宸ュ簭
             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;
     }
 
@@ -198,27 +235,26 @@
         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);
@@ -289,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())
@@ -297,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
@@ -333,21 +368,24 @@
 
         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");
-
+        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(processId.substring(0, 14),reportingWork.get("process"),technologyStr);
+    reportingWorkMapper.ReviewReportingWorkMp(processIdStr[0],reportingWork.get("process"),technologyStr,userName);
 
 }
         return true;
@@ -379,13 +417,16 @@
         });
 
         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;
 
     }
@@ -397,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"));
 
         //鑾峰彇璇ユ祦绋嬪崱鍙峰巻鍙叉姤宸ュ伐搴�
@@ -434,7 +476,8 @@
                 .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());
@@ -442,7 +485,12 @@
             //姣忎竴鏉℃姤宸ユ暟鎹惊鐜彃鍏ユ鐮存槑缁嗚〃
             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")) {
@@ -617,7 +665,7 @@
         String count=reportingWorkMapper.getPatchConditionMp(reportingWorkId);
         return count;
     }
-    @Transactional(rollbackFor = Exception.class , noRollbackFor = Error.class)
+    @Transactional(rollbackFor = Exception.class , noRollbackFor = ServiceException.class)
     public Boolean mesReportingWorkSv(Map<String,Object> reportingWorkMap) {
         //璁剧疆鍥炴粴鐐�
         Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
@@ -626,7 +674,7 @@
             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(),
@@ -635,24 +683,70 @@
             );
             //鍒ゆ柇鏄惁澶т簬褰撳墠鏁伴噺骞朵笖鎶涘嚭寮傚父
             if (processNum < (reportingWorkDetail.getBreakageQuantity() + reportingWorkDetail.getCompletedQuantity())) {
-                TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
-                throw new ServiceException(Constants.Code_600, "涓婂伐搴忓凡瀹屽伐鏁伴噺灏忎簬鏈伐搴忔姤宸ユ暟閲忥紝璇锋鏌�");
+                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)
+
+            );
 
 
-            //鑾峰彇褰撳墠鏈�澶ф姤宸ュ崟鍙风敓鎴愭姤宸ュ崟鍙�
-            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;
+            //鍒ゆ柇鎶ュ伐琛ㄦ槸鍚﹀瓨鍦紝涓嶅瓨鍦ㄥ垯鏂板鎶ュ伐涓诲壇琛ㄦ暟鎹紝瀛樺湪鍒欎慨鏀瑰壇琛ㄦ暟鎹�
+            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);
+                reportingWork.setReportingWorkId(reportingWorkId);
+                reportingWorkDetail.setReportingWorkId(reportingWorkId);
 
-            reportingWorkMapper.insert(reportingWork);
-            reportingWorkDetailMapper.insert(reportingWorkDetail);
+                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);
+
+            }
 
 
 
@@ -664,7 +758,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())
@@ -677,11 +771,10 @@
             TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
             //灏嗗紓甯镐紶鍏ユ暟鎹簱
             SysError sysError = new SysError();
-            sysError.setError(e +"\n"+Arrays.toString(e.getStackTrace()));
-            sysError.setFunc("saveOrder");
+            sysError.setError(e +Arrays.toString(e.getStackTrace()));
+            sysError.setFunc("姹夌幓mes鎶ュ伐");
             sysErrorService.insert(sysError);
-            //throw new ServiceException(Constants.Code_500, "鏁版嵁璇锋眰寮傚父锛岃妫�鏌�");
-            throw new Error();
+            throw new ServiceException(Constants.Code_500, "鏁版嵁璇锋眰寮傚父锛岃妫�鏌�");
 
         }
     }

--
Gitblit v1.8.0