blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2024-09-13 be8a84dd3610443ebc82a9c75f888920b882bf01 
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java


@@ -24,6 +24,7 @@


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;


@@ -198,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) {


@@ -207,6 +209,8 @@


        } else {


            reportingWork.setReviewedState(0);


        }




        reportingWork.setNextProcess(orderProcessDetailMapper.selectNextProcess(processIdStr[0],processIdStr[1],reportingWork.getThisProcess()));


        //主表插入


        reportingWorkMapper.insert(reportingWork);


        //副表循环插入，并且插入次破信息表。再根据次破信息修改订单玻璃流程表的完工数量与刺破数量


@@ -272,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());


@@ -333,6 +338,7 @@




        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");


@@ -344,10 +350,11 @@


                .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"),technologyStr);


    reportingWorkMapper.ReviewReportingWorkMp(processId.substring(0, 14),reportingWork.get("process"),technologyStr,userName);




}


        return true;


@@ -435,6 +442,7 @@


                        .eq(ReportingWorkDetail::getReportingWorkId, reportingWork.getReportingWorkId()));




        //更细报工主表


        int qualityInsStatus = (int) reportingWorkJson.get("qualityInsStatus");


        reportingWorkMapper.updateById(reportingWork);


        reportingWorkDetails.forEach(reportingWorkDetail -> {


            reportingWorkDetail.setReportingWorkId(reportingWork.getReportingWorkId());


@@ -442,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")) {


@@ -617,7 +629,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 +638,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 +647,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);




            }








@@ -677,11 +735,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, "数据请求异常，请检查");




        }


    }