diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionDeliveryAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionDeliveryAppController.java index 9a2ec87e9..60daa8e6e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionDeliveryAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionDeliveryAppController.java @@ -79,8 +79,8 @@ public class DistributionDeliveryAppController { @GetMapping("/trays") @ApiOperationSupport(order = 3) @ApiOperation(value = "详情", notes = "传入DistributionDeliveryListDTO") - public R> traysDetail(DistributionAppDeliveryListDTO distributionDeliveryList, Query query) { - IPage pages = distributionDeliveryListService.getAppDeliveryreservationTraysPage(Condition.getPage(query),distributionDeliveryList); + public R traysDetail(DistributionAppDeliveryListDTO distributionDeliveryList) { + List pages = distributionDeliveryListService.getAppDeliveryreservationTraysPage(distributionDeliveryList); return R.data(pages); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java index 934c169bc..85c62f3e5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java @@ -181,5 +181,5 @@ public interface DistributionDeliveryInfoMapper extends BaseMapper selectAppTarysListPage(IPage page,@Param("reservationId") Long id); + List selectAppTarysListPage(@Param("reservationId") Long id); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java index 1be24666b..b28b5918c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java @@ -261,7 +261,7 @@ public interface IDistributionDeliveryListService extends BaseService getAppDeliveryreservationTraysPage(IPage page, DistributionAppDeliveryListDTO distributionDeliveryList); + List getAppDeliveryreservationTraysPage(DistributionAppDeliveryListDTO distributionDeliveryList); /** * 异常装车 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index daa5127d6..bf4d60bae 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -5258,13 +5258,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl getAppDeliveryreservationTraysPage(IPage page, DistributionAppDeliveryListDTO distributionDeliveryList) { + public List getAppDeliveryreservationTraysPage( DistributionAppDeliveryListDTO distributionDeliveryList) { // ---------------------------------2023-09-25 新增托盘详情--------------------------------------------------------------------------------------- - List customList = distributionDeliveryInfoMapper.selectAppTarysListPage(page, Long.parseLong(distributionDeliveryList.getReservationId())); + List customList = distributionDeliveryInfoMapper.selectAppTarysListPage( Long.parseLong(distributionDeliveryList.getReservationId())); List a = new ArrayList<>(); customList.forEach(c -> { String trayCode = c.getTrayCode(); - List loadscanEntityList = distributionLoadscanService.list(Wrappers.query().lambda().eq(DistributionLoadscanEntity::getReservationId, distributionDeliveryList.getReservationId()).eq(DistributionLoadscanEntity::getTrayNo, trayCode).ne(DistributionLoadscanEntity::getScanStatus, "1")); + List loadscanEntityList = distributionLoadscanService.list(Wrappers.query().lambda() + .eq(DistributionLoadscanEntity::getReservationId, distributionDeliveryList.getReservationId()) + .eq(DistributionLoadscanEntity::getTrayNo, trayCode) + .ne(DistributionLoadscanEntity::getScanStatus, "1")); c.setIsScan(1); if (Func.isNotEmpty(loadscanEntityList) && loadscanEntityList.size() > 0) { c.setIsScan(2); @@ -5289,7 +5292,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl reservation_status != 40 AND is_deleted = 0 + AND DATE_FORMAT(created_time, "%y%m%d" ) = DATE_FORMAT( #{param.dayStr}, "%y%m%d" ) AND warehouse_id IN @@ -663,5 +664,64 @@ + + + diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java index f0f63b4e0..2d541253f 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java @@ -251,10 +251,10 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { Integer deLiveryTotalNum = warehouseIndexMapper.findDeLiveryTotalNum(indexDTO, indexDeliveryDataVO.getType()); indexDeliveryDataVO.setTotalDeliveryNum(deLiveryTotalNum); //查询总重量 - BigDecimal totalWeight = warehouseIndexMapper.findDeliveryTotalWeight(indexDTO,indexDeliveryDataVO.getType()); + BigDecimal totalWeight = warehouseIndexMapper.findDeliveryTotalWeight(indexDTO, indexDeliveryDataVO.getType()); indexDeliveryDataVO.setTotalWeight(totalWeight); //查询总包件体积 - BigDecimal totalVolume = warehouseIndexMapper.findDeliveryTotalVolume(indexDTO,indexDeliveryDataVO.getType()); + BigDecimal totalVolume = warehouseIndexMapper.findDeliveryTotalVolume(indexDTO, indexDeliveryDataVO.getType()); indexDeliveryDataVO.setTotalVolume(totalVolume); //查询在途件数 Integer totalRoadNum = warehouseIndexMapper.findDeLiveryTotalRoadNum(indexDTO, indexDeliveryDataVO.getType()); @@ -314,9 +314,15 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { indexSignforDayDataVO.setSignScale(daySignforScale); //查询当天文员复核数 Integer dayClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByDay(indexDTO); + indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum); //查询当天计划数 - Integer planByday = warehouseIndexMapper.findPlanNumByDay(indexDTO); + Integer dayPlanByday = warehouseIndexMapper.findPlanNumByDay(indexDTO); //计算文员签收率 + Double dayClerkSignforScale = (double) (dayClerkSignforNum / (dayPlanByday + dayClerkSignforNum)); + indexSignforDayDataVO.setClerkSignforScale(dayClerkSignforScale); + //文员超时复核数 + Integer dayClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByDay(indexDTO); +// indexSignforDayDataVO.setClerkOverTimeSignfoNum(dayClerkOverTimeSignfoNum); indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum); @@ -335,6 +341,15 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { //查询当月文员复核数 Integer monthClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByMonth(indexDTO); indexSignforMonthDataVO.setClerkSignNum(monthClerkSignforNum); + Integer monthPlanByday = warehouseIndexMapper.findPlanNumByMonth(indexDTO); + Double monthClerkSignforScale = (double) (monthClerkSignforNum / (monthPlanByday + monthClerkSignforNum)); + indexSignforMonthDataVO.setClerkSignforScale(monthClerkSignforScale); + //查询当月文员复核 + Integer monthClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByMonth(indexDTO); + indexSignforMonthDataVO.setClerkOverTimeSignfoNum(monthClerkOverTimeSignfoNum); + Double monthClerkOverTimeScale = (double) (monthClerkOverTimeSignfoNum / monthPlanByday); + indexSignforMonthDataVO.setClerkOverTimeScale(monthClerkOverTimeScale); + list.add(indexSignforMonthDataVO); return list; } } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java index 824d123b0..0b606fd4b 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java @@ -8,16 +8,23 @@ import java.math.BigDecimal; @Data public class IndexSignforDataVO implements Serializable { - + //类型 private Integer type; - + //签收数 private Integer signNum; - + //未签收数 private Integer UnSignNum; + //文员超时为复核数 + private Integer clerkOverTimeSignfoNum; + //文员超时为复核数 + private Double clerkOverTimeScale; + //签收率 private Double signScale; - + //复核率 + private Double ClerkSignforScale; + //复核数 private Integer clerkSignNum;