blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyuji
2025-03-05 28ade00fd79eb601de0bc7404cc85d7eb51ffe27 
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java


@@ -149,7 +149,8 @@


                        //不是第一道工序，查询报工数据


                        List<Map<String,String>>  details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process,previousProcess,laminating);


                        if(process.equals("中空")){


                            String orderId = processIdStr.substring(0,10);


                            //获取该流程卡订单号


                            String orderId = reportingWorkMapper.selectOrderid(processIdStr);


                            details.forEach( detail -> {


                                Integer glassId = orderGlassDetailMapper.


                                        getMinIdByGroup(orderId,


@@ -166,7 +167,7 @@


                        //不是第一道工序，查询报工数据


                        List<Map<String,String>>  details = reportingWorkMapper.SelectReworlDetailMpReview(processIdStr, technologyStr, process,previousProcess,laminating);


                        if(process.equals("中空")){


                            String orderId = processIdStr.substring(0,10);


                            String orderId = reportingWorkMapper.selectOrderid(processIdStr);


                            details.forEach( detail -> {


                                Integer glassId = orderGlassDetailMapper.


                                        getMinIdByGroup(orderId,


@@ -244,6 +245,12 @@


        } else {


            reportingWork.setReviewedState(0);


        }


        if(reportingWork.getReportingWorkTime()==null){


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


        //主表插入


@@ -317,17 +324,21 @@


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


                    .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)) {


@@ -368,19 +379,20 @@


        int index = processId.lastIndexOf("/") + 1;


        String result = processId.substring(index);


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


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


//合片工序


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


    LambdaUpdateWrapper


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


        updateWrapper


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


                .eq(ReportingWork::getProcessId, processIdStr[0])


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


                .eq(ReportingWork::getReviewedState, 0)


                .setSql("reviewed_state =1")


                .set(ReportingWork::getReviewed, userName);


        reportingWorkMapper.update(null, updateWrapper);


}else {


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


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




}


        return true;


@@ -536,6 +548,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;


    }




@@ -669,13 +682,38 @@


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




            //查询流程卡工艺流程


            String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(reportingWork.getProcessId(), reportingWorkDetail.getTechnologyNumber());




            int index = technologicalProcess.indexOf("-");


            String interceptProcess = "";


            if (index <0){


                interceptProcess = technologicalProcess;


            }


            else {


                //获取工艺流程第一个工序


                interceptProcess = technologicalProcess.substring(0, index);


            }


            int processNum =0;


            if (interceptProcess.equals(reportingWork.getThisProcess())) {


                processNum = reportingWorkMapper.selectFlowCardNum(


                        reportingWorkDetail.getOrderNumber(),


                        reportingWorkDetail.getTechnologyNumber(),


                        reportingWork.getProcessId(),


                        reportingWork.getThisProcess()


                );


            }else{


                 processNum = reportingWorkMapper.selectGlassProcessNum(


                        reportingWorkDetail.getOrderNumber(),


                        reportingWorkDetail.getTechnologyNumber(),


                        reportingWork.getProcessId(),


                        reportingWork.getThisProcess()


                );


            }




            //获取可报数量


            int processNum = reportingWorkMapper.selectGlassProcessNum(


                    reportingWorkDetail.getOrderNumber(),


                    reportingWorkDetail.getTechnologyNumber(),


                    reportingWork.getProcessId(),


                    reportingWork.getThisProcess()


            );




            //判断是否大于当前数量并且抛出异常


            if (processNum < (reportingWorkDetail.getBreakageQuantity() + reportingWorkDetail.getCompletedQuantity())) {


                return false;


@@ -753,7 +791,7 @@


            //根据订单id，订单序号，以及小片序号 更新小片流程的完工数量以及刺破数量


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


            updateWrapper.eq(OrderProcessDetail::getOrderNumber, reportingWorkDetail.getOrderNumber())


                    .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId().substring(0, 14))


                    .eq(OrderProcessDetail::getProcessId, reportingWork.getProcessId())


                    .eq(OrderProcessDetail::getOrderId, reportingWork.getOrderId())


                    .eq(OrderProcessDetail::getProcess, reportingWork.getThisProcess())


                    .eq(OrderProcessDetail::getTechnologyNumber, reportingWorkDetail.getTechnologyNumber())