From d547fb41c160d98ab245d554bb9c4a22362dab1d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 14 六月 2024 15:03:13 +0800
Subject: [PATCH] 删除无用类，增加自动绑定架子
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java | 163 +++++++++++++++++++++++++++++------------------------
1 files changed, 89 insertions(+), 74 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
index e858451..96d5887 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java
@@ -16,6 +16,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -41,38 +42,58 @@
@Autowired
DownWorkstationService downWorkstationService;
@Autowired
- DownGlassInfoService downGlassInfoService;
-
-
+ DownGlassInfoService downGlassInfoService;
@Autowired
private DownWorkstationTaskService downWorkstationTaskService;
-// @Value("${mes.threshold}")
+ // @Value("${mes.threshold}")
private int threshold;
- // @Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 1000)
+ public void autoBindRack() {
+ log.info("鏍规嵁缂撳瓨涓凡缁忚繘鐗囩殑鐜荤拑绉嶆暟閲忔渶澶氱殑娴佺▼鍗″彿鑷姩缁戝畾涓�涓惎鐢ㄧ姸鎬佺殑绌烘灦瀛�");
+
+ List<DownStorageCageDetails> Details = downStorageCageService.selectCacheMax();
+ if (Details.size() > 0) {
+ DownStorageCageDetails downStorageCageDetails = Details.get(0);
+ String flowCardId = downStorageCageDetails.getFlowCardId();
+ int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId);
+ DownWorkstation downWorkstation = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>().eq(DownWorkstation::getFlowCardId, null));
+ List<DownWorkstation> downWorkstations = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
+ .eq(DownWorkstation::getEnableState, 1));
+
+ if (!downWorkstations.stream().anyMatch(workstation -> workstation.getFlowCardId().equals(flowCardId))) {
+ downWorkstationService.updateFlowCardIdAndCount(flowCardId, glassInfoCount, downWorkstation.getWorkstationId());
+ }
+
+
+ }
+ }
+
+
+ // @Scheduled(fixedDelay = 1000)
public void plcdownGlassTask() {
- // PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+ // PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
// String taskRequestTypeValue = plcParameterObject.getPlcParameter("A06_request_word").getValue();
// String glassIdeValue = plcParameterObject.getPlcParameter("A05_scanning_ID").getValue();
// String confirmationWrodValue = plcParameterObject.getPlcParameter("MES_confirmation_word").getValue();
// String outGlassstate = plcParameterObject.getPlcParameter("A09_glass_status").getValue();
// String confirmationWrodAddress = plcParameterObject.getPlcParameter("MES_confirmation_word").getAddress();
- // String G06RobotTaskRequestWord = plcParameterObject.getPlcParameter("G06RobotTaskRequestWord").getAddress();
+ // String G06RobotTaskRequestWord = plcParameterObject.getPlcParameter("G06RobotTaskRequestWord").getAddress();
- String taskRequestTypeValue ="0";
- String glassIdeValue ="NG24041101C002-2-6-1-6";
- String confirmationWrodValue ="1";
- String outGlassstate="1";
- String confirmationWrodAddress="1";
- String G11RobotTaskRequestWord ="0";
- String G06RobotTaskRequestWord ="0";
- String G13RobotTaskRequestWord ="0";
+ String taskRequestTypeValue = "0";
+ String glassIdeValue = "NG24041101C002-2-6-1-6";
+ String confirmationWrodValue = "1";
+ String outGlassstate = "1";
+ String confirmationWrodAddress = "1";
+ String G11RobotTaskRequestWord = "0";
+ String G06RobotTaskRequestWord = "0";
+ String G13RobotTaskRequestWord = "0";
- log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{}锛岃幏鍙栧埌鐨勭‘璁ゅ瓧涓猴細{}锛岃幏鍙栧埌鐨勫嚭鐗囩姸鎬佷负锛歿}",
+ log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{}锛岃幏鍙栧埌鐨勭‘璁ゅ瓧涓猴細{}锛岃幏鍙栧埌鐨勫嚭鐗囩姸鎬佷负锛歿}",
taskRequestTypeValue, glassIdeValue, confirmationWrodValue, outGlassstate);
// if ("0".equals(taskRequestTypeValue)) {
@@ -96,7 +117,7 @@
} else if ("2".equals(taskRequestTypeValue)) {
log.info("3銆佸嚭鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�");
- outTo( confirmationWrodAddress);
+ outTo(confirmationWrodAddress);
} else if ("3".equals(taskRequestTypeValue)) {
log.info("3銆佽繘鐗囧拰鍑虹墖閮界┖闂诧紝鎵ц鍑虹墖浠诲姟");
@@ -107,7 +128,7 @@
}
}
- if (("1".equals(G11RobotTaskRequestWord) || "1".equals(G06RobotTaskRequestWord)) || "1".equals(G13RobotTaskRequestWord)) {
+ if (("1".equals(G11RobotTaskRequestWord) || "1".equals(G06RobotTaskRequestWord)) || "1".equals(G13RobotTaskRequestWord)) {
log.info("4銆佹湁鏈哄櫒浜轰笅鐗囪姹傦紝鎵ц涓嬬墖浠诲姟");
insertdownglassinfo();
}
@@ -115,13 +136,11 @@
//鑷姩缁戝畾鏋跺瓙锛屽鏋滃伐浣嶈〃娌℃湁缁戝畾鏋跺瓙锛岄粯璁ゅ皢绗煎瓙涓暟閲忔渶澶氱殑娴佺▼鍗″彿缁戝畾鏈哄櫒鎵�2鐨勭┖鏋跺瓙
-
-
-
}
/**
* 杩涚墖浠诲姟
+ *
* @param glassId
* @param confirmationWrodAddress
* @param
@@ -135,41 +154,39 @@
}
log.info("2銆佽幏鍙栧埌鐨勭幓鐠冧俊鎭负{}", glassInfo);
- if (glassInfo.getGlassId().equals(downStorageCageDetailsService.DirectConnection()) ) {
+ if (glassInfo.getGlassId().equals(downStorageCageDetailsService.DirectConnection())) {
//鐩撮��
log.info("3銆佸鏋滃綋鍓嶇幓鐠冨睘浜庣増鍥緄d鍜岀墖搴忕殑椤哄簭鍒欑洿閫氾紝鎵ц涓嬬墖浠诲姟");
DownWorkstation downWorkstation = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>().eq(DownWorkstation::getFlowCardId, glassInfo.getFlowCardId()));
- int WorkstationId=downWorkstation.getWorkstationId();
+ int WorkstationId = downWorkstation.getWorkstationId();
DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(glassInfo, "0", String.valueOf(WorkstationId), "3");
downGlassTaskService.insertCacheTask(downGlassTask);
- }else{
+ } else {
log.info("4銆佸鏋滀笉灞炰簬鐗堝浘id鍜岀墖搴忕殑椤哄簭鎵ц杩涚墖浠诲姟");
- //娣诲姞杩涚墖浠诲姟 鏌ユ壘绌烘牸
- List<DownStorageCageDetails> list = downStorageCageService.selectCacheEmpty();
- if(list.size()>0){
- DownStorageCageDetails item = list.get(0);
+ //娣诲姞杩涚墖浠诲姟 鏌ユ壘绌烘牸
+ List<DownStorageCageDetails> list = downStorageCageService.selectCacheEmpty();
+ if (list.size() > 0) {
+ DownStorageCageDetails item = list.get(0);
+ log.info("5銆佹煡璇㈠崸寮忕悊鐗囩閲岄潰鐨勭┖鏍�:{}", list);
+ log.info("6銆佸皢鐜荤拑淇℃伅鎻掑叆鍗у紡鐞嗙墖绗�,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
+ DownStorageCageDetails details = new DownStorageCageDetails();
+ BeanUtils.copyProperties(glassInfo, details);
+ details.setState(1);
+ details.setGlassId(glassInfo.getGlassId());
+ details.setSlot(item.getSlot());
+ details.setDeviceId(item.getDeviceId());
+ downStorageCageDetailsService.save(details);
+ log.info("7銆佺幓鐠冧俊鎭凡瀛樺叆鐞嗙墖绗艰鎯呰〃锛岀幓鐠冧俊鎭负{}", details);
- log.info("5銆佹煡璇㈠崸寮忕悊鐗囩閲岄潰鐨勭┖鏍�:{}", list);
- log.info("6銆佸皢鐜荤拑淇℃伅鎻掑叆鍗у紡鐞嗙墖绗�,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
- DownStorageCageDetails details = new DownStorageCageDetails();
- BeanUtils.copyProperties(glassInfo, details);
- details.setState(1);
- details.setGlassId(glassInfo.getGlassId());
- details.setSlot(item.getSlot());
- details.setDeviceId(item.getDeviceId());
- downStorageCageDetailsService.save(details);
- log.info("7銆佺幓鐠冧俊鎭凡瀛樺叆鐞嗙墖绗艰鎯呰〃锛岀幓鐠冧俊鎭负{}", details);
-
- DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(glassInfo, "0", item.getSlot() + "", "1");
- //娣诲姞杩涚墖浠诲姟
- log.info("8銆佺敓鎴愯繘鐗囦换鍔′俊鎭瓨鍏ヤ换鍔¤〃{}", downGlassTask);
- downGlassTaskService.insertCacheTask(downGlassTask);
- }
-
+ DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(glassInfo, "0", item.getSlot() + "", "1");
+ //娣诲姞杩涚墖浠诲姟
+ log.info("8銆佺敓鎴愯繘鐗囦换鍔′俊鎭瓨鍏ヤ换鍔¤〃{}", downGlassTask);
+ downGlassTaskService.insertCacheTask(downGlassTask);
+ }
}
@@ -181,15 +198,14 @@
* 鍑虹墖浠诲姟
*
* @param confirmationWrodAddress
- *
*/
- private Boolean outTo( String confirmationWrodAddress) {
+ private Boolean outTo(String confirmationWrodAddress) {
log.info("鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勬枡鏋跺彿 鏌ヨ绗﹀悎鎸夌収鐗堝浘id鍜岀墖搴忓嚭鐗�,骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖");
- List<DownStorageCageDetails> list = downStorageCageDetailsService.CacheOut1(1,3);
+ List<DownStorageCageDetails> list = downStorageCageDetailsService.CacheOut1(1, 3);
- List<DownStorageCageDetails> list2 = downStorageCageDetailsService.CacheOut1(4,6);
+ List<DownStorageCageDetails> list2 = downStorageCageDetailsService.CacheOut1(4, 6);
- List<DownStorageCageDetails> list3 = downStorageCageDetailsService.CacheOut1(1,6);
+ List<DownStorageCageDetails> list3 = downStorageCageDetailsService.CacheOut1(1, 6);
// 浼樺厛 瓒呭嚭灏哄浼樺厛浜哄伐鍑虹墖 浜哄伐澶勭悊
if (!list3.isEmpty()) {
@@ -201,11 +217,10 @@
DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(item3, "9", endcell, "2");
downGlassTaskService.insertCacheTask(downGlassTask);
- // S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 2);
+ // S7object.getinstance().plccontrol.WriteWord(confirmationWrodAddress, (short) 2);
- return true;
- }
- else if (!list2.isEmpty() && !list3.isEmpty()) {
+ return true;
+ } else if (!list2.isEmpty() && !list3.isEmpty()) {
log.info("鍓嶅悗绔兘绌洪棽 浼樺厛鍚庣鍑虹墖骞朵笖浼樺厛婊℃灦");
DownStorageCageDetails item4 = list2.get(0);
@@ -253,34 +268,34 @@
}
-//
+ //
public void insertdownglassinfo() {
try {
- List<DownGlassTask> taskdownGlassInf = downGlassTaskService.getUnloadingTaskState();
- if (taskdownGlassInf != null && !taskdownGlassInf.isEmpty()) {
+ List<DownGlassTask> taskdownGlassInf = downGlassTaskService.getUnloadingTaskState();
+ if (taskdownGlassInf != null && !taskdownGlassInf.isEmpty()) {
- for (DownGlassTask downGlassInfo : taskdownGlassInf) {
- // 鍒涘缓鏂扮殑 DownGlassInfo 瀵硅薄骞惰缃浉鍏冲睘鎬�
- DownGlassInfo newdownGlassInfo = new DownGlassInfo();
+ for (DownGlassTask downGlassInfo : taskdownGlassInf) {
+ // 鍒涘缓鏂扮殑 DownGlassInfo 瀵硅薄骞惰缃浉鍏冲睘鎬�
+ DownGlassInfo newdownGlassInfo = new DownGlassInfo();
- Integer maxSequence = downGlassInfoService.getMaxSequenceByFlowCardId(downGlassInfo.getFlowCardId());
- // 鍒濆鍖栭『搴忓瓧娈靛��
- int sequence = maxSequence != null ? maxSequence + 1 : 1;
- BeanUtils.copyProperties(downGlassInfo, newdownGlassInfo);
- // 璁剧疆椤哄簭瀛楁鍊�
- newdownGlassInfo.setSequence(sequence);
- // 鎻掑叆鏁版嵁鍒颁笅鐗囩幓鐠冧俊鎭〃
- downGlassInfoService.insertDownGlassInfo(newdownGlassInfo);
- log.info("鎻掑叆鏁版嵁鍒颁笅鐗囩幓鐠冧俊鎭〃");
- DownWorkstation downWorkstation1 = downWorkstationService.selectByFlowCardId(downGlassInfo.getFlowCardId());
- downWorkstationService.updateracksnumber(downGlassInfo.getFlowCardId(), downWorkstation1.getRacksnumber() + 1);
- log.info("鏇存柊钀芥灦鏁伴噺");
- sequence++; // 閫掑椤哄簭瀛楁鍊�
+ Integer maxSequence = downGlassInfoService.getMaxSequenceByFlowCardId(downGlassInfo.getFlowCardId());
+ // 鍒濆鍖栭『搴忓瓧娈靛��
+ int sequence = maxSequence != null ? maxSequence + 1 : 1;
+ BeanUtils.copyProperties(downGlassInfo, newdownGlassInfo);
+ // 璁剧疆椤哄簭瀛楁鍊�
+ newdownGlassInfo.setSequence(sequence);
+ // 鎻掑叆鏁版嵁鍒颁笅鐗囩幓鐠冧俊鎭〃
+ downGlassInfoService.insertDownGlassInfo(newdownGlassInfo);
+ log.info("鎻掑叆鏁版嵁鍒颁笅鐗囩幓鐠冧俊鎭〃");
+ DownWorkstation downWorkstation1 = downWorkstationService.selectByFlowCardId(downGlassInfo.getFlowCardId());
+ downWorkstationService.updateracksnumber(downGlassInfo.getFlowCardId(), downWorkstation1.getRacksnumber() + 1);
+ log.info("鏇存柊钀芥灦鏁伴噺");
+ sequence++; // 閫掑椤哄簭瀛楁鍊�
+ }
}
- }
} catch (Exception e) {
// 鎵撳嵃寮傚父淇℃伅
e.printStackTrace();
--
Gitblit v1.8.0