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


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


@@ -208,6 +209,8 @@


        } else {


            reportingWork.setReviewedState(0);


        }




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


        //主表插入


        reportingWorkMapper.insert(reportingWork);


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


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


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


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