From 7357691a222745887ca1c336d8c458964a0d3ab8 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 19 四月 2024 11:18:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java |    7 ++++---
 1 files changed, 4 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 e5e7e87..e142356 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
@@ -74,7 +74,7 @@
 
                 downWorkstationTaskService.insertdownWorkstationtask(newdownGlassInfo);
                 //鏇存柊涓嬬墖浠诲姟琛ㄧ姸鎬佷负0
-                downGlassTaskService.updateTaskStateToZero(downGlassInfo.getFlowCardId());
+                downGlassTaskService.updateTaskStateToZero(downGlassInfo.getId());
 
                 sequence++; // 閫掑椤哄簭瀛楁鍊�
 
@@ -100,9 +100,10 @@
                     //鏇存柊涓嬬墖宸ヤ綅琛ㄤ腑宸茶惤鏋舵暟閲�
                     downWorkstationService.updateracksnumber(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1);
                     //鏇存柊鏈烘浠诲姟琛ㄤ腑鐘舵�佷负0
-                    downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getFlowCardId());
+                    downWorkstationTaskService.updateTaskStateToZero(downWorkstation.getId());
+
                     //鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
-                    downGlassTaskService.deleteTask(downWorkstation.getFlowCardId());
+                    downGlassTaskService.deleteTask(downWorkstation.getId());
 
                 }
             }

--
Gitblit v1.8.0