blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2025-05-23 9b7aead180feb9dcd283b67221ef108dc95b3175 
 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) {


@@ -1165,7 +1164,9 @@


        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;


    }