YiWuProject.git

			@@ -1,15 +1,14 @@
			package com.mes.workstation.controller;


			import com.mes.workstation.entity.GlassInfo;
			import com.mes.utils.Result;
			import com.mes.workstation.entity.UpWorkstation;
			import com.mes.workstation.service.UpWorkstationService;
			import com.mes.utils.Result;
			import io.swagger.annotations.ApiOperation;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.web.bind.annotation.*;
			import com.mes.glassinfo.entity.UpPattenUsage;

			import java.util.List;

			/**
			@@ -26,9 +25,9 @@
			public class UpWorkstationController {
			@Autowired
			private UpWorkstationService upWorkstationService;
			private GlassInfo glassInfo;
			@ApiOperation("显示工位上的玻璃信息")
			@GetMapping("/list") //查询现在上片机的玻璃信息
			@ResponseBody
			public Result<List<UpWorkstation>> list() {
			List<UpWorkstation> glass = upWorkstationService.list();
			log.info("显示工位上的玻璃信息:{}", glass);
			@@ -37,19 +36,25 @@

			//新增工位信息修改一条工位信息,接收实例类字段为宽高厚膜系数量工位id
			//删除工位信息也用这个,除了工位id玻璃信息传null
			@ApiOperation("修改工位表增加玻璃信息或者删除玻璃信息")
			@ApiOperation("修改工位表增加玻璃信息或者删除玻璃信息,传递Upworkstation类,只修改宽高厚数量膜系")
			@PostMapping("/updateGlassMessage")
			@ResponseBody
			public void updateGlassMessage(@RequestBody UpWorkstation upwork) {
			public Result<List<UpWorkstation>> updateGlassMessage(@RequestBody UpWorkstation upwork) {
			upWorkstationService.updateGlassMessage(upwork);
			List<UpWorkstation> glass = upWorkstationService.list();
			return Result.build(200, "", glass);
			}


			@ApiOperation("开始上片任务")
			@PostMapping("/selectPriority") //开始上片任务

			@ApiOperation("修改上片mes联动请求字")
			@PostMapping("/updateMesInkageLoad")
			@ResponseBody
			public void selectPriority() {
			upWorkstationService.selectPriority();
			public Result<String> updateMesInkageLoad(@RequestBody short inKageWord) {
			String result = upWorkstationService.updateMesInkageLoad(inKageWord);
			return Result.success(result);

			}

			}