mom-pro2-after.git

			@@ -146,7 +146,6 @@
			@GetMapping("/get")
			@Operation(summary = "获得生产报工")
			@Parameter(name = "id", description = "编号", required = true, example = "1024")
			@PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
			public CommonResult<MesProFeedbackRespVO> getFeedback(@RequestParam("id") Long id) {
			MesProFeedbackDO feedback = feedbackService.getFeedback(id);
			if (feedback == null) {
			@@ -157,7 +156,6 @@

			@GetMapping("/page")
			@Operation(summary = "获得生产报工分页")
			@PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
			public CommonResult<PageResult<MesProFeedbackRespVO>> getFeedbackPage(@Valid MesProFeedbackPageReqVO pageReqVO) {
			PageResult<MesProFeedbackDO> pageResult = feedbackService.getFeedbackPage(pageReqVO);
			return success(new PageResult<>(buildFeedbackRespVOList(pageResult.getList()), pageResult.getTotal()));
			@@ -166,7 +164,6 @@
			@GetMapping("/list-by-task")
			@Operation(summary = "按任务获得报工历史列表")
			@Parameter(name = "taskId", description = "任务编号", required = true, example = "1024")
			@PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
			public CommonResult<List<MesProFeedbackRespVO>> getFeedbackListByTask(@RequestParam("taskId") Long taskId) {
			List<MesProFeedbackDO> list = feedbackService.getFeedbackListByTaskId(taskId);
			return success(buildFeedbackRespVOList(list));
			@@ -237,7 +234,6 @@
			@GetMapping("/trace/{id}")
			@Operation(summary = "获得报工追溯信息", description = "报工 + 产出/产出明细 + 消耗/消耗明细 + IPQC检验")
			@Parameter(name = "id", description = "报工编号", required = true, example = "1024")
			@PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
			public CommonResult<MesProFeedbackTraceRespVO> getFeedbackTrace(@PathVariable("id") Long id) {
			MesProFeedbackDO feedback = feedbackService.getFeedback(id);
			if (feedback == null) {