From 99f113b35308144878037b808697c2075c811041 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 四月 2024 11:05:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java
index 045f2d8..150a27a 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java
@@ -70,7 +70,7 @@
downGlassInfoService = WebSocketServer.applicationContext.getBean(DownGlassInfoService.class);
downGlassInfoMapper = WebSocketServer.applicationContext.getBean(DownGlassInfoMapper.class);
downGlassTaskService = WebSocketServer.applicationContext.getBean(DownGlassTaskService.class);
- List<DownGlassTask> taskdownGlassInf = downWorkstationMapper.selectunloadingtaskstate();
+ List<DownGlassTask> taskdownGlassInf = downGlassTaskService.getUnloadingTaskState();
//
@@ -123,10 +123,8 @@
if (taskdownWorkstation != null && !taskdownWorkstation.isEmpty()) {
//锛屽鏋滃凡缁忕粦瀹氬垯鏇存柊宸茶惤鏋舵暟閲�,骞朵笖鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
for (DownWorkstation downWorkstation : taskdownWorkstation) {
-
//鏇存柊涓嬬墖宸ヤ綅琛ㄤ腑宸茶惤鏋舵暟閲�
downWorkstationService.updateracksnumber(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1);
-
//鏇存柊鏈烘浠诲姟琛ㄤ腑鐘舵�佷负0
downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getFlowCardId());
//鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
--
Gitblit v1.8.0