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


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


@@ -334,6 +335,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");


@@ -345,10 +347,11 @@


                .eq(ReportingWork::getProcessId, processId.substring(0, 14))


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


                .eq(ReportingWork::getReviewedState, 0)


                .eq(ReportingWork::getReviewed, userName)


                .setSql("reviewed_state =1");


        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;