ERP_override.git

			@@ -1,6 +1,7 @@
			package com.example.erp.controller.pp;

			import cn.dev33.satoken.annotation.SaCheckPermission;
			import cn.hutool.core.date.DateTime;
			import com.example.erp.common.Constants;
			import com.example.erp.common.Result;
			import com.example.erp.dto.pp.*;
			@@ -25,6 +26,7 @@
			import java.time.LocalDate;
			import java.util.List;
			import java.util.Map;
			import java.util.concurrent.ExecutionException;

			@RestController
			@Api(value = "生产报表controller", tags = {"生产报表操作接口"})
			@@ -38,7 +40,7 @@

			//流程卡进度
			@ApiOperation("流程卡进度")
			@SaCheckPermission("processCardProgress.search")
			@SaCheckPermission("selectOrder.search")
			@PostMapping("/processCardProgress/{orderId}")
			public Result processCardProgress(@PathVariable String orderId, @RequestBody List<Integer> columns) {
			return Result.seccess(reportService.processCardProgressSv(orderId, columns));
			@@ -155,6 +157,15 @@
			return Result.seccess(reportService.orderPlanDecompositionSv(selectTime1, selectTime2, report));
			}

			@ApiOperation("订单报工")
			@SaCheckPermission("orderPlanDecomposition.search")
			@PostMapping("/orderReportingWorks/{selectTime1}/{selectTime2}")
			public Result orderReportingWorks(@PathVariable Date selectTime1,
			@PathVariable Date selectTime2,
			@RequestBody Report report) {
			return Result.seccess(reportService.orderReportingWorks(selectTime1, selectTime2, report));
			}

			@ApiOperation("原片领料")
			@SaCheckPermission("rawMaterialRequisition.search")
			@PostMapping("/rawMaterialRequisition/{selectTime1}/{selectTime2}")
			@@ -170,8 +181,8 @@
			public Result teamOutput(
			@PathVariable Integer pageNum,
			@PathVariable Integer pageSize,
			@PathVariable Date selectTime1,
			@PathVariable Date selectTime2,
			@PathVariable String selectTime1,
			@PathVariable String selectTime2,
			@PathVariable String selectProcesses,
			@RequestBody TeamOutputDTO teamOutputDTO) {
			return Result.seccess(reportService.teamOutputSv(pageNum, pageSize, selectTime1, selectTime2,selectProcesses, teamOutputDTO));