From 9fceb1844f6e852587fb8efc7c63ee0b7b0736a3 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Fri, 15 Nov 2024 09:22:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/bases/controller/PartApplyController.java | 6 +++--- .../business/bases/controller/PartBackController.java | 4 ++-- .../business/bases/controller/PartCheckController.java | 4 ++-- .../business/bases/controller/PartInputController.java | 8 ++++---- .../business/bases/controller/PartScrapController.java | 6 +++--- .../business/bases/controller/StatisticsController.java | 2 +- .../gzgqj/business/bases/entity/PartScrapDetailsVo.java | 1 - .../gzgqj/business/bases/mapper/PartApplyMapper.java | 2 +- .../bonus/gzgqj/business/bases/mapper/PartBackMapper.java | 2 +- .../gzgqj/business/bases/mapper/PartCheckMapper.java | 2 +- .../gzgqj/business/bases/mapper/PartInputMapper.java | 2 +- .../gzgqj/business/bases/mapper/PartScrapMapper.java | 2 +- .../gzgqj/business/bases/mapper/StatisticsMapper.java | 2 +- .../gzgqj/business/bases/service/PartApplyService.java | 2 +- .../business/bases/service/PartApplyServiceImpl.java | 7 +++++-- .../gzgqj/business/bases/service/PartBackService.java | 2 +- .../gzgqj/business/bases/service/PartBackServiceImpl.java | 2 +- .../gzgqj/business/bases/service/PartCheckService.java | 2 +- .../business/bases/service/PartCheckServiceImpl.java | 2 +- .../gzgqj/business/bases/service/PartInputService.java | 2 +- .../business/bases/service/PartInputServiceImpl.java | 6 ++++-- .../gzgqj/business/bases/service/PartScrapService.java | 2 +- .../business/bases/service/PartScrapServiceImpl.java | 2 +- .../business/bases/service/StatisticsServiceImpl.java | 2 +- 24 files changed, 39 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartApplyController.java b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartApplyController.java index ad8bca0..8587a2b 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartApplyController.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartApplyController.java @@ -67,8 +67,8 @@ public class PartApplyController { * @return */ @GetMapping("getPartDetailsList") - @DecryptAndVerify(decryptedClass = PartApplyAppVo.class) - public PageInfo getPartDetailsList(EncryptedReq dto) { + @DecryptAndVerify(decryptedClass = PartApplyDetailAppVo.class) + public PageInfo getPartDetailsList(EncryptedReq dto) { PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); List list = service.getPartDetailsList(dto.getData());; PageInfo pageInfo = new PageInfo<>(list); @@ -108,7 +108,7 @@ public class PartApplyController { * @param */ @PostMapping("exportDetail") - public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartApplyAppVo dto) { + public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartApplyDetailAppVo dto) { try { List list = service.getPartDetailsList(dto);; final int[] num = {1}; diff --git a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartBackController.java b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartBackController.java index 8fe88d9..c676dac 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartBackController.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartBackController.java @@ -91,7 +91,7 @@ public class PartBackController { */ @GetMapping("getInfoDetailsList") @DecryptAndVerify(decryptedClass = PartBackVo.class) - public PageInfo getInfoDetailsList(EncryptedReq dto) { + public PageInfo getInfoDetailsList(EncryptedReq dto) { PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); List list = service.getInfoDetailsList(dto.getData());; PageInfo pageInfo = new PageInfo<>(list); @@ -132,7 +132,7 @@ public class PartBackController { * @param */ @PostMapping("exportDetail") - public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartBackVo dto) { + public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartBackDetailsVo dto) { try { List list = service.getInfoDetailsList(dto);; final int[] num = {1}; diff --git a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartCheckController.java b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartCheckController.java index 7212aa6..d9246ed 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartCheckController.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartCheckController.java @@ -81,7 +81,7 @@ public class PartCheckController { */ @GetMapping("getDetailsByIdList") @DecryptAndVerify(decryptedClass = PartCheckVo.class) - public PageInfo getDetailsByIdList(EncryptedReq dto) { + public PageInfo getDetailsByIdList(EncryptedReq dto) { PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); List list = service.getDetailsByIdList(dto.getData());; PageInfo pageInfo = new PageInfo<>(list); @@ -124,7 +124,7 @@ public class PartCheckController { * @param */ @PostMapping("exportDetail") - public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartCheckVo dto) { + public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartCheckDetailsVo dto) { try { List list = service.getDetailsByIdList(dto);; final int[] num = {1}; diff --git a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java index df8d3f6..9f069e2 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java @@ -90,7 +90,7 @@ public class PartInputController { * @param */ @PostMapping("exportDetail") - public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartInputVo dto) { + public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartInputDetails dto) { try { List list = service.getInputDetailList(dto);; final int[] num = {1}; @@ -151,8 +151,8 @@ public class PartInputController { * @return */ @GetMapping("getInputDetailListByPage") - @DecryptAndVerify(decryptedClass = PartInputVo.class) - public PageInfo getInputDetailListByPage(EncryptedReq dto) { + @DecryptAndVerify(decryptedClass = PartInputDetails.class) + public PageInfo getInputDetailListByPage(EncryptedReq dto) { PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); List list = service.getInputDetailList(dto.getData());; PageInfo pageInfo = new PageInfo<>(list); @@ -167,7 +167,7 @@ public class PartInputController { */ @GetMapping("getInputDetailList") @DecryptAndVerify(decryptedClass = PartInputVo.class) - public ServerResponse getInputDetailList(EncryptedReq dto) { + public ServerResponse getInputDetailList(EncryptedReq dto) { List list = service.getInputDetailList(dto.getData());; return ServerResponse.createSuccess(list); } diff --git a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartScrapController.java b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartScrapController.java index 82a2827..fd94f33 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartScrapController.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartScrapController.java @@ -86,8 +86,8 @@ public class PartScrapController { * @return */ @GetMapping("getDetailsByIdList") - @DecryptAndVerify(decryptedClass = PartScrapVo.class) - public PageInfo getDetailsByIdList(EncryptedReq dto) { + @DecryptAndVerify(decryptedClass = PartScrapDetailsVo.class) + public PageInfo getDetailsByIdList(EncryptedReq dto) { PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); List list = service.getDetailsByIdList(dto.getData()); PageInfo pageInfo = new PageInfo<>(list); @@ -133,7 +133,7 @@ public class PartScrapController { * @param */ @PostMapping("exportDetail") - public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartScrapVo dto) { + public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PartScrapDetailsVo dto) { try { List list = service.getDetailsByIdList(dto);; final int[] num = {1}; diff --git a/src/main/java/com/bonus/gzgqj/business/bases/controller/StatisticsController.java b/src/main/java/com/bonus/gzgqj/business/bases/controller/StatisticsController.java index 983b8a4..396a7fb 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/controller/StatisticsController.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/controller/StatisticsController.java @@ -97,7 +97,7 @@ public class StatisticsController { */ @GetMapping("getProDetailsPage") @DecryptAndVerify(decryptedClass = ProjectInfoVo.class) - public PageInfo getProDetailsPage(EncryptedReq dto) { + public PageInfo getProDetailsPage(EncryptedReq dto) { PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); List list = service.getProDetailsPage(dto.getData());; PageInfo pageInfo = new PageInfo<>(list); diff --git a/src/main/java/com/bonus/gzgqj/business/bases/entity/PartScrapDetailsVo.java b/src/main/java/com/bonus/gzgqj/business/bases/entity/PartScrapDetailsVo.java index c294d1c..9aa3058 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/entity/PartScrapDetailsVo.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/entity/PartScrapDetailsVo.java @@ -48,7 +48,6 @@ public class PartScrapDetailsVo { */ @Excel(name = "配件型号", width = 10.0, orderNum = "4") private String partModel; - /** * 配件类型 */ diff --git a/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartApplyMapper.java b/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartApplyMapper.java index 834afff..d07cc11 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartApplyMapper.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartApplyMapper.java @@ -35,7 +35,7 @@ public interface PartApplyMapper { * @param data * @return */ - List getDetailsList(PartApplyAppVo data); + List getDetailsList(PartApplyDetailAppVo data); /** * 审核数据 查询 diff --git a/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartBackMapper.java b/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartBackMapper.java index 1293429..cc52d0b 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartBackMapper.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartBackMapper.java @@ -62,7 +62,7 @@ public interface PartBackMapper { * @param data * @return */ - List getInfoDetailList(PartBackVo data); + List getInfoDetailList(PartBackDetailsVo data); /** * 查询 数据 diff --git a/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartCheckMapper.java b/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartCheckMapper.java index 0ccb095..53d3de6 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartCheckMapper.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartCheckMapper.java @@ -48,7 +48,7 @@ public interface PartCheckMapper { * @param data * @return */ - List getCheckDetailList(PartCheckVo data); + List getCheckDetailList(PartCheckDetailsVo data); /** * 消息 diff --git a/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartInputMapper.java b/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartInputMapper.java index 295fecb..8b0e72d 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartInputMapper.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartInputMapper.java @@ -71,7 +71,7 @@ public interface PartInputMapper { * @param data * @return */ - List getInputDetailList(PartInputVo data); + List getInputDetailList(PartInputDetails data); /** * 修改 入库信息 diff --git a/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartScrapMapper.java b/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartScrapMapper.java index 59c1daf..06ebe55 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartScrapMapper.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartScrapMapper.java @@ -54,7 +54,7 @@ public interface PartScrapMapper { * @param data * @return */ - List getDetailListById(PartScrapVo data); + List getDetailListById(PartScrapDetailsVo data); /** * 查询数据 diff --git a/src/main/java/com/bonus/gzgqj/business/bases/mapper/StatisticsMapper.java b/src/main/java/com/bonus/gzgqj/business/bases/mapper/StatisticsMapper.java index 8c3dcfb..7803395 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/mapper/StatisticsMapper.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/mapper/StatisticsMapper.java @@ -41,7 +41,7 @@ public interface StatisticsMapper { * @param data * @return */ - List getProDetailsPage(ProjectInfoVo data); + List getProDetailsPage(PartApplyDetailAppVo data); /** * 查询工程领料单文件 diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyService.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyService.java index 93c24cd..c8a5502 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyService.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyService.java @@ -48,5 +48,5 @@ public interface PartApplyService { * @param data * @return */ - List getPartDetailsList(PartApplyAppVo data); + List getPartDetailsList(PartApplyDetailAppVo data); } diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyServiceImpl.java index 2e3e79b..9181e6b 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyServiceImpl.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PartApplyServiceImpl.java @@ -95,7 +95,7 @@ public class PartApplyServiceImpl implements PartApplyService{ * @return */ @Override - public List getPartDetailsList(PartApplyAppVo data) { + public List getPartDetailsList(PartApplyDetailAppVo data) { try{ List details=mapper.getDetailsList(data); return details; @@ -184,8 +184,11 @@ public class PartApplyServiceImpl implements PartApplyService{ data.setStatus("4"); data.setStatusType("1"); mapper.updatePartInfo(data); + // + PartApplyDetailAppVo det=new PartApplyDetailAppVo(); + det.setId(data.getId()); //计算出库数量 - List details=mapper.getDetailsList(data); + List details=mapper.getDetailsList(det); String userName=UserUtil.getLoginUser().getUsername(); //出库数据 维护 userPartInfoService.insert(details,vo.getCreater(),vo.getUserName()); diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PartBackService.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PartBackService.java index 7c8bcff..4bad119 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/PartBackService.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PartBackService.java @@ -50,5 +50,5 @@ public interface PartBackService { * @param data * @return */ - List getInfoDetailsList(PartBackVo data); + List getInfoDetailsList(PartBackDetailsVo data); } diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PartBackServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PartBackServiceImpl.java index 80bb08d..8d38018 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/PartBackServiceImpl.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PartBackServiceImpl.java @@ -82,7 +82,7 @@ public class PartBackServiceImpl implements PartBackService { * @return */ @Override - public List getInfoDetailsList(PartBackVo data) { + public List getInfoDetailsList(PartBackDetailsVo data) { try{ List detailList=mapper.getInfoDetailList(data); return detailList; diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PartCheckService.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PartCheckService.java index b57fb7d..6b7ca14 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/PartCheckService.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PartCheckService.java @@ -35,5 +35,5 @@ public interface PartCheckService { */ ServerResponse getDetailsById(PartCheckVo data); - List getDetailsByIdList(PartCheckVo data); + List getDetailsByIdList(PartCheckDetailsVo data); } diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PartCheckServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PartCheckServiceImpl.java index 6a77f14..2c1c34d 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/PartCheckServiceImpl.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PartCheckServiceImpl.java @@ -159,7 +159,7 @@ public class PartCheckServiceImpl implements PartCheckService{ * @return */ @Override - public List getDetailsByIdList(PartCheckVo data) { + public List getDetailsByIdList(PartCheckDetailsVo data) { try{ List list=mapper.getCheckDetailList(data); return list; diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputService.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputService.java index 6bac0d3..69130e3 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputService.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputService.java @@ -39,7 +39,7 @@ public interface PartInputService { * @param data * @return */ - List getInputDetailList(PartInputVo data); + List getInputDetailList(PartInputDetails data); /** * 修改入库信息 diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java index 1b08f3e..661d705 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PartInputServiceImpl.java @@ -205,7 +205,9 @@ public class PartInputServiceImpl implements PartInputService{ return ServerResponse.createErroe("入库失败"); } } - List childerList=mapper.getInputDetailList(vo); + PartInputDetails det=new PartInputDetails(); + det.setId(vo.getId()); + List childerList=mapper.getInputDetailList(det); AtomicReference isFlag= new AtomicReference<>("1"); final BigDecimal[] allPrice = {new BigDecimal("0")}; childerList.forEach(data->{ @@ -256,7 +258,7 @@ public class PartInputServiceImpl implements PartInputService{ * @return */ @Override - public List getInputDetailList(PartInputVo data) { + public List getInputDetailList(PartInputDetails data) { List list=new ArrayList<>(); try{ list=mapper.getInputDetailList(data); diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PartScrapService.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PartScrapService.java index aebc0fb..765b4ab 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/PartScrapService.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PartScrapService.java @@ -40,5 +40,5 @@ public interface PartScrapService { * @param data * @return */ - List getDetailsByIdList(PartScrapVo data); + List getDetailsByIdList(PartScrapDetailsVo data); } diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/PartScrapServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/bases/service/PartScrapServiceImpl.java index dd22c33..ec319c8 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/PartScrapServiceImpl.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/PartScrapServiceImpl.java @@ -121,7 +121,7 @@ public class PartScrapServiceImpl implements PartScrapService{ @Override - public List getDetailsByIdList(PartScrapVo data) { + public List getDetailsByIdList(PartScrapDetailsVo data) { try{ List list=mapper.getDetailListById(data); return list; diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/StatisticsServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/bases/service/StatisticsServiceImpl.java index 59cde52..ebd689a 100644 --- a/src/main/java/com/bonus/gzgqj/business/bases/service/StatisticsServiceImpl.java +++ b/src/main/java/com/bonus/gzgqj/business/bases/service/StatisticsServiceImpl.java @@ -96,7 +96,7 @@ public class StatisticsServiceImpl { * @param data * @return */ - public List getProDetailsPage(ProjectInfoVo data) { + public List getProDetailsPage(PartApplyDetailAppVo data) { List list=new ArrayList<>(); try{ list=mapper.getProDetailsPage(data);