From 609818970fb1e7ae59b2535752a5ea063aa229b0 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 06 七月 2024 15:05:52 +0800
Subject: [PATCH] 1:大理片 新增计算最大宽度：避免高度大于宽度 计算出错 2、磨边前卧式理片新增最小尺寸校验 3、下片修复下片逻辑异常，新增配置 人工下片的最大尺寸 最小尺寸 直通任务的最大尺寸
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 105 ++++++++++++++++++++++++++++++----------------------
1 files changed, 60 insertions(+), 45 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
index 13d3406..22a81f7 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -78,19 +78,25 @@
@Value("${mes.outCarMaxSize}")
private Integer outCarMaxSize;
- @Value("${mes.galssGap}")
- private Integer galssGap;
+ @Value("${mes.glassGap}")
+ private Integer glassGap;
- @Scheduled(fixedDelay = 5000)
+ @Scheduled(fixedDelay = 300)
public void plcToHomeEdgScan() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
String d01Id = plcParameterObject.getPlcParameter("D01ID").getValue();
String d04Id = plcParameterObject.getPlcParameter("D04ID").getValue();
+ //D02id鍒ゆ柇鏄惁涓虹┖ 纭鏄惁绌洪棽 鍏佽杩涚墖
+ String d02State = plcParameterObject.getPlcParameter("D02ID").getValue();
String d03State = plcParameterObject.getPlcParameter("D03State").getValue();
String d05State = plcParameterObject.getPlcParameter("D05State").getValue();
- String mesD03Address = plcParameterObject.getPlcParameter("MESToD03").getAddress();
- String mesD05Address = plcParameterObject.getPlcParameter("MESToD05").getAddress();
-
+ String mesD01Address = plcParameterObject.getPlcParameter("MESToD01").getAddress();
+ String mesD04Address = plcParameterObject.getPlcParameter("MESToD04").getAddress();
+ String d01ToMES = plcParameterObject.getPlcParameter("D01ToMES").getValue();
+ if (!REQUEST_WORD.equals(d01ToMES)) {
+ log.info("璇锋眰瀛椾负{}锛岀粨鏉熸湰娆℃壂鎻忚繘鍗ц浆绔嬩换鍔�", d01ToMES);
+ return;
+ }
log.info("1銆佽幏鍙杁01Id鎵弿ID涓猴細{};鑾峰彇d04Id鎵弿ID涓猴細{};", d01Id, d04Id);
if (StringUtils.isBlank(d01Id) && StringUtils.isBlank(d04Id)) {
@@ -104,38 +110,35 @@
// Boolean flag01 = Boolean.FALSE;
// Boolean flag04 = Boolean.FALSE;
//鎸夌収绾胯矾鍙婄幓鐠僫d鑾峰彇鐩搁偦涓ゅ潡鐜荤拑 鍗ц浆绔嬩笂鐨勭幓鐠�
- if (StringUtils.isNotBlank(d01Id) && !REQUEST_WORD.equals(d03State)) {
- judgeGlassTypeStatus(d01Id, Const.A09_OUT_TARGET_POSITION, mesD03Address);
+ if (StringUtils.isNotBlank(d01Id) && (StringUtils.isBlank(d02State) || !REQUEST_WORD.equals(d03State))) {
+ judgeGlassTypeStatus(d01Id, Const.A09_OUT_TARGET_POSITION, mesD01Address);
}
if (StringUtils.isNotBlank(d04Id) && !REQUEST_WORD.equals(d05State)) {
- judgeGlassTypeStatus(d04Id, Const.A10_OUT_TARGET_POSITION, mesD05Address);
+ judgeGlassTypeStatus(d04Id, Const.A10_OUT_TARGET_POSITION, mesD04Address);
}
log.info("缁撴潫鎵爜浠诲姟");
-// if (flag01 && flag04) {
-// //姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
-// Integer startLine = getStartLine();
-// //璁＄畻鐩爣鏍煎瓙锛屽彂閫佸惎鍔ㄤ换鍔�
-// computeTargetByLine(startLine);
-// } else if (flag01 || flag04) {
-// Integer startLine = flag01.equals(Boolean.TRUE) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
-// //璁＄畻鐩爣鏍煎瓙锛屽彂閫佸惎鍔ㄤ换鍔�
-// computeTargetByLine(startLine);
-// } else {
-// log.info("涓ゆ潯绾挎湭鏀跺埌杩涚墖浠诲姟锛岀粨鏉熸湰娆℃壂鎻忚繘鍗ц浆绔嬩换鍔�");
-// }
}
- @Scheduled(fixedDelay = 5000)
+ @Scheduled(fixedDelay = 300)
public void plcToHomeEdgFreeCarTask() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
String e01Status = plcParameterObject.getPlcParameter("E01State").getValue();
+ String d03ToMES = plcParameterObject.getPlcParameter("D03ToMES").getValue();
+ String d05ToMES = plcParameterObject.getPlcParameter("D05ToMES").getValue();
+ log.info("鎵ц绌鸿溅閫佺墖浠诲姟锛岃幏鍙栧埌鐨勫ぇ杞︾姸鎬佷负{}锛屽崸杞珛鐘舵�佸垎鍒负d03:{}锛宒05:{}", e01Status, d03ToMES, d05ToMES);
if (REQUEST_WORD.equals(e01Status)) {
- log.info("杩涚墖澶ц溅闈炵┖闂�");
+ log.info("杩涚墖澶ц溅闈炵┖闂诧紝缁撴潫閫佺墖浠诲姟");
return;
}
- List<BigStorageCageFeedTask> feedTaskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ if (!REQUEST_WORD.equals(d03ToMES) && !REQUEST_WORD.equals(d05ToMES)) {
+ log.info("鍗ц浆绔嬫病鏈夐�佺墖璇锋眰锛岀粨鏉熼�佺墖浠诲姟");
+ return;
+ }
+ LambdaQueryWrapper<BigStorageCageFeedTask> wrapper = new LambdaQueryWrapper<BigStorageCageFeedTask>()
.eq(BigStorageCageFeedTask::getTaskType, Const.BIG_STORAGE_IN_RUN)
- .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP));
+ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP);
+ //鑾峰彇鍙互鍚姩鍗ц浆绔嬬殑浠诲姟绾胯矾
+ List<BigStorageCageFeedTask> feedTaskList = bigStorageCageFeedTaskService.list(wrapper);
if (CollectionUtils.isNotEmpty(feedTaskList)) {
if (feedTaskList.size() == 1) {
computeTargetByLine(feedTaskList.get(0).getLine());
@@ -209,9 +212,10 @@
}
- // @Scheduled(fixedDelay = 5000)
+ @Scheduled(fixedDelay = 300)
public void plcToHomeEdgOutTask() {
-
+ PlcParameterObject plcMesObject = S7object.getinstance().PlcMesObject;
+ String mesToPLCAddress = plcMesObject.getPlcParameter("MESToPLC").getAddress();
List<BigStorageCageOutTask> outingList = bigStorageCageOutTaskService.list(new LambdaQueryWrapper<BigStorageCageOutTask>().eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_NEW));
Assert.isTrue(CollectionUtils.isEmpty(outingList), "鏈夋鍦ㄦ墽琛屽嚭鐗囩殑浠诲姟锛岀粨鏉熷綋鍓嶅嚭鐗囩嚎绋�");
@@ -224,14 +228,14 @@
.orderBy(Boolean.TRUE, sequenceOrder, TemperingGlassInfo::getTemperingFeedSequence));
if (CollectionUtils.isNotEmpty(temperingGlassInfoList)) {
log.info("鏈夋鍦ㄥ嚭鐗囩殑閽㈠寲浠诲姟");
- computeOutGlassInfo(temperingGlassInfoList);
+ computeOutGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
return;
}
//鏄惁鏈変汉宸ヤ笅鐗囦换鍔� 鏈夌洿鎺ュ嚭
List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL).orderByDesc(BigStorageCageDetails::getWidth));
if (CollectionUtils.isNotEmpty(artificialList)) {
- computeOutGlassInfo(temperingGlassInfoList);
+ computeOutGlassInfo(artificialList, Boolean.FALSE, mesToPLCAddress);
return;
}
//閽㈠寲浼樺厛锛氳幏鍙栫悊鐗囩 鐜荤拑灏忕墖 鐮存崯琛� 鏁伴噺 鍒ゆ柇绗煎唴鐗堝浘鏄惁鍒伴綈
@@ -248,7 +252,7 @@
.eq(GlassInfo::getTemperingLayoutId, temperingLayoutDTO.getTemperingLayoutId())
.eq(GlassInfo::getEngineerId, temperingLayoutDTO.getEngineerId()));
temperingGlassInfoService.saveBatch(temperingGlassInfos);
- computeOutGlassInfo(temperingGlassInfoList);
+ computeOutGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
return;
}
//鏈埌榻� 鎵ц鍐呴儴璋冨害浠诲姟
@@ -258,7 +262,7 @@
for (int i = 0; i < slotSequenceList.size() - 1; i++) {
SlotSequenceDTO first = slotSequenceList.get(i);
SlotSequenceDTO second = slotSequenceList.get(i + 1);
- int slotWidth = carWidth - first.getRemainWidth() - galssGap;
+ int slotWidth = carWidth - first.getRemainWidth() - glassGap;
if (first.getMinSequence() == second.getMaxSequence() + 1
&& second.getRemainWidth() > slotWidth) {
List<BigStorageCageDetails> list = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
@@ -266,6 +270,8 @@
List<BigStorageCageOutTask> outTasks = list.stream().map(e -> new BigStorageCageOutTask(e.getGlassId(), first.getSlot(), second.getSlot(),
slotWidth, 0, 0, 1)).collect(Collectors.toList());
bigStorageCageOutTaskService.saveBatch(outTasks);
+ S7object.getinstance().plccontrol.writeWord(mesToPLCAddress, 1);
+ log.info("宸插悜plc鍙戦�佸嚭鐗囦换鍔＄‘璁わ紝鍦板潃涓猴細{}", mesToPLCAddress);
return;
}
}
@@ -297,10 +303,10 @@
Boolean flag = Boolean.TRUE;
//2銆佽幏鍙栧崸杞珛
- Integer widthFirst = edgGlassTaskInfoList.get(0).getWidth();
+ Integer widthFirst = Math.max(edgGlassTaskInfoList.get(0).getWidth(), edgGlassTaskInfoList.get(0).getHeight());
if (edgGlassTaskInfoList.size() == 1) {
if (remainWidth >= widthFirst) {
- if (glassCount <= 5) {
+ if (glassCount < inCarMaxSize) {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst);
} else {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
@@ -309,10 +315,10 @@
flag = Boolean.FALSE;
}
} else {
- Integer widthSecond = edgGlassTaskInfoList.get(1).getWidth();
+ Integer widthSecond = Math.max(edgGlassTaskInfoList.get(1).getWidth(), edgGlassTaskInfoList.get(1).getHeight());
if (remainWidth >= widthFirst) {
- if (remainWidth - widthFirst - galssGap >= widthSecond) {
- if (glassCount <= inCarMaxSize - 1) {
+ if (remainWidth - widthFirst - glassGap >= widthSecond) {
+ if (glassCount < inCarMaxSize) {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst);
} else {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
@@ -326,7 +332,7 @@
}
//鍚憄lc鍙戦�佽繘鐗囩‘璁�
if (flag) {
- S7object.getinstance().plccontrol.writeWord(mesAddress, (short) 1);
+ S7object.getinstance().plccontrol.writeWord(mesAddress, 1);
}
//璁板綍鏃犳硶鏀句笅鐜荤拑锛屽悗缁垽鏂惎鍔�
return flag;
@@ -424,13 +430,14 @@
String mesD05Address = plcMesObject.getPlcParameter("MESToD05").getAddress();
String outLine = line.equals(Const.A09_OUT_TARGET_POSITION) ? mesD03Address : mesD05Address;
for (int i = 1; i <= taskList.size(); i++) {
- s7control.writeWord(plcMesObject.getPlcParameter("StartAddToImport" + i).getAddress(), (short) taskList.get(i - 1).getLine());
- s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport" + i).getAddress(), (short) taskList.get(i - 1).getTargetSlot());
+ s7control.writeWord(plcMesObject.getPlcParameter("StartAddToImport" + i).getAddress(), taskList.get(i - 1).getLine());
+ s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport" + i).getAddress(), taskList.get(i - 1).getTargetSlot());
}
- s7control.writeWord(outLine, (short) 1);
+ s7control.writeWord(outLine, 2);
+ log.info("閫佺墖浠诲姟宸插彂閫佸畬鎴愶紝浠诲姟绾胯矾涓猴細{}锛屽惎鍔ㄥ湴鍧�涓簕}", line, outLine);
}
- private <T extends BigStorageCageBaseInfo> Boolean computeOutGlassInfo(List<T> list) {
+ private <T extends BigStorageCageBaseInfo> Boolean computeOutGlassInfo(List<T> list, Boolean isTempering, String mesToPLCAddress) {
//浠诲姟鏁版嵁 鑾峰彇杞﹀瓙瀛樻斁鐜荤拑鏈�澶ф暟閲� 鐜荤拑闂撮殧
List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
//鎵撹溅鍓╀綑灏哄
@@ -439,9 +446,15 @@
if (bigStorageCageOutTaskList.size() > outCarMaxSize || e.getWidth() > remainWidth) {
break;
}
- remainWidth = remainWidth - (int) e.getWidth() - galssGap;
- bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.A09_OUT_TARGET_POSITION,
- (int) e.getWidth(), 0, 0, 1));
+ remainWidth = remainWidth - (int) e.getWidth() - glassGap;
+ if (isTempering) {
+ bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
+ (int) e.getWidth() * 10, 0, 0, 1));
+ } else {
+ bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
+ (int) e.getWidth() * 10, 0, 0, 1));
+ }
+
}
Assert.isFalse(CollectionUtils.isEmpty(bigStorageCageOutTaskList), "鏈幏鍙栧嚭鐗囨暟鎹紝缁撴潫鍑虹墖浠诲姟");
log.info("鑾峰彇鍑虹墖浠诲姟鏁版嵁{}鏉★紝鎵ц淇濆瓨", bigStorageCageOutTaskList.size());
@@ -453,6 +466,8 @@
.in(BigStorageCageDetails::getGlassId, glassIds));
//鏇存柊绗煎瓙鍐呮牸瀛愮殑鍓╀綑灏哄
updateSlotRemain(list, glassIds);
+ S7object.getinstance().plccontrol.writeWord(mesToPLCAddress, 1);
+ log.info("宸插悜plc鍙戦�佸嚭鐗囦换鍔＄‘璁わ紝鍦板潃涓猴細{}", mesToPLCAddress);
return Boolean.TRUE;
}
@@ -468,7 +483,7 @@
List<Integer> slotList = list.stream().map(T::getSlot).distinct().collect(Collectors.toList());
//鑾峰彇寰呭嚭鍘荤殑鐜荤拑淇℃伅锛堢瓑涓嬭溅鍑哄幓鐨勭幓鐠冿級
Map<Integer, Double> slotRemainMap = list.stream().filter(e -> !taskGlassIds.contains(e.getGlassId()))
- .collect(Collectors.groupingBy(T::getSlot, Collectors.summingDouble(item -> item.getWidth() + galssGap)));
+ .collect(Collectors.groupingBy(T::getSlot, Collectors.summingDouble(item -> item.getWidth() + glassGap)));
if (CollectionUtils.isNotEmpty(slotRemainMap)) {
//鎸夌収鏍煎瓙鍙锋洿鏂板墿浣欏昂瀵�
slotRemainMap.forEach((e, v) -> {
--
Gitblit v1.8.0