From fd7202328642fd790010f4071e8aa24b26530bf0 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期一, 22 四月 2024 20:08:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
index 0f46118..c07e1dc 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java
@@ -224,8 +224,6 @@
@Override
public boolean processInto(String Number) {
- glassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class);
- downStorageCageService = WebSocketServer.applicationContext.getBean(DownStorageCageService.class);
//鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
@@ -233,7 +231,7 @@
//瀛樺湪姝ょ幓鐠冪紪鍙�
if (GlassInfo != null) {
//鍚屾壘鍒板悓娴佺▼鍗￠檮杩戠┖鏍�
- List<DownStorageCageDetails> list = downStorageCageService.getIsExistIntoCacheByflowcardid(GlassInfo.getFlowcardId(), GlassInfo.getWidth());
+ List<DownStorageCageDetails> list = getIsExistIntoCacheByflowcardid(GlassInfo.getFlowcardId(), GlassInfo.getWidth());
if (list.size() > 0) {
//瀛樺湪绌烘牸
//1.鐢熸垚浠诲姟锛� 璧峰浣嶇疆0 缁撴潫浣嶇疆this.slot 浠诲姟绫诲瀷 1 锛堣繘鐗囦换鍔★級
@@ -243,15 +241,15 @@
//selectInfo.insertCacheTask(GlassInfo.getId() + "", "0", item.getSlot() + "", "1", GlassInfo.getWidth(), GlassInfo.getHeight(), GlassInfo.getFilmsid(), GlassInfo.getThickness(), GlassInfo.getFlowcardId());
DownGlassTask downGlassTask = new DownGlassTask();
- downGlassTask.setId(GlassInfo.getId()); // 璁剧疆鐜荤拑ID
+ downGlassTask.setId(GlassInfo.getId());
downGlassTask.setStartCell("0");
downGlassTask.setTaskType("1");
downGlassTask.setEndCell(item.getSlot()+"");
- downGlassTask.setWidth(GlassInfo.getWidth()); // 璁剧疆鐜荤拑瀹藉害
- downGlassTask.setHeight(GlassInfo.getHeight()); // 璁剧疆鐜荤拑楂樺害
- downGlassTask.setFilmsid(GlassInfo.getFilmsid()+""); // 璁剧疆鑶淚D
- downGlassTask.setThickness(GlassInfo.getThickness()); // 璁剧疆鐜荤拑鍘氬害
- downGlassTask.setFlowCardId(GlassInfo.getFlowcardId()); // 璁剧疆娴佺▼鍗″彿
+ downGlassTask.setWidth(GlassInfo.getWidth());
+ downGlassTask.setHeight(GlassInfo.getHeight());
+ downGlassTask.setFilmsid(GlassInfo.getFilmsid()+"");
+ downGlassTask.setThickness(GlassInfo.getThickness());
+ downGlassTask.setFlowCardId(GlassInfo.getFlowcardId());
downGlassTaskService.insertCacheTask(downGlassTask);
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
@@ -281,9 +279,9 @@
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
- List<DownStorageCageDetails> list = downStorageCageService.getCacheOut(1, 5);
- List<DownStorageCageDetails> list2 = downStorageCageService.getCacheOut(6, 10);
- List<DownStorageCageDetails> list3 = downStorageCageService.getCacheOut(1, 10);
+ List<DownStorageCageDetails> list = getCacheOut(1, 5);
+ List<DownStorageCageDetails> list2 = getCacheOut(6, 10);
+ List<DownStorageCageDetails> list3 = getCacheOut(1, 10);
//鑷姩缁戝畾鏋跺瓙
--
Gitblit v1.8.0