blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2024-09-06 10a26b9b670efef0a2adba675c794c539846aa3c 
 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,8 +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;


@@ -57,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;


@@ -71,6 +77,7 @@


        this.logService = logService;


        this.logMapper = logMapper;


        this.orderGlassDetailMapper = orderGlassDetailMapper;


        this.sysErrorService = sysErrorService;


    }




    public Map<String, Object> AddSelectLastWorkSv(String processIdStr, String technologyStr, String process, String reportType) {


@@ -266,6 +273,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());


@@ -327,20 +335,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;


@@ -428,6 +439,7 @@


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




        //更细报工主表


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


        reportingWorkMapper.updateById(reportingWork);


        reportingWorkDetails.forEach(reportingWorkDetail -> {


            reportingWorkDetail.setReportingWorkId(reportingWork.getReportingWorkId());


@@ -435,7 +447,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")) {


@@ -610,4 +626,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, "数据请求异常，请检查");




        }


    }


}