From 44051709072ff59407c9ce4592abe15d76c6128d Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期五, 19 四月 2024 16:57:22 +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 | 47 +++++++----------------------------------------
1 files changed, 7 insertions(+), 40 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 12efb2c..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
@@ -21,41 +21,16 @@
@Service
public class DownGlassLogic {
@Autowired
- private DownGlassInfo downGlassInfo;
- private DownWorkstation downWorkstation;
- private DownGlassInfoMapper downGlassInfoMapper;
+
+
private DownGlassInfoService downGlassInfoService;
private DownGlassTaskService downGlassTaskService;
private DownWorkstationMapper downWorkstationMapper;
private DownWorkstationService downWorkstationService;
private DownWorkstationTaskService downWorkstationTaskService;
PlcParameterObject plcread = PLCAutoMes.PlcReadObject;
- /**
- * // 鏈烘鎵�1PLC璇锋眰瀛�
- */
- String robot1PLCrequestword = plcread.getPlcParameter("A01Position").getValue();
- /**
- * // 鏈烘鎵�2PLC璇锋眰瀛�
- */
- String robot2PLCrequestword = plcread.getPlcParameter("A01Position").getValue();
- /**
- * // 鐜荤拑id
- */
- String glassID = plcread.getPlcParameter("A01Position").getValue();
- String glasswidth = plcread.getPlcParameter("A01Position").getValue();
- String glassheight = plcread.getPlcParameter("A01Position").getValue();
- //
- String glassthickness = plcread.getPlcParameter("A01Position").getValue();
- String pLcwancheng = plcread.getPlcParameter("A01Position").getValue();
- /**
- * // 瀛樻斁寰呭鐞嗙殑鐜荤拑淇℃伅
- */
- private List<DownGlassInfo> glassList;
- /**
- * 瀛樻斁鐜荤拑鏀剧疆鍦ㄧ紦瀛樼涓殑璇︾粏淇℃伅
- */
- private List<DownStorageCageDetails> cageDetailsList;
+
/**
* //褰撲笅鐗囦换鍔¤〃鐘舵�佷负1鏃跺�欏皢鏁版嵁鎻掑叆鍒颁笅鐗囩幓鐠冧俊鎭〃
@@ -68,7 +43,6 @@
downWorkstationService = WebSocketServer.applicationContext.getBean(DownWorkstationService.class);
downWorkstationTaskService = WebSocketServer.applicationContext.getBean(DownWorkstationTaskService.class);
downGlassInfoService = WebSocketServer.applicationContext.getBean(DownGlassInfoService.class);
- downGlassInfoMapper = WebSocketServer.applicationContext.getBean(DownGlassInfoMapper.class);
downGlassTaskService = WebSocketServer.applicationContext.getBean(DownGlassTaskService.class);
List<DownGlassTask> taskdownGlassInf = downGlassTaskService.getUnloadingTaskState();
//
@@ -100,7 +74,7 @@
downWorkstationTaskService.insertdownWorkstationtask(newdownGlassInfo);
//鏇存柊涓嬬墖浠诲姟琛ㄧ姸鎬佷负0
- downGlassTaskService.updateTaskStateToZero(downGlassInfo.getFlowCardId());
+ downGlassTaskService.updateTaskStateToZero(downGlassInfo.getId());
sequence++; // 閫掑椤哄簭瀛楁鍊�
@@ -126,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());
}
}
@@ -142,14 +117,6 @@
}
- /**
- * @param downWorkstation // 婊℃灦鎷夎蛋 娓呴櫎娴佺▼鍗′俊鎭�
- */
-
-// public void clearFlowCardId(DownWorkstation downWorkstation) {
-//
-// downWorkstationMapper.clearFlowCardId(downWorkstation);
-// }
}
\ No newline at end of file
--
Gitblit v1.8.0