blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyujie
1 天以前 91b61fe723df498d62c596372521d426299f0f8b 
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java


@@ -10,6 +10,7 @@


import com.example.erp.common.Constants;


import com.example.erp.dto.pp.OrderNumberTransferDTO;


import com.example.erp.entity.pp.*;


import com.example.erp.entity.sd.BasicData;


import com.example.erp.entity.sd.Order;


import com.example.erp.entity.sd.OrderDetail;


import com.example.erp.entity.sd.OrderProcessDetail;


@@ -19,10 +20,7 @@


import com.example.erp.mapper.mm.FinishedOperateLogMapper;


import com.example.erp.mapper.pp.*;


import com.baomidou.dynamic.datasource.annotation.DS;


import com.example.erp.mapper.sd.OrderDetailMapper;


import com.example.erp.mapper.sd.OrderGlassDetailMapper;


import com.example.erp.mapper.sd.OrderMapper;


import com.example.erp.mapper.sd.OrderProcessDetailMapper;


import com.example.erp.mapper.sd.*;


import com.example.erp.mapper.userInfo.LogMapper;


import com.example.erp.service.sd.OrderProcessDetailService;


import com.example.erp.service.userInfo.LogService;


@@ -71,6 +69,7 @@


    private final RestTemplate restTemplate;


    private final PatchLogMapper patchLogMapper;


    private final ReworkMapper reworkMapper;


    private final BasicDateMapper basicDataMapper;






    /*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, OrderDetailMapper orderDetailMapper, FinishedOperateLogMapper finishedOperateLogMapper, ReportingWorkTransferMapper reportingWorkTransferMapper) {


@@ -218,6 +217,8 @@


    public Map<String, Object> SelectProcessSv(String userId) {


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


        String process = reportingWorkMapper.selectUserProcess(userId);


        //工序列表


        List<Map<String, Object>> processNameList = flowCardMapper.getProcessNameList();


        if (process==null) {


            map.put("process", reportingWorkMapper.SelectProcessMp());


        }


@@ -230,7 +231,7 @@


                map.put("process",reportingWorkMapper.getSelectProcessDuoqu() );


            }


        }




        map.put("processNameList", processNameList);


        return map;


    }




@@ -271,7 +272,8 @@


        reportingWorkMapper.insert(reportingWork);


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


        reportingWorkDetails.forEach(reportingWorkDetail -> {




            reportingWork.setThisCompletedQuantity(reportingWork.getThisCompletedQuantity() + reportingWorkDetail.getCompletedQuantity());


            reportingWork.setThisWornQuantity(reportingWork.getThisWornQuantity() + reportingWorkDetail.getBreakageQuantity());


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


            reportingWorkDetail.setReportingWorkId(reportingWorkId);


            List<DamageDetails> damageDetails = reportingWorkDetail.getDamageDetails();


@@ -376,6 +378,8 @@






        });


        reportingWorkMapper.update(reportingWork, new LambdaUpdateWrapper<ReportingWork>()


                .eq(ReportingWork::getId, reportingWork.getId()));




        //保存日志


        Log log = new Log();


@@ -401,7 +405,7 @@


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


        String laminating = reportingWorkMapper.getProcessLaminating(thisProcess);


//合片工序


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


if (laminating.indexOf("step")!=-1){


    LambdaUpdateWrapper


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


        updateWrapper


@@ -574,8 +578,8 @@


        }


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


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


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


        return map;


    }




@@ -664,8 +668,6 @@


            } else {


                return false;


            }






        } else {


            return false;


        }


@@ -681,6 +683,12 @@


        map.put("data", reportingWorkMapper.selectQualityTestingMp(offset, pageSize, selectTime1, selectTime2, state, processId, reportingWork));


        map.put("total", reportingWorkMapper.getQualityPageTotal(offset, pageSize, selectTime1, selectTime2, state, processId, reportingWork));




        return map;


    }




    public Map<String, Object>  qualityReviewSearchSv() {


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


        map.put("data", reportingWorkMapper.qualityReviewSearchMp());


        return map;


    }




@@ -1156,8 +1164,40 @@


        date.add(startDate);


        date.add(endDate);


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


        result.put("data",orderProcessDetailMapper.selectShiftQuantitySv(creatorId, startDate, endDate));


        BasicData basicData = basicDataMapper


                .selectOne(new QueryWrapper<BasicData>().eq("basic_name", reportingWork.get("process")));


        result.put("data",orderProcessDetailMapper.selectShiftQuantitySv(creatorId, startDate, endDate,basicData.getNickname()));


        result.put("date",date);


        return result;


    }




    public Map<String, Object> selectReportingWorkRecordByPhoneSv(Map<String,Object> reportingWork) {


        List<LocalDateTime> dateList = (List<LocalDateTime>) reportingWork.get("searchDate");


        String startDate = LocalDate.now().minusDays(14).toString();


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


        if (dateList.get(0)!=null){


            startDate = String.valueOf(dateList.get(0));


        }


        if (dateList.get(1)!=null){


            endDate = String.valueOf(dateList.get(1));


        }


        List<String> date = new ArrayList<>();


        date.add(startDate);


        date.add(endDate);


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


        result.put("data",reportingWorkMapper.selectList(


                new QueryWrapper<ReportingWork>().nested(


                                reportingWork.get("process")!=null,


                                wrapper-> wrapper.eq("creator_id",reportingWork.get("userId"))//当工序为空时，查询所有报工信息


                        )


                        .gt("reviewed_state",-1)


                        .between("date(reporting_work_time)",startDate,endDate)


                        .orderByDesc("id")));


        result.put("date",date);




         return result;




    }






}