diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java index 31511742..66b9c719 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java @@ -10,7 +10,10 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inspectRequest.vo.*; +import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestDetailExcelVO; +import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert; import com.win.module.wms.convert.inspectRequest.InspectRequestMainConvert; +import com.win.module.wms.convert.scrapRequest.ScrapRequestDetailConvert; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; import com.win.module.wms.enums.DictTypeConstants; @@ -249,4 +252,25 @@ public class InspectRequestMainController { return success(count > 0); } + + @GetMapping("/getInspectRequestById") + @Operation(summary = "APP获得检验申请主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:query')") + public CommonResult getInspectRequestById(@RequestParam("id") Long id) { + InspectRequestMainDO inspectRequestMain = inspectRequestMainService.getInspectRequestMain(id); + InspectRequestMainRespVO result = InspectRequestMainConvert.INSTANCE.convert(inspectRequestMain); + if (result == null) { + return success(result); + } + ; + InspectRequestDetailExportReqVO reqVO = new InspectRequestDetailExportReqVO(); + reqVO.setMasterId(result.getId()); + List list = inspectRequestDetailService.getInspectRequestDetailList(reqVO); + List vos = InspectRequestDetailConvert.INSTANCE.convertList02(list); + result.setSubList(vos); + return success(result); + } + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailService.java index d4553b39..2476a114 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.inspectRequest; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailCreateReqVO; +import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailPageReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailUpdateReqVO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; @@ -71,4 +72,6 @@ public interface InspectRequestDetailService { */ PageResult getInspectRequestDetailSenior(CustomConditions conditions); + List getInspectRequestDetailList(InspectRequestDetailExportReqVO exportReqVO); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java index 6910634f..1e6639d5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java @@ -8,6 +8,7 @@ import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.system.api.dict.DictDataApi; import com.win.module.system.api.dict.dto.DictDataRespDTO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailCreateReqVO; +import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailExportReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailPageReqVO; import com.win.module.wms.controller.inspectRequest.vo.InspectRequestDetailUpdateReqVO; import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert; @@ -165,4 +166,9 @@ public class InspectRequestDetailServiceImpl implements InspectRequestDetailServ jobUtils.selectlocationReturnManagementAccuracy(itemCode, packingNumber, batch, fromLocationCode, inventoryStatus); } + @Override + public List getInspectRequestDetailList(InspectRequestDetailExportReqVO exportReqVO) { + return inspectRequestDetailMapper.selectList(exportReqVO); + } + }