From 8223485b2f6c909de81924e107b1e268aa04bd41 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 30 六月 2024 22:59:26 +0800
Subject: [PATCH] 1、大理片笼进片逻辑调整：a、将扫描id后进生成任务信息，不执行卧转立进片命令； b、进片车空闲扫描，如果存在卧转立有满片的直接启动， 2、下片任务新增任务向plc发送任务信息 3、对外提供手工生成人工下片任务
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 f770a89..de9796e 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
@@ -39,19 +39,17 @@
@ApiOperation("淇敼宸ヤ綅琛ㄥ鍔犵幓鐠冧俊鎭垨鑰呭垹闄ょ幓鐠冧俊鎭�,浼犻�扷pworkstation绫�,鍙慨鏀瑰楂樺帤鏁伴噺鑶滅郴")
@PostMapping("/updateGlassMessage")
@ResponseBody
- public Result<UpWorkstation> updateGlassMessage(@RequestBody UpWorkstation upwork) {
- upWorkstationService.updateGlassMessage(upwork);
- return Result.build(200, "", upwork);
+ public Result<List<UpWorkstation>> updateGlassMessage(@RequestBody UpWorkstation upwork) {
+ Boolean info= upWorkstationService.updateGlassMessage(upwork);
+ List<UpWorkstation> glass = upWorkstationService.list();
+ if(info){
+ return Result.build(200, "鎴愬姛", glass);
+ }else{
+ return Result.build(100, "澶辫触", glass);
+ }
+
}
-// @ApiOperation("寮�濮嬩笂鐗囦换鍔�")
-// @PostMapping("/selectPriority") //璋冪敤涓婄墖浠诲姟
-// @ResponseBody
-// public void selectPriority() {
-// UpWorkSequence work=upWorkstationService.selectPriority();
-// log.info("鏄剧ず鍙笂鐨勭幓鐠冧俊鎭�:{}", work);
-//
-// }
@ApiOperation("淇敼涓婄墖mes鑱斿姩璇锋眰瀛�")
@@ -60,6 +58,7 @@
public Result<String> updateMesInkageLoad(@RequestBody short inKageWord) {
String result = upWorkstationService.updateMesInkageLoad(inKageWord);
return Result.success(result);
+
}
}
--
Gitblit v1.8.0