|
@ -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.AdminUserApi; |
|
|
import com.win.module.system.api.user.dto.AdminUserRespDTO; |
|
|
import com.win.module.system.api.user.dto.AdminUserRespDTO; |
|
|
import com.win.module.wms.controller.inspectRequest.vo.*; |
|
|
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.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.InspectRequestDetailDO; |
|
|
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; |
|
|
import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; |
|
|
import com.win.module.wms.enums.DictTypeConstants; |
|
|
import com.win.module.wms.enums.DictTypeConstants; |
|
@ -249,4 +252,25 @@ public class InspectRequestMainController { |
|
|
return success(count > 0); |
|
|
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<InspectRequestMainRespVO> 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<InspectRequestDetailDO> list = inspectRequestDetailService.getInspectRequestDetailList(reqVO); |
|
|
|
|
|
List<InspectRequestDetailExcelVO> vos = InspectRequestDetailConvert.INSTANCE.convertList02(list); |
|
|
|
|
|
result.setSubList(vos); |
|
|
|
|
|
return success(result); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|