blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2025-03-21 b8982b86a15d186c4cf6144fface700d9769fa95 
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java


@@ -30,6 +30,7 @@


import org.springframework.transaction.interceptor.TransactionAspectSupport;




import java.text.SimpleDateFormat;


import java.time.LocalDate;


import java.time.LocalDateTime;


import java.util.*;




@@ -249,6 +250,8 @@


            LocalDateTime localDateTime = LocalDateTime.now();


            reportingWork.setReportingWorkTime(localDateTime);


        }


        //是否线补 1现补 0未现补


        int isPatch = (reportingWorkJson.get("isPatch") != null) ? (int) reportingWorkJson.get("isPatch") : 0;




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


        //主表插入


@@ -269,6 +272,9 @@


                    //跨工序次破修改质检状态


                    if (!damageDetail.getResponsibleProcess().equals(reportingWork.getThisProcess()) && qualityInsStatus==2) {


                        damageDetail.setQualityInsStatus(1);


                    }


                    if (isPatch == 1){


                        damageDetail.setQualityInsStatus(2);


                    }


                    damageDetailsMapper.insert(damageDetail);


                });


@@ -322,18 +328,22 @@


            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())


                    .setSql("update_time = now()")


                    .setSql("broken_num =broken_num +" + orderProcessDetail.getBrokenNum());


            orderProcessDetailMapper.update(null, updateWrapper);




            if (isPatch == 0){//未现补


                //根据订单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())


                        .setSql("update_time = now()")


                        .setSql("broken_num =broken_num +" + orderProcessDetail.getBrokenNum());


                orderProcessDetailMapper.update(null, updateWrapper);


            }




            //判断完工数量和刺破数量是否为0，为0则不插入到数据库


            if (!(reportingWorkDetail.getCompletedQuantity() == 0 && reportingWorkDetail.getBreakageQuantity() == 0)) {


                reportingWorkDetailMapper.insert(reportingWorkDetail);


@@ -374,8 +384,11 @@


        String result = processId.substring(index);


        String technologyStr = reportingWork.get("technologyStr");


        String[] processIdStr = processId.split("/");


        String nowDate = LocalDate.now().toString();


        //获取报工工序是否为复合工程


        String laminating = reportingWorkMapper.getProcessLaminating(thisProcess);


//合片工序


if (thisProcess.equals("夹胶") || thisProcess.equals("中空") || thisProcess.equals("包装")){


if (laminating.equals("laminating")){


    LambdaUpdateWrapper


                <ReportingWork> updateWrapper = new LambdaUpdateWrapper<>();


        updateWrapper


@@ -383,7 +396,8 @@


                .eq(ReportingWork::getThisProcess, reportingWork.get("process"))


                .eq(ReportingWork::getReviewedState, 0)


                .setSql("reviewed_state =1")


                .set(ReportingWork::getReviewed, userName);


                .set(ReportingWork::getReviewed, userName)


                .set(ReportingWork::getExamineTime, nowDate);


        reportingWorkMapper.update(null, updateWrapper);


}else {


    reportingWorkMapper.ReviewReportingWorkMp(processIdStr[0],reportingWork.get("process"),technologyStr,userName);


@@ -542,6 +556,7 @@


        Map<String, Object> map = new HashMap<>();


        map.put("data", reportingWorkMapper.selectReportingWorkMp(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));


        map.put("total", reportingWorkMapper.getPageTotal(offset, pageSize, selectTime1, selectTime2, orderId, reportingWork));


        map.put("footSum" ,reportingWorkMapper.getFootSum(selectTime1, selectTime2, orderId,reportingWork));


        return map;


    }