~admin/ERP_override.git

			@@ -1,5 +1,6 @@
			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;
			@@ -22,16 +23,20 @@

			//查询第一次排版数据
			@ApiOperation("加载时查询排版数据接口")
			@PostMapping ("/selectLastScheduling/{selectTime1}/{selectTime2}")
			@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(
			@PathVariable String selectTime1,
			@@ -46,6 +51,7 @@

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

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

			@@ -73,6 +80,7 @@

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

			@@ -85,6 +93,7 @@
			}

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