ERP_override.git

			@@ -67,6 +67,15 @@
			}

			//工程查询流程卡
			@ApiOperation("修改工程查询流程卡接口")
			@PostMapping ("/getUpdateFlowCardList/{type}/{thickness}/{radio}/{projectNo}")
			public Result getUpdateFlowCardList(
			@PathVariable String type,@PathVariable String thickness,
			@PathVariable Integer radio,@PathVariable String projectNo){
			return Result.seccess(glassOptimizeService.getUpdateFlowCardList(type,thickness,radio,projectNo));
			}

			//工程查询流程卡
			@ApiOperation("工程查询流程卡")
			@PostMapping ("/getProjectList")
			public Result getProjectList(){
			@@ -104,7 +113,7 @@
			@PostMapping("/deleteProject/{projectNumber}")
			public Result deleteProject(
			@PathVariable String projectNumber){
			return Result.seccess(glassOptimizeService.deleteProject(projectNumber));
			return Result.seccess(glassOptimizeService.deleteProject(projectNumber,1));
			}

			//模拟计算工程号查询
			@@ -115,12 +124,20 @@
			return Result.seccess(glassOptimizeService.selectProjectComputeSv(projectNumber));
			}

			//模拟计算工程号查询
			@ApiOperation("模拟计算工程数据查询")
			@PostMapping ("/selectProjectComputeAll/{projectNumber}")
			public Result selectProjectComputeAll(
			@PathVariable String projectNumber){
			return Result.seccess(glassOptimizeService.selectProjectComputeAll(projectNumber));
			}

			//模拟计算流程卡详情
			@ApiOperation("模拟计算流程卡详情")
			@PostMapping ("/selectComputeDetail/{processId}")
			@PostMapping ("/selectComputeDetail/{processId}/{technologyNumber}/{patchState}")
			public Result selectComputeDetail(
			@PathVariable String processId){
			return Result.seccess(glassOptimizeService.selectComputeDetailSv(processId));
			@PathVariable String processId, @PathVariable Integer technologyNumber,@PathVariable String patchState){
			return Result.seccess(glassOptimizeService.selectComputeDetailSv(processId,technologyNumber,patchState));
			}

			@ApiOperation("模拟计算")