~admin/ERP_override.git

			@@ -1,10 +1,13 @@
			package com.example.erp.controller.pp;

			import cn.dev33.satoken.annotation.SaCheckPermission;
			import com.example.erp.common.Constants;
			import com.example.erp.common.Result;
			import com.example.erp.entity.pp.ProductionScheduling;
			import com.example.erp.exception.ServiceException;
			import com.example.erp.service.pp.ProductionSchedulingService;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.web.bind.annotation.*;

			@@ -12,34 +15,43 @@
			import java.util.Map;

			@RestController
			@Api(value="排产controller",tags={"排产相关操作接口"})
			@RequestMapping("/productionScheduling")
			public class ProductionSchedulingController {
			@Autowired
			ProductionSchedulingService productionSchedulingService;

			//查询第一次排版数据
			@PostMapping ("/selectLastScheduling/{selectTime1}/{selectTime2}")
			@ApiOperation("加载时查询排版数据接口")
			@SaCheckPermission("ProductionScheduling.search")
			@PostMapping ("/selectLastScheduling/{selectTime1}/{selectTime2}/{processes}/{orderId}")
			public Result selectLastScheduling(
			@PathVariable String selectTime1,
			@PathVariable String selectTime2,
			@PathVariable String processes,
			@PathVariable String orderId,
			@RequestBody ProductionScheduling productionScheduling){
			return Result.seccess(productionSchedulingService.selectLastScheduling(selectTime1,selectTime2,productionScheduling));
			return Result.seccess(productionSchedulingService.selectLastScheduling(selectTime1,selectTime2,processes,orderId,productionScheduling));

			}
			//点击查询排版数据
			@ApiOperation("点击查询排版数据接口")
			@SaCheckPermission("ProductionScheduling.search")
			@PostMapping ("/selectScheduling/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
			public Result SelectScheduling(
			public Result selectScheduling(
			@PathVariable String selectTime1,
			@PathVariable String selectTime2,
			@PathVariable String orderId,
			@PathVariable String processes,
			@PathVariable Integer state,
			@RequestBody ProductionScheduling productionScheduling){
			return Result.seccess(productionSchedulingService.SelectSchedulingSv(selectTime1,selectTime2,orderId,processes,state,productionScheduling));
			return Result.seccess(productionSchedulingService.selectSchedulingSv(selectTime1,selectTime2,orderId,processes,state,productionScheduling));

			}

			//点击查询排版数据（带订单号查询）
			@ApiOperation("根据条件查询排版数据接口")
			@SaCheckPermission("ProductionScheduling.search")
			@PostMapping ("/selectSchedulingNot/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
			public Result selectSchedulingNot(
			@PathVariable String selectTime1,
			@@ -53,10 +65,12 @@
			}

			//添加排产数据
			@ApiOperation("添加排产数据接口")
			@SaCheckPermission("ProductionScheduling.add")
			@PostMapping("/addScheduling")
			public Result AddScheduling( @RequestBody Map<String,Object> object){
			public Result addScheduling( @RequestBody Map<String,Object> object){

			if(productionSchedulingService.AddSchedulingSv(object)){
			if(productionSchedulingService.addSchedulingSv(object)){
			return Result.seccess();
			}else {
			throw new ServiceException(Constants.Code_500,"保存失败");
			@@ -65,6 +79,8 @@
			}

			//删除排产数据
			@ApiOperation("删除排产数据接口")
			@SaCheckPermission("ProductionScheduling.delete")
			@PostMapping("/deleteScheduling")
			public Result deleteScheduling( @RequestBody Map<String,Object> object) throws Exception{

			@@ -76,10 +92,12 @@
			}
			}

			@ApiOperation("排版审核接口")
			@SaCheckPermission("ProductionScheduling.review")
			@PostMapping("/examineScheduling")
			public Result ExamineScheduling( @RequestBody Map<String,Object> object){
			public Result examineScheduling( @RequestBody Map<String,Object> object){

			if(productionSchedulingService.ExamineSchedulingSv(object)){
			if(productionSchedulingService.examineSchedulingSv(object)){
			return Result.seccess();
			}else {
			throw new ServiceException(Constants.Code_500,"审核失败");