From a6b6a0fe63555a44682f2e1f9bc65a668c84a7e9 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 23 四月 2024 12:32:11 +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 | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 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..e91289e 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
@@ -219,21 +219,33 @@
+ public DownGlassTask createDownGlassTask(GlassInfo glassInfo, String startCell, String endCell,String taskType ) {
+ DownGlassTask downGlassTask = new DownGlassTask();
+ downGlassTask.setId(glassInfo.getId());
+ downGlassTask.setStartCell(startCell);
+ downGlassTask.setTaskType(taskType);
+ downGlassTask.setEndCell(endCell);
+ downGlassTask.setWidth(glassInfo.getWidth());
+ downGlassTask.setHeight(glassInfo.getHeight());
+ downGlassTask.setFilmsid(String.valueOf(glassInfo.getFilmsid()));
+ downGlassTask.setThickness(glassInfo.getThickness());
+ downGlassTask.setFlowCardId(glassInfo.getFlowcardId());
+
+ return downGlassTask;
+ }
@Override
public boolean processInto(String Number) {
- glassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class);
- downStorageCageService = WebSocketServer.applicationContext.getBean(DownStorageCageService.class);
//鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
GlassInfo GlassInfo = glassInfoService.selectGlassId(Number);
- PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
+ PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
//瀛樺湪姝ょ幓鐠冪紪鍙�
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 锛堣繘鐗囦换鍔★級
@@ -242,19 +254,11 @@
//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.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 downGlassTask = createDownGlassTask(GlassInfo,"0",item.getSlot()+"","1");
+
downGlassTaskService.insertCacheTask(downGlassTask);
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 1);
//瀹屾垚鍚庢彃鍏ュ皬鐗囨暟鎹埌缂撳瓨琛�
@@ -281,9 +285,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