From 4a489b6d2a512169c7422d282ec73b0b01329c44 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 19 四月 2024 08:54:39 +0800
Subject: [PATCH] 增加注解
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownGlassLogic.java | 42 ++++--------------------------------------
1 files changed, 4 insertions(+), 38 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..7ea66c7 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.getFlowCardId(),downGlassInfo.getId());
sequence++; // 閫掑椤哄簭瀛楁鍊�
@@ -142,14 +116,6 @@
}
- /**
- * @param downWorkstation // 婊℃灦鎷夎蛋 娓呴櫎娴佺▼鍗′俊鎭�
- */
-
-// public void clearFlowCardId(DownWorkstation downWorkstation) {
-//
-// downWorkstationMapper.clearFlowCardId(downWorkstation);
-// }
}
\ No newline at end of file
--
Gitblit v1.8.0