From a8e32b8a10bb462bb01f37e3b03d9d9fc3ffdee5 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期五, 10 五月 2024 16:28:59 +0800 Subject: [PATCH] 增加上片模块线程,增加保存工程时的已保存判断 --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java index 78c21a3..0534009 100644 --- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java @@ -1,10 +1,11 @@ package com.mes.workstation.controller; +import com.mes.utils.Result; import com.mes.workstation.entity.GlassInfo; +import com.mes.workstation.entity.UpWorkSequence; 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; @@ -26,7 +27,6 @@ public class UpWorkstationController { @Autowired private UpWorkstationService upWorkstationService; - private GlassInfo glassInfo; @ApiOperation("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅") @GetMapping("/list") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅 public Result<List<UpWorkstation>> list() { @@ -35,21 +35,24 @@ return Result.build(200, "", glass); } - //鏂板宸ヤ綅淇℃伅淇敼涓�鏉″伐浣嶄俊鎭�,鎺ユ敹瀹炰緥绫诲瓧娈典负瀹介珮鍘氳啘绯绘暟閲忓伐浣峣d //鍒犻櫎宸ヤ綅淇℃伅涔熺敤杩欎釜,闄や簡宸ヤ綅id鐜荤拑淇℃伅浼爊ull + @ApiOperation("淇敼宸ヤ綅琛ㄥ鍔犵幓鐠冧俊鎭垨鑰呭垹闄ょ幓鐠冧俊鎭�,浼犻�扷pworkstation绫�,鍙慨鏀瑰楂樺帤鏁伴噺鑶滅郴") @PostMapping("/updateGlassMessage") @ResponseBody - public void updateGlassMessage(@RequestBody UpWorkstation upwork) { + public Result<UpWorkstation> updateGlassMessage(@RequestBody UpWorkstation upwork) { upWorkstationService.updateGlassMessage(upwork); + return Result.build(200, "", upwork); } +// @ApiOperation("寮�濮嬩笂鐗囦换鍔�") +// @PostMapping("/selectPriority") //璋冪敤涓婄墖浠诲姟 +// @ResponseBody +// public void selectPriority() { +// UpWorkSequence work=upWorkstationService.selectPriority(); +// log.info("鏄剧ず鍙笂鐨勭幓鐠冧俊鎭�:{}", work); +// +// } - - @PostMapping("/selectPriority") //寮�濮嬩笂鐗囦换鍔� - @ResponseBody - public void selectPriority() { - upWorkstationService.selectPriority(); - } } -- Gitblit v1.8.0