From f9d0b853c119db7ab1639fea8a7f41d7c6f75b2d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 03 四月 2024 16:09:24 +0800
Subject: [PATCH] 添加查询、清除架子上内容接口
---
UnLoadGlassModule/src/main/java/com/mes/service/DownGlassLogic.java | 98 +++++++++++++++++++++++++-----------------------
1 files changed, 51 insertions(+), 47 deletions(-)
diff --git a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassLogic.java b/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassLogic.java
index 1974256..a2f03a6 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassLogic.java
+++ b/UnLoadGlassModule/src/main/java/com/mes/service/DownGlassLogic.java
@@ -12,35 +12,48 @@
import org.springframework.stereotype.Service;
import java.util.List;
+
@Data
@Service
public class DownGlassLogic {
+ 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();
@Autowired
private DownWorkstationMapper downWorkstationMapper;
private DownGlassInfo downGlassInfo;
private DownWorkstation downWorkstation;
private DownGlassInfoMapper downGlassInfoMapper;
-
private DownGlassInfoService downGlassInfoService;
+ /**
+ * // 瀛樻斁寰呭鐞嗙殑鐜荤拑淇℃伅
+ */
+ private List<DownGlassInfo> glassList;
+ /**
+ * 瀛樻斁鐜荤拑鏀剧疆鍦ㄧ紦瀛樼涓殑璇︾粏淇℃伅
+ */
+ private List<DownStorageCageDetails> cageDetailsList;
+ /**
+ * //褰撲笅鐗囦换鍔¤〃鐘舵�佷负1鏃跺�欏皢鏁版嵁鎻掑叆鍒颁笅鐗囩幓鐠冧俊鎭〃
+ */
-
-
-
- private List<DownGlassInfo> glassList; // 瀛樻斁寰呭鐞嗙殑鐜荤拑淇℃伅
- private List<DownStorageCageDetails> cageDetailsList; // 瀛樻斁鐜荤拑鏀剧疆鍦ㄧ紦瀛樼涓殑璇︾粏淇℃伅
- PlcParameterObject plcread=PLCAutoMes.PlcReadObject;
- String Robot1PLCrequestword=plcread.getPlcParameter("A01Position").getValue();// 鏈烘鎵�1PLC璇锋眰瀛�
- String Robot2PLCrequestword=plcread.getPlcParameter("A01Position").getValue();// 鏈烘鎵�2PLC璇锋眰瀛�
- String GlassID=plcread.getPlcParameter("A01Position").getValue();// 鐜荤拑id
- String Glasswidth=plcread.getPlcParameter("A01Position").getValue();//鐜荤拑瀹藉害
- String Glassheight=plcread.getPlcParameter("A01Position").getValue();//鐜荤拑楂樺害
- String Glassthickness=plcread.getPlcParameter("A01Position").getValue();//鍘氬害
- String PLCwancheng = plcread.getPlcParameter("A01Position").getValue();// plc瀹屾垚瀛�
-
-
- //褰撲笅鐗囦换鍔¤〃鐘舵�佷负1鏃跺�欏皢鏁版嵁鎻掑叆鍒颁笅鐗囩幓鐠冧俊鎭〃
public void insertdownglassinfo() {
@@ -51,7 +64,7 @@
//
if (taskdownGlassInf != null && !taskdownGlassInf.isEmpty()) {
-
+//
for (DownGlassInfo downGlassInfo : taskdownGlassInf) {
@@ -60,13 +73,15 @@
newdownGlassInfo.setFlowCardId(downGlassInfo.getFlowCardId());
Integer maxSequence = downGlassInfoMapper.getMaxSequenceByFlowCardId(downGlassInfo.getFlowCardId());
- int sequence = maxSequence != null ? maxSequence + 1 : 1; // 鍒濆鍖栭『搴忓瓧娈靛��
+ // 鍒濆鍖栭『搴忓瓧娈靛��
+ int sequence = maxSequence != null ? maxSequence + 1 : 1;
newdownGlassInfo.setWidth(downGlassInfo.getWidth());
newdownGlassInfo.setHeight(downGlassInfo.getHeight());
newdownGlassInfo.setThickness(downGlassInfo.getThickness());
newdownGlassInfo.setFilmsid(downGlassInfo.getFilmsid());
- newdownGlassInfo.setSequence(sequence); // 璁剧疆椤哄簭瀛楁鍊�
+ // 璁剧疆椤哄簭瀛楁鍊�
+ newdownGlassInfo.setSequence(sequence);
// 鎻掑叆鏁版嵁鍒颁笅鐗囩幓鐠冧俊鎭〃
downGlassInfoMapper.insert(newdownGlassInfo);
@@ -78,17 +93,18 @@
sequence++; // 閫掑椤哄簭瀛楁鍊�
-
}
}
}
- //褰撴満姊版墜浠诲姟琛ㄤ腑鐘舵�佷负1锛屽伐浣嶈〃娴佺▼鍗＄粦瀹氫簡鏋跺瓙 鏇存柊宸茬粡钀芥灦鏁伴噺锛屽苟涓旀妸涓嬬墖浠诲姟琛ㄧ殑瀵瑰簲璁板綍鍒犳帀
- public void down_workstation(){
+ /**
+ * //褰撴満姊版墜浠诲姟琛ㄤ腑鐘舵�佷负1锛屽伐浣嶈〃娴佺▼鍗＄粦瀹氫簡鏋跺瓙 鏇存柊宸茬粡钀芥灦鏁伴噺锛屽苟涓旀妸涓嬬墖浠诲姟琛ㄧ殑瀵瑰簲璁板綍鍒犳帀
+ */
- //downWorkstationMapper = WebSocketServer.applicationContext.getBean(DownWorkstationMapper.class);
- //downGlassInfoMapper = WebSocketServer.applicationContext.getBean(DownGlassInfoMapper.class);
+ public void downWorkstation() {
+
+
try {
//鏌ヨ涓嬬墖宸ヤ綅琛ㄤ腑鏋跺瓙鏄惁缁戝畾浜嗘祦绋嬪崱鍙� 宸ヤ綅琛ㄥ拰浠诲姟琛ㄤ腑鐘舵�佷负1鐨勬祦绋嬪崱鍙峰拰宸茶惤鏋舵暟閲�
List<DownWorkstation> taskdownWorkstation = downWorkstationMapper.selectdownWorkstationstate();
@@ -97,7 +113,7 @@
for (DownWorkstation downWorkstation : taskdownWorkstation) {
//鏇存柊涓嬬墖宸ヤ綅琛ㄤ腑宸茶惤鏋舵暟閲�
- downWorkstationMapper.update_racks_number(downWorkstation.getFlowCardId(),downWorkstation.getRacksnumber()+1 );
+ downWorkstationMapper.update_racks_number(downWorkstation.getFlowCardId(), downWorkstation.getRacksnumber() + 1);
//鏇存柊鏈烘浠诲姟琛ㄤ腑鐘舵�佷负0
downWorkstationMapper.update_task_state_to_zero(downWorkstation.getFlowCardId());
@@ -116,35 +132,23 @@
}
+ /**
+ * @param downWorkstation // 缁戝畾娴佺▼鍗″彿鏋跺瓙
+ */
-
- // 缁戝畾娴佺▼鍗″彿鏋跺瓙
- public void bindingshelf(DownWorkstation downWorkstation){
+ public void bindingshelf(DownWorkstation downWorkstation) {
downWorkstationMapper.updateFlowCardId(downWorkstation);
}
+ /**
+ * @param downWorkstation // 婊℃灦鎷夎蛋 娓呴櫎娴佺▼鍗′俊鎭�
+ */
- // 婊℃灦鎷夎蛋 娓呴櫎娴佺▼鍗′俊鎭�
- public void clearFlowCardId(DownWorkstation downWorkstation){
+ public void clearFlowCardId(DownWorkstation downWorkstation) {
- downWorkstationMapper.clearFlowCardId(downWorkstation);
+ downWorkstationMapper.clearFlowCardId(downWorkstation);
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
}
--
Gitblit v1.8.0