ERP_override.git

			@@ -13,6 +13,7 @@
			import org.springframework.web.bind.annotation.*;

			import java.sql.Date;
			import java.util.List;
			import java.util.Map;

			@RestController
			@@ -25,13 +26,12 @@
			//查询工单
			@ApiOperation("查询工单接口")
			@SaCheckPermission("selectWorkOrder.search")
			@PostMapping ("/orderGlassDetail/{selectTime1}/{selectTime2}/{state}")
			@PostMapping ("/orderGlassDetail/{selectDate}/{state}")
			public Result dateWork(
			@PathVariable Date selectTime1,
			@PathVariable Date selectTime2,
			@PathVariable List<String> selectDate,
			@PathVariable Integer state,
			@RequestBody OrderGlassDetail orderGlassDetail){
			return Result.seccess(workOrderService.defaultDateWork(selectTime1,selectTime2,state,orderGlassDetail));
			return Result.success(workOrderService.defaultDateWork(selectDate,state,orderGlassDetail));
			}

			//转生产订单查询
			@@ -40,7 +40,7 @@
			public Result addWork(
			@PathVariable String orderId,
			@RequestBody OrderDetail orderDetail){
			return Result.seccess(workOrderService.addDateWork(orderId,orderDetail));
			return Result.success(workOrderService.addDateWork(orderId,orderDetail));

			}

			@@ -52,13 +52,13 @@
			public Result addOrderWork( @RequestBody Map<String,Object> object){

			// if(workOrderService.addOrderWorkSv(object)){
			// return Result.seccess();
			// return Result.success();
			// }else {
			// throw new ServiceException(Constants.Code_500,"保存失败");
			//
			// }

			return Result.seccess(workOrderService.addOrderWorkSv(object));
			return Result.success(workOrderService.addOrderWorkSv(object));
			}

			//删除工单
			@@ -70,11 +70,11 @@
			@PathVariable String productionId
			){
			// if(workOrderService.deleteOrderWorkSv(orderId,productionId)){
			// return Result.seccess();
			// return Result.success();
			// }else {
			// throw new ServiceException(Constants.Code_500,"删除失败");
			//
			// }
			return Result.seccess(workOrderService.deleteOrderWorkSv(orderId,productionId));
			return Result.success(workOrderService.deleteOrderWorkSv(orderId,productionId));
			}
			}