From f42bb93047f0aba68f358968499e1174e67a715a Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 01 四月 2024 08:40:31 +0800
Subject: [PATCH] 更新下片逻辑
---
UnLoadGlassModule/src/main/java/com/mes/service/PlcService.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/PlcService.java b/UnLoadGlassModule/src/main/java/com/mes/service/PlcService.java
index 581cfe8..398948d 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/service/PlcService.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/service/PlcService.java
@@ -72,11 +72,10 @@
downGlassInfoMapper.insert(newdownGlassInfo);
//鎻掑叆鏁版嵁鍒版満姊版墜浠诲姟琛�
downWorkstationMapper.insertdownWorkstationtask(newdownGlassInfo);
- //鏇存柊浠诲姟琛ㄧ姸鎬佷负0
+ //鏇存柊涓嬬墖浠诲姟琛ㄧ姸鎬佷负0
downGlassInfoMapper.updateTaskStateToZero(downGlassInfo.getFlowCardId());
sequence++; // 閫掑椤哄簭瀛楁鍊�
-
@@ -91,11 +90,18 @@
//downWorkstationMapper = WebSocketServer.applicationContext.getBean(DownWorkstationMapper.class);
//downGlassInfoMapper = WebSocketServer.applicationContext.getBean(DownGlassInfoMapper.class);
try {
+ //鏌ヨ涓嬬墖宸ヤ綅琛ㄤ腑鏋跺瓙鏄惁缁戝畾浜嗘祦绋嬪崱鍙� 宸ヤ綅琛ㄥ拰浠诲姟琛ㄤ腑鐘舵�佷负1鐨勬祦绋嬪崱鍙峰拰宸茶惤鏋舵暟閲�
List<DownWorkstation> taskdownWorkstation = downWorkstationMapper.selectdownWorkstationstate();
if (taskdownWorkstation != null && !taskdownWorkstation.isEmpty()) {
- //鏌ヨ涓嬬墖宸ヤ綅琛ㄤ腑鏄惁缁戝畾浜嗘灦瀛愭槸鍚︾粦瀹氫簡娴佺▼鍗″彿锛屽鏋滃凡缁忕粦瀹氬垯鏇存柊宸茶惤鏋舵暟閲�,骞朵笖鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
+ //锛屽鏋滃凡缁忕粦瀹氬垯鏇存柊宸茶惤鏋舵暟閲�,骞朵笖鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
for (DownWorkstation downWorkstation : taskdownWorkstation) {
- downWorkstationMapper.update_racks_number(downWorkstation.getFlowCardId(),6 );
+
+ //鏇存柊涓嬬墖宸ヤ綅琛ㄤ腑宸茶惤鏋舵暟閲�
+ downWorkstationMapper.update_racks_number(downWorkstation.getFlowCardId(),downWorkstation.getRacksnumber()+1 );
+
+ //鏇存柊鏈烘浠诲姟琛ㄤ腑鐘舵�佷负0
+ downWorkstationMapper.update_task_state_to_zero(downWorkstation.getFlowCardId());
+ //鍒犻櫎涓嬬墖浠诲姟琛ㄤ腑鐨勮褰�
downGlassInfoMapper.deletetask(downWorkstation.getFlowCardId());
}
@@ -111,18 +117,23 @@
- //缁戝畾娴佺▼鍗″彿鏋跺瓙
+
+ // 缁戝畾娴佺▼鍗″彿鏋跺瓙
public void bindingshelf(DownWorkstation downWorkstation){
-
- String FlowCardId=downWorkstation.getFlowCardId();
- int WorkstationId=downWorkstation.getWorkstationId();
-
-
-
+ downWorkstationMapper.updateFlowCardId(downWorkstation);
}
+ // 婊℃灦鎷夎蛋 娓呴櫎娴佺▼鍗′俊鎭�
+ public void clearFlowCardId(DownWorkstation downWorkstation){
+
+ downWorkstationMapper.clearFlowCardId(downWorkstation);
+ }
+
+
+
+
--
Gitblit v1.8.0