diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/IndexCountController.java b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/IndexCountController.java index 35a6cd8ab..b39afb33d 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/IndexCountController.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/IndexCountController.java @@ -3,6 +3,8 @@ package com.logpm.report.controller; import com.logpm.report.service.InLibraryDeliverService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.models.auth.In; import lombok.AllArgsConstructor; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; @@ -10,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpSession; + @AllArgsConstructor @RestController @@ -19,8 +23,27 @@ public class IndexCountController { private InLibraryDeliverService inLibraryDeliverService; @GetMapping("/index_count") + @ApiOperation(value = "定制品在库订单总量",tags = "定制品在库订单总量") public R indexCount(@RequestParam("id") Long id) { Integer indexCount = inLibraryDeliverService.indexCount(id); return R.data(indexCount); } + + @GetMapping("/index_number_in_the_library") + @ApiOperation(value = "定制品在库订单上架总数",tags = "定制品在库订单上架总数") + public R getTheNumberOfShelvesInTheLibrary(@RequestParam("id") Long id){ + Integer theNumberOfShelvesInTheLibrary= inLibraryDeliverService.theNumberOfShelvesInTheLibrary(id,2); + return R.data(theNumberOfShelvesInTheLibrary); + } + + @GetMapping("/index_number_No_the_library") + @ApiOperation(value = "定制品在库订单未上架总数",tags = "定制品在库订单未上架总数") + public R getTheNumberOfShelvesNoTheLibrary(@RequestParam("id") Long id){ + Integer theNumberOfShelvesInTheLibrary= inLibraryDeliverService.theNumberOfShelvesInTheLibrary(id,1); + return R.data(theNumberOfShelvesInTheLibrary); + } + + + + } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.java b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.java index 27d5026a8..78c0a5517 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.java @@ -1,6 +1,7 @@ package com.logpm.report.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import io.swagger.models.auth.In; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -11,4 +12,9 @@ public interface InLibraryDeliverMapper extends BaseMapper { Integer obtainTheNumberOfInventoryListings (@Param("id") Long id); + Integer theNumberOfShelvesInTheLibrary(@Param("id") Long id , Integer order_package_grounding_status); + +// Integer quantityInTransit(@Param("id") Long id,) } + + diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.xml index 5ecad0ff2..0d4f8db00 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/InLibraryDeliverMapper.xml @@ -2,11 +2,25 @@ + diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/InLibraryDeliverService.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/InLibraryDeliverService.java index 1a33640e9..c297c2063 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/InLibraryDeliverService.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/InLibraryDeliverService.java @@ -2,6 +2,7 @@ package com.logpm.report.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.models.auth.In; /** * @author wzy @@ -13,6 +14,8 @@ public interface InLibraryDeliverService { Integer indexCount(Long id); + Integer theNumberOfShelvesInTheLibrary(Long id,Integer order_package_grounding_statu); + } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/InLibraryDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/InLibraryDeliverServiceImpl.java index e1004bef7..1e0f70b26 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/InLibraryDeliverServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/InLibraryDeliverServiceImpl.java @@ -3,6 +3,7 @@ package com.logpm.report.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.report.mapper.InLibraryDeliverMapper; import com.logpm.report.service.InLibraryDeliverService; +import io.swagger.models.auth.In; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -21,4 +22,8 @@ public class InLibraryDeliverServiceImpl implements InLibraryDeliverService { public Integer indexCount(Long id) { return inLibraryDeliverMapper.obtainTheNumberOfInventoryListings(id); } + + public Integer theNumberOfShelvesInTheLibrary(Long id,Integer order_package_grounding_status){ + return inLibraryDeliverMapper.theNumberOfShelvesInTheLibrary(id,order_package_grounding_status); + } } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java index 048211723..32ba2e88d 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportBillLoadingAsyncService.java @@ -97,15 +97,15 @@ public class ReportBillLoadingAsyncService implements IReportBillLoadingAsyncSer userIds.add(detailsVO.getExamineUser()); } } - R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, ",")); - if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) { - List data = listR.getData(); - Map collect = data.stream().collect(Collectors.toMap(User::getId, User::getName)); - for (BillLoadingDetailsVO detailsVO : detailsPage) { - detailsVO.setScanUser(collect.get(detailsVO.getScanUser())); - detailsVO.setExamineUser(collect.get(detailsVO.getExamineUser())); - } - } +// R> listR = userClient.userInfoByIds(AuthUtil.getTenantId(), CollUtil.join(userIds, ",")); +// if (ObjectUtil.equal(ReportConstants.HTTP_SUCCESS_CODE, listR.getCode())) { +// List data = listR.getData(); +// Map collect = data.stream().collect(Collectors.toMap(User::getId, User::getName)); +// for (BillLoadingDetailsVO detailsVO : detailsPage) { +// detailsVO.setScanUser(collect.get(detailsVO.getScanUser())); +// detailsVO.setExamineUser(collect.get(detailsVO.getExamineUser())); +// } +// } } return page.setRecords(detailsPage);