From b08b4b56f53e4a3458da98178c03d44c3688a914 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 27 六月 2024 17:07:34 +0800
Subject: [PATCH] 下片功能已完成机械臂交互 待改进：界面新增人工出片功能，移除人工出片阈值校验
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java | 10 +-
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownCacheGlassTask.java | 22 ++---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java | 145 +++++++++++++++++++++++++----------
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java | 4
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 27 ++++--
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/impl/DownStorageCageServiceImpl.java | 4
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml | 2
7 files changed, 142 insertions(+), 72 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
index 936d473..2100a97 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -131,13 +131,24 @@
* 6 鎷胯蛋
*/
- public static final Integer TEMPERING_NEW =-1;
- public static final Integer TEMPERING_OUT =0;
- public static final Integer TEMPERING_DROP =1;
- public static final Integer TEMPERING_START =2;
- public static final Integer TEMPERING_SUCCESS =3;
- public static final Integer TEMPERING_END =4;
- public static final Integer TEMPERING_DAMAGE =5;
- public static final Integer TEMPERING_TAKE =6;
+ public static final Integer TEMPERING_NEW = -1;
+ public static final Integer TEMPERING_OUT = 0;
+ public static final Integer TEMPERING_DROP = 1;
+ public static final Integer TEMPERING_START = 2;
+ public static final Integer TEMPERING_SUCCESS = 3;
+ public static final Integer TEMPERING_END = 4;
+ public static final Integer TEMPERING_DAMAGE = 5;
+ public static final Integer TEMPERING_TAKE = 6;
+
+ /**
+ * 涓嬬墖
+ */
+ /**
+ * 鎵ц绾胯矾鏍煎瓙淇℃伅
+ */
+ public static final List<Integer> G06_WORK_STATION = Arrays.asList(1, 2, 3);
+ public static final List<Integer> G11_WORK_STATION = Arrays.asList(4, 5, 6);
+ public static final List<Integer> G13_WORK_STATION = Arrays.asList(7);
+
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
index 9c8a82c..d2808f7 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/DownGlassTask.java
@@ -36,12 +36,12 @@
/**
* 璧峰
*/
- private String startCell;
+ private Integer startCell;
/**
* 鐩爣
*/
- private String endCell;
+ private Integer endCell;
/**
* 浠诲姟绫诲瀷 1:杩� 2锛氬嚭
@@ -51,12 +51,12 @@
/**
* 瀹�
*/
- private Double width;
+ private Integer width;
/**
* 楂�
*/
- private Double height;
+ private Integer height;
/**
* 鑶滅郴
@@ -66,7 +66,7 @@
/**
* 鍘氬害
*/
- private Double thickness;
+ private Integer thickness;
/**
* 娴佺▼鍗″彿
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
index 272fb03..0332552 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownStorageCageService.java
@@ -19,9 +19,9 @@
*/
public interface DownStorageCageService extends MPJBaseService<DownStorageCage> {
- DownGlassTask createDownGlassTask(GlassInfo glassInfo, String startCell, String endCell, String taskType);
+ DownGlassTask createDownGlassTask(GlassInfo glassInfo, Integer startCell, Integer endCell, String taskType);
- DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, String startCell, String endCell, String taskType);
+ DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, Integer startCell, Integer endCell, String taskType);
// List<Map<String, Object>> selectCacheLeisure();
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 4e6fe11..5530fb5 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
@@ -48,7 +48,7 @@
private DownStorageCageDetailsMapper downStorageCageDetailsMapper;
@Override
- public DownGlassTask createDownGlassTask(GlassInfo glassInfo, String startCell, String endCell, String taskType) {
+ public DownGlassTask createDownGlassTask(GlassInfo glassInfo, Integer startCell, Integer endCell, String taskType) {
DownGlassTask downGlassTask = new DownGlassTask();
BeanUtils.copyProperties(glassInfo, downGlassTask);
@@ -60,7 +60,7 @@
}
@Override
- public DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, String startCell, String endCell, String taskType) {
+ public DownGlassTask createDownGlassTask(DownStorageCageDetails glassInfo, Integer startCell, Integer endCell, String taskType) {
DownGlassTask downGlassTask = new DownGlassTask();
BeanUtils.copyProperties(glassInfo, downGlassTask);
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 d6db167..9ce8dcc 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
@@ -135,8 +135,6 @@
}
-
-
}
/**
@@ -158,15 +156,15 @@
if (downStorageCageDetailsService.DirectConnection(glassInfo)) {
//鐩撮��
//log.info("3銆佸鏋滃綋鍓嶇幓鐠冨睘浜庣増鍥緄d鍜岀墖搴忕殑椤哄簭鍒欑洿閫氾紝鎵ц涓嬬墖浠诲姟");
- log.info("3銆佸鏋滃綋鍓嶇幓鐠冨睘浜庢祦绋嬪崱涓殑鐗囧簭鐨勯『搴忓垯鐩撮�氾紝鎵ц涓嬬墖浠诲姟");
+ log.info("3銆佸鏋滃綋鍓嶇幓鐠冨睘浜庢祦绋嬪崱涓殑鐗囧簭鐨勯『搴忓垯鐩撮�氾紝鎵ц涓嬬墖浠诲姟");
DownWorkstation downWorkstation = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>().eq(DownWorkstation::getFlowCardId, glassInfo.getFlowCardId()));
int WorkstationId = downWorkstation.getWorkstationId();
- DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(glassInfo, "0", String.valueOf(WorkstationId), "3");
+ DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(glassInfo, 0, WorkstationId, "3");
downGlassTaskService.insertCacheTask(downGlassTask);
} else {
- // log.info("4銆佸鏋滀笉灞炰簬鐗堝浘id鍜岀墖搴忕殑椤哄簭鎵ц杩涚墖浠诲姟");
+ // log.info("4銆佸鏋滀笉灞炰簬鐗堝浘id鍜岀墖搴忕殑椤哄簭鎵ц杩涚墖浠诲姟");
log.info("4銆佸鏋滀笉灞炰簬娴佺▼鍗′腑鐨勭墖搴忕殑椤哄簭鎵ц杩涚墖浠诲姟");
//娣诲姞杩涚墖浠诲姟 鏌ユ壘绌烘牸
@@ -186,7 +184,7 @@
downStorageCageDetailsService.save(details);
log.info("7銆佺幓鐠冧俊鎭凡瀛樺叆鐞嗙墖绗艰鎯呰〃锛岀幓鐠冧俊鎭负{}", details);
- DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(glassInfo, "0", item.getSlot() + "", "1");
+ DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(glassInfo, 0, item.getSlot(), "1");
//娣诲姞杩涚墖浠诲姟
log.info("8銆佺敓鎴愯繘鐗囦换鍔′俊鎭瓨鍏ヤ换鍔¤〃{}", downGlassTask);
downGlassTaskService.insertCacheTask(downGlassTask);
@@ -204,7 +202,7 @@
* @param MESSendingWord
*/
private Boolean outTo(String MESSendingWord) {
- // log.info("鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勬枡鏋跺彿 鏌ヨ绗﹀悎鎸夌収鐗堝浘id鍜岀墖搴忓嚭鐗�,骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖");
+ // log.info("鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勬枡鏋跺彿 鏌ヨ绗﹀悎鎸夌収鐗堝浘id鍜岀墖搴忓嚭鐗�,骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖");
log.info("鍗曠墖鎯呭喌鏍规嵁浼犲叆鐨勬枡鏋跺彿 鏌ヨ绗﹀悎鎸夌収娴佺▼鍗′腑椤哄簭鍑虹墖,骞朵笖浼樺厛鍑烘弧鏋剁殑灏忕墖");
// List<DownStorageCageDetails> list1to3 = downStorageCageDetailsService.CacheOut1(1, 3);
@@ -213,7 +211,7 @@
DownStorageCageDetails selectedItem = null;
- String endCell = "";
+ Integer endCell = null;
// 浼樺厛 瓒呭嚭灏哄浼樺厛浜哄伐鍑虹墖 浜哄伐澶勭悊
if (!list1to6.isEmpty()) {
@@ -246,11 +244,11 @@
new LambdaQueryWrapper<DownWorkstation>()
.eq(DownWorkstation::getFlowCardId, selectedItem.getFlowCardId())
);
- endCell = String.valueOf(downWorkstation.getWorkstationId());
- if (endCell.isEmpty()) {
- endCell = "7";
+ endCell = downWorkstation.getWorkstationId();
+ if (endCell == null) {
+ endCell = 7;
}
- DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(selectedItem, "9", endCell, "2");
+ DownGlassTask downGlassTask = downStorageCageService.createDownGlassTask(selectedItem, 9, endCell, "2");
downGlassTaskService.insertCacheTask(downGlassTask);
LambdaQueryWrapper<DownStorageCageDetails> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(DownStorageCageDetails::getGlassId, selectedItem.getGlassId());
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
index 37e0d50..cd2a2f3 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
@@ -28,6 +28,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -57,6 +58,12 @@
@Value("${mes.threshold}")
private Integer threshold;
+
+ @Value("${mes.throughWidth}")
+ private Integer throughWidth;
+
+ @Value("${mes.throughHeight}")
+ private Integer throughHeight;
@Value("${mes.maxWidth}")
private Integer maxWidth;
@@ -95,26 +102,26 @@
}
if ("1".equals(requestWord)) {
log.info("2銆佽繘鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�");
- inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
+ inTo(glassIdeValue, requestWord, confirmationWrodAddress, currentSlot);
} else if ("2".equals(requestWord)) {
//09绌洪棽 锛�1 10绌洪棽 锛�2 閮界┖闂诧細3 鍏朵粬0
log.info("2銆佸嚭鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�");
- outTo(Integer.parseInt(out08Glassstate),
- Integer.parseInt(out10Glassstate), confirmationWrodAddress, "", 0);
+// outTo(Integer.parseInt(out08Glassstate),
+// Integer.parseInt(out10Glassstate), confirmationWrodAddress, "", 0);
} else if ("3".equals(requestWord)) {
log.info("2銆佽繘鐗囧拰鍑虹墖閮界┖闂诧紝鎵ц鍑虹墖浠诲姟");
//鍔犵瀛愰噷闈㈡槸鍚︽湁鐜荤拑锛屾湁鍏堝嚭锛屾棤鐜荤拑鍏堣繘
- boolean outFlase = outTo(Integer.parseInt(out08Glassstate),
- Integer.parseInt(out10Glassstate), confirmationWrodAddress, glassIdeValue, Integer.parseInt(currentSlot));
+ boolean outFlase = false;
+// outTo(Integer.parseInt(out08Glassstate),
+// Integer.parseInt(out10Glassstate), confirmationWrodAddress, glassIdeValue, Integer.parseInt(currentSlot));
log.info("鍑虹墖浠诲姟鏄惁瀹屾垚锛歿},澶辫触涓旂幓鐠僫d:{}涓嶄负绌哄垯鎵ц杩涚墖浠诲姟", outFlase, glassIdeValue);
if (!outFlase && StringUtils.isNotBlank(glassIdeValue)) {
- inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
+ inTo(glassIdeValue, requestWord, confirmationWrodAddress, currentSlot);
}
}
}
-
- private void inTo(String glassId, String confirmationWrodAddress, String currentSlot) {
+ private void inTo(String glassId, String requestWord, String confirmationWrodAddress, String currentSlot) {
log.info("1銆佹寜鐓х幓鐠僫d:{}鑾峰彇鐜荤拑灏忕墖淇℃伅,褰撳墠鏍煎瓙涓�:{}", glassId, currentSlot);
//娣诲姞杩涚墖浠诲姟 鏌ユ壘绌烘牸
DownStorageCage nearestEmpty = downStorageCageService.selectCacheEmpty(Integer.parseInt(currentSlot), Boolean.FALSE);
@@ -122,8 +129,12 @@
log.info("2銆佹煡璇㈠崸寮忕悊鐗囩閲岄潰鐨勭┖鏍�:{}", nearestEmpty);
GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
Assert.isFalse(null == glassInfo, "鐜荤拑淇℃伅涓嶅瓨鍦�");
+ if ("1".equals(requestWord) && (glassInfo.getWidth() > throughWidth || glassInfo.getHeight() > throughHeight)) {
+ log.info("鐜荤拑褰撳墠灏哄瀹斤細{}锛岄珮锛歿}鍙兘鐩撮�氾紝褰撳墠杩涚墖浠诲姟闇�绛夊緟", glassInfo.getWidth(), glassInfo.getHeight());
+ return;
+ }
Boolean checkFlag = Boolean.FALSE;
- //todo:鐜荤拑灏哄鏄惁璧颁汉宸ヤ笅鐗�
+ //鐜荤拑灏哄鏄惁璧颁汉宸ヤ笅鐗�
if (glassInfo.getWidth() > maxWidth || glassInfo.getHeight() > maxHeight) {
log.info("璇ョ幓鐠冨昂瀵歌蛋浜哄伐涓嬬墖,鐩存帴杩涚墖");
} else {
@@ -162,7 +173,7 @@
for (GlassInfo item : glassInfoList) {
if (item.getWidth().equals(glassInfo.getWidth()) && item.getHeight().equals(glassInfo.getHeight())
&& item.getThickness().equals(glassInfo.getThickness()) && item.getFilmsid().equals(glassInfo.getFilmsid())) {
- //todo:鐜荤拑鏄惁涓哄灞�
+ //鐜荤拑鏄惁涓哄灞�
checkFlag = multilayerCheck(item);
if (checkFlag) {
//鐜荤拑鏇挎崲 浠呮浛鎹㈡祦绋嬪崱id鍙婂眰鏁�
@@ -191,42 +202,90 @@
downStorageCageDetails.setState(Const.GLASS_STATE_IN);
downStorageCageDetailsService.save(downStorageCageDetails);
// 鐢熸垚杩涚墖浠诲姟
- initDownGlassTask(glassInfo, nearestEmpty.getSlot() + "", null, Const.GLASS_CACHE_TYPE_IN);
+ initDownGlassTask(glassInfo, nearestEmpty.getSlot(), null, Const.GLASS_CACHE_TYPE_IN);
//log.info("5銆佺敓鎴愯繘鐗囦换鍔′俊鎭瓨鍏ヤ换鍔¤〃鏄惁瀹屾垚锛歿}", taskCache);
// S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, (short) 1);
// log.info("6銆佸彂閫佺‘璁ゅ瓧瀹屾垚");
}
- private Boolean outTo(int parseInt, int parseInt1, String confirmationWrodAddress, String s, int i) {
- //瀹氫箟绗煎唴鏃犳硶鍑虹墖鐜荤拑鏁伴噺
- int glassCount = 0;
- String glassId = null;
- Boolean isBind = Boolean.FALSE;
-
- List<DownStorageCageDetails> list = downStorageCageDetailsService.list(new LambdaQueryWrapper<DownStorageCageDetails>()
+ private Boolean outTo(String glassStatus06, String glassStatus11, String glassStatus13, String glassId) {
+ if ("2".equals(glassStatus06) && "2".equals(glassStatus11) && "2".equals(glassStatus13)) {
+ log.info("G06銆丟11銆丟13鍒嗗埆涓簕},{}銆亄}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖", glassStatus06, glassStatus11, glassStatus13);
+ return Boolean.FALSE;
+ }
+ List<DownStorageCageDetails> tempList = downStorageCageDetailsService.list(new LambdaQueryWrapper<DownStorageCageDetails>()
.eq(DownStorageCageDetails::getState, Const.GLASS_STATE_IN));
- log.info("绗煎唴鐜荤拑鐨勬暟鎹湁锛歿}", list);
- if (CollectionUtils.isEmpty(list)) {
+ log.info("绗煎唴鐜荤拑鐨勬暟鎹湁锛歿}", tempList);
+ if (CollectionUtils.isEmpty(tempList)) {
log.info("绗煎唴娌℃湁鐜荤拑,鏃犳硶鎵ц鍑虹墖");
return Boolean.FALSE;
}
+ //鑾峰彇2涓満姊拌噦鑼冨洿鍐呯殑鏋跺瓙缁戝畾鐨勬祦绋嬪崱淇℃伅
+ List<Integer> workList = new ArrayList();
+ if (!"2".equals(glassStatus06)) {
+ workList.addAll(Const.G06_WORK_STATION);
+ }
+ if (!"2".equals(glassStatus11)) {
+ workList.addAll(Const.G11_WORK_STATION);
+ }
+ List<DownStorageCageDetails> list = new ArrayList();
+ Boolean isEmptyShelf = Boolean.FALSE;
+ //瀵圭鍐呯幓鐠冭繘琛岃繃婊わ紝浠呭嚭绗﹀悎閫昏緫鐨勭幓鐠�
+ if (CollectionUtils.isNotEmpty(workList)) {
+ List<DownWorkstation> downWorkstationList = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
+ .eq(DownWorkstation::getEnableState, 0).in(DownWorkstation::getWorkstationId, workList));
+ log.info("鏋跺瓙琚鐢紝鏃犳硶鍑虹墖钀芥灦");
+ if (CollectionUtils.isEmpty(downWorkstationList)) {
+ log.info("绗煎瓙琚鐢紝鏃犳硶璧版満姊拌噦涓嬬墖");
+ //璧颁汉宸ヤ笅鐗�
+ if (!"2".equals(glassStatus13)) {
+ list = tempList.stream().filter(item -> item.getWidth() > maxWidth || item.getHeight() > maxHeight).collect(Collectors.toList());
+ }
+ } else {
+ List<DownWorkstation> workstationsIsNotBind = downWorkstationList.stream().filter(item -> null == (item.getFlowCardId())).collect(Collectors.toList());
+ Map<String, List<DownWorkstation>> listMap = downWorkstationList.stream().collect(Collectors.groupingBy(item -> item.getFlowCardId() + ":" + item.getLayer()));
+ if (CollectionUtils.isEmpty(workstationsIsNotBind)) {
+ log.info("涓嶅瓨鍦ㄦ湭缁戝畾娴佺▼鍗℃灦瀛�");
+ //绛涢�夊嚭瀵瑰簲鏋跺瓙宸茬粦瀹氭祦绋嬪崱鍙笅鐗囩殑鐜荤拑
+ list = tempList.stream().filter(item -> listMap.containsKey(item.getFlowCardId() + ":" + item.getLayer())).collect(Collectors.toList());
+ } else {
+ log.info("瀛樺湪鏈粦瀹氭祦绋嬪崱鏋跺瓙锛岀洿鎺ヨ幏鍙栫鍐呮墍鏈夌幓鐠�");
+ isEmptyShelf = Boolean.TRUE;
+ //todo:濡傛灉绂佺敤鏋跺瓙宸茬粦瀹氭祦绋嬪崱锛屽洜涓烘椂闂翠笉纭畾锛岀瀛愬唴鐨勭幓鐠冨彲閲嶆柊缁戝畾鏂版灦瀛�
+// list = tempList.stream().filter(item -> !listMap.containsKey(item.getFlowCardId() + ":" + item.getLayer())).collect(Collectors.toList());
+ list = tempList;
+ }
+ }
+ } else {
+ //鐩存帴璧颁汉宸ヤ笅鐗�
+ list = tempList.stream().filter(item -> item.getWidth() > maxWidth || item.getHeight() > maxHeight).collect(Collectors.toList());
+ }
+ if (CollectionUtils.isEmpty(list)) {
+ log.info("绗煎唴鐜荤拑鏃犳硶鎵ц鍑虹墖");
+ return Boolean.FALSE;
+ }
+ //瀹氫箟绗煎唴鏃犳硶鍑虹墖鐜荤拑鏁伴噺
+ int glassCount = tempList.size() - list.size();
+ String tempGlassId = null;
+ Boolean isBind = Boolean.FALSE;
+
for (DownStorageCageDetails item : list) {
if (item.getWidth() > maxWidth || item.getHeight() > maxHeight) {
log.info("鐜荤拑瀹藉害鎴栭珮搴﹁秴鍑洪槇鍊硷紝鎵ц浜哄伐涓嬬墖");
- glassId = item.getGlassId();
+ tempGlassId = item.getGlassId();
break;
}
}
loop:
- if (glassId == null) {
- //鑾峰彇姝ｅ湪钀芥灦鐨勭粦瀹氭祦绋嬪崱鐨勪俊鎭�
+ if (tempGlassId == null) {
+ //鑾峰彇姝ｅ湪钀芥灦鐨勭粦瀹氭祦绋嬪崱鐨勪俊鎭�(娴佺▼鍗°�佸眰鏁般�佽惤鏋舵暟閲�)
List<DownGlassInfoDTO> downGlassInfoDTOList = downGlassInfoService.queryWorkStationIsIn(Boolean.TRUE);
List<String> downGlassFlowList = downGlassInfoDTOList.stream().map(item -> item.getFlowCardId() + ":" + item.getLayer()).collect(Collectors.toList());
if (CollectionUtils.isEmpty(downGlassFlowList)) {
- //鑾峰彇鏋跺瓙鐜荤拑閮戒负绌猴紝鍑虹鍐呭瓙鏁伴噺鏈�澶氬昂瀵告渶澶х殑鐜荤拑
+ //鏋跺瓙鐜荤拑閮戒负绌猴紝鍑虹鍐呭瓙鏁伴噺鏈�澶氬昂瀵告渶澶х殑鐜荤拑
DownStorageCageDetails downStorageCageDetails = downStorageCageDetailsService.getGlassInfoMaxCount();
//缁戝畾娴佺▼鍗★紝鏇存柊鐜荤拑鐘舵�侊紝鐢熸垚鍑虹墖浠诲姟锛�
- glassId = downStorageCageDetails.getGlassId();
+ tempGlassId = downStorageCageDetails.getGlassId();
isBind = Boolean.TRUE;
break loop;
}
@@ -234,19 +293,19 @@
List<DownStorageCageDetails> noDownLoadList = list.stream().filter(item -> !downGlassFlowList.contains(item.getFlowCardId() + ":" + item.getLayer())).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(noDownLoadList)) {
//鏄惁鏈夌┖鏋跺瓙
- List<DownWorkstation> emptyShelfList = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
- .isNull(DownWorkstation::getFlowCardId));
- if (CollectionUtils.isNotEmpty(emptyShelfList)) {
+// List<DownWorkstation> emptyShelfList = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
+// .isNull(DownWorkstation::getFlowCardId));
+ if (isEmptyShelf) {
DownStorageCageDetails downStorageCageDetails = downStorageCageDetailsService.getGlassInfoMaxCount();
//缁戝畾娴佺▼鍗★紝鏇存柊鐜荤拑鐘舵�侊紝鐢熸垚鍑虹墖浠诲姟
- glassId = downStorageCageDetails.getGlassId();
+ tempGlassId = downStorageCageDetails.getGlassId();
isBind = Boolean.TRUE;
break loop;
}
glassCount = noDownLoadList.size();
if (glassCount > threshold) {
//鏇存柊鐜荤拑鐘舵�侊紝鐢熸垚鍑虹墖浜哄伐涓嬬墖浠诲姟
- glassId = noDownLoadList.get(0).getGlassId();
+ tempGlassId = noDownLoadList.get(0).getGlassId();
isBind = Boolean.FALSE;
break loop;
}
@@ -271,7 +330,7 @@
if (downGlassInfoDTO.getLayer().equals(downGlassInfoDTO.getLayer())) {
log.info("褰撳墠鐜荤拑鐨勬祦绋嬪湪鏋跺瓙涓婅惤鏋舵渶澶�,鐩存帴鍑虹墖");
//鏇存柊鐜荤拑鐘舵�侊紝鐢熸垚鍑虹墖浠诲姟
- glassId = noDownLoadList.get(0).getGlassId();
+ tempGlassId = noDownLoadList.get(0).getGlassId();
isBind = Boolean.FALSE;
break loop;
}
@@ -283,14 +342,14 @@
if (null != downGlassInfoDTO && downGlassInfo.getWidth().equals(item.getWidth()) && downGlassInfo.getHeight().equals(item.getHeight())) {
log.info("鐩稿悓娆″簭鐜荤拑瀵瑰簲涓婏紝鍙墽琛岃繘鐗囦换鍔�");
//鏇存柊鐜荤拑鐘舵�侊紝鐢熸垚鍑虹墖浠诲姟
- glassId = noDownLoadList.get(0).getGlassId();
+ tempGlassId = noDownLoadList.get(0).getGlassId();
isBind = Boolean.FALSE;
break loop;
} else {
log.info("鍚屾搴忕幓鐠冨搴斾笉涓婏紝闇�鎵ц鏇挎崲鐜荤拑鐨勬搷浣�");
glassCount += 1;
if (glassCount > threshold) {
- glassId = noDownLoadList.get(0).getGlassId();
+ tempGlassId = noDownLoadList.get(0).getGlassId();
isBind = Boolean.FALSE;
break loop;
}
@@ -301,13 +360,13 @@
Map<String, List<DownStorageCageDetails>> singleLayerMap = list.stream().filter(item -> item.getTotalLayer() == 1)
.collect(Collectors.groupingBy(item -> item.getFlowCardId() + item.getLayer(), Collectors.toList()));
- if (glassId == null) {
+ if (tempGlassId == null) {
if (CollectionUtils.isNotEmpty(singleLayerMap)) {
//鑾峰彇宸茶惤鏋舵祦绋嬪崱淇℃伅锛屾寜钀芥灦鏁伴噺鎺掑簭
for (DownGlassInfoDTO e : downGlassInfoDTOList) {
List<DownStorageCageDetails> downStorageCageDetails = singleLayerMap.get(e.getFlowCardId() + e.getLayer());
if (CollectionUtils.isNotEmpty(downStorageCageDetails)) {
- glassId = downStorageCageDetails.get(0).getGlassId();
+ tempGlassId = downStorageCageDetails.get(0).getGlassId();
isBind = Boolean.FALSE;
break;
}
@@ -315,12 +374,12 @@
}
}
}
- if (glassId == null) {
+ if (tempGlassId == null) {
log.info("娌℃湁鎵惧埌鍙互涓嬬墖鐨勭殑鐜荤拑锛岀粨鏉熶换鍔�");
return Boolean.FALSE;
} else {
- //todo:鎸夌収鍑虹墖鐨勭幓鐠僫d鏇存柊绗煎唴鐨勭幓鐠冪姸鎬佷负宸插嚭鐗�
- return generateDownGlassOutTask(glassId, Const.GLASS_CACHE_TYPE_OUT, isBind);
+ //鎸夌収鍑虹墖鐨勭幓鐠僫d鏇存柊绗煎唴鐨勭幓鐠冪姸鎬佷负宸插嚭鐗�
+ return generateDownGlassOutTask(tempGlassId, Const.GLASS_CACHE_TYPE_OUT, isBind);
}
}
@@ -360,7 +419,7 @@
//鎸夌幓鐠僫d鑾峰彇鐜荤拑淇℃伅
DownStorageCageDetails downStorageCageDetails = downStorageCageDetailsService.getOne(new LambdaQueryWrapper<DownStorageCageDetails>()
.eq(DownStorageCageDetails::getGlassId, glassId));
- String endCell = null;
+ Integer endCell = null;
if (isBind) {
//鑾峰彇绌烘灦瀛愪俊鎭紝灏嗙┖鏋跺瓙淇℃伅缁戝畾娴佺▼鍗�
DownWorkstation emptyDownWorkstation = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>()
@@ -370,7 +429,7 @@
emptyDownWorkstation.setFlowCardId(downStorageCageDetails.getFlowCardId());
emptyDownWorkstation.setLayer(downStorageCageDetails.getLayer());
downWorkstationService.updateById(emptyDownWorkstation);
- endCell = emptyDownWorkstation.getWorkstationId() + "";
+ endCell = emptyDownWorkstation.getWorkstationId();
} else {
log.info("娌℃湁绌烘灦瀛愪俊鎭紝鏃犳硶缁戝畾娴佺▼鍗�");
return Boolean.FALSE;
@@ -378,7 +437,7 @@
} else {
DownWorkstation workstation = downWorkstationService.getOne(new LambdaUpdateWrapper<DownWorkstation>()
.eq(DownWorkstation::getFlowCardId, downStorageCageDetails.getFlowCardId()).eq(DownWorkstation::getLayer, downStorageCageDetails.getLayer()));
- endCell = workstation.getWorkstationId() + "";
+ endCell = workstation.getWorkstationId();
}
//鏇存柊璇︽儏琛ㄥ唴鐨勭姸鎬�
if (downStorageCageDetailsService.update(new LambdaUpdateWrapper<DownStorageCageDetails>()
@@ -391,10 +450,10 @@
//鐢熸垚浠诲姟淇℃伅
GlassInfo glassInfo = new GlassInfo();
BeanUtils.copyProperties(downStorageCageDetails, glassInfo);
- return initDownGlassTask(glassInfo, downStorageCageDetails.getSlot() + "", endCell, taskType);
+ return initDownGlassTask(glassInfo, downStorageCageDetails.getSlot(), endCell, taskType);
}
- private Boolean initDownGlassTask(GlassInfo glassInfo, String startCell, String endCell, Integer taskType) {
+ private Boolean initDownGlassTask(GlassInfo glassInfo, Integer startCell, Integer endCell, Integer taskType) {
log.info("鐜荤拑{}鐢熸垚杩涚墖浠诲姟", glassInfo.getGlassId());
DownGlassTask downGlassTask = new DownGlassTask();
BeanUtils.copyProperties(glassInfo, downGlassTask);
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
index 0f84cf8..b13162f 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
@@ -16,4 +16,6 @@
mes:
maxWidth: 1000 #涓嬬墖鐨勬渶澶у搴�
maxHeight: 1000 #涓嬬墖鐨勬渶澶ч珮搴�
+ throughWidth: 3000
+ throughHeight: 3000
threshold: 5 #涓嬬墖鐨勬渶澶ч槇鍊�
--
Gitblit v1.8.0