diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java index 72f7b52d..2517bd95 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java @@ -5,11 +5,11 @@ import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ConvertUtil; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; -import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayImportErrorVO; -import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayImportVO; -import com.win.module.wms.controller.productputawayRequest.vo.ProductputawayRequestMainCreateReqVO; -import com.win.module.wms.controller.purchaseclaimRequest.vo.PurchaseclaimRequestMainCreateReqVO; + +import com.win.module.wms.convert.customerreturnRequest.CustomerreturnRequestDetailConvert; +import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestDetailDO; import com.win.module.wms.enums.DictTypeConstants; +import com.win.module.wms.service.customerreturnRequest.CustomerreturnRequestDetailService; import io.swagger.v3.oas.annotations.Parameters; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -50,6 +50,9 @@ public class CustomerreturnRequestMainController { @Resource private CustomerreturnRequestMainService customerreturnRequestMainService; + @Resource + private CustomerreturnRequestDetailService customerreturnRequestDetailService; + @Resource private AdminUserApi userApi; @@ -176,5 +179,22 @@ public class CustomerreturnRequestMainController { } return success(returnMap); } + @GetMapping("/getCustomerreturnRequestById") + @Operation(summary = "APP获得客户退货申请主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:query')") + public CommonResult getCustomerreturnRequestById(@RequestParam("id") Long id) { + CustomerreturnRequestMainDO customerreturnRequestMain = customerreturnRequestMainService.getCustomerreturnRequestMain(id); + CustomerreturnRequestMainRespVO result = CustomerreturnRequestMainConvert.INSTANCE.convert(customerreturnRequestMain); + if(result==null) { + return success(result); + }; + CustomerreturnRequestDetailExportReqVO reqVO = new CustomerreturnRequestDetailExportReqVO(); + reqVO.setMasterId(result.getId()); + List list = customerreturnRequestDetailService.getCustomerreturnRequestDetailList(reqVO); + List vos = CustomerreturnRequestDetailConvert.INSTANCE.convertList02(list); + result.setSubList(vos); + return success(result); + } }