From 644cec71acf678cbfb0a6075d2466063eb9bb1ec Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 12 六月 2024 09:39:35 +0800
Subject: [PATCH] 1、大理片笼大车空闲扫描 2、配置文件新增常州 3、删除无用压缩包
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 171 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 148 insertions(+), 23 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 e5610a7..63c5dbb 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
@@ -1,5 +1,9 @@
package com.mes.job;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.mes.bigstorage.entity.BigStorageCageDetails;
+import com.mes.bigstorage.entity.BigStorageDTO;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
@@ -7,18 +11,24 @@
import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
import com.mes.common.S7object;
+import com.mes.common.config.Const;
import com.mes.device.PlcParameterObject;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
-import com.mes.edgstoragetask.service.TaskCacheService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
/**
* @author SNG-015
@@ -42,12 +52,13 @@
@Resource
private TemperingGlassInfoService temperingGlassInfoService;
- PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+ @Value("${mes.sequence.order}")
+ private boolean sequenceOrder;
public static boolean bigStorageCageFullAlarm = false;
- private int line1Time=0;
- private int line2Time=0;
+ private int line1Time = 0;
+ private int line2Time = 0;
/**
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
@@ -55,27 +66,29 @@
*/
@Scheduled(fixedDelay = 5000)
public void plcStorageCageTask() throws InterruptedException {
+
+ PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
try {
String plcFeedGlassid = "";
String plcFeedReqLine = "0";
if ("1".equals(plcParameterObject.getPlcParameter("D01Request").getValue())) {
plcFeedReqLine = "1";
- plcFeedGlassid=plcParameterObject.getPlcParameter("D01ID1").getValue();
+ plcFeedGlassid = plcParameterObject.getPlcParameter("D01ID1").getValue();
}
if ("1".equals(plcParameterObject.getPlcParameter("D04Request").getValue())) {
plcFeedReqLine = "2";
- plcFeedGlassid=plcParameterObject.getPlcParameter("D04ID1").getValue();
+ plcFeedGlassid = plcParameterObject.getPlcParameter("D04ID1").getValue();
}
- line1Time+=1;
- line2Time+=1;
+ line1Time += 1;
+ line2Time += 1;
if (!("0".equals(plcFeedReqLine))) {
log.info("1銆丳lc杩涚墖璇锋眰鏃�");
BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
GlassInfo glassInfo = glassInfoService.getById(plcFeedGlassid);
log.info("2銆佹牴鎹幓鐠僫d鑾峰彇鐜荤拑淇℃伅" + glassInfo);
- if(bigStorageCageDetailsService.selectGetBoard(plcFeedReqLine)>=0){
+ if (bigStorageCageDetailsService.selectGetBoard(plcFeedReqLine) >= 0) {
BigStorageCageDetails slotInfo = bigStorageCageService.feedGlass(glassInfo, bigStorageCageDetails);
if (slotInfo != null) {
int taskType = edgGlassTaskInfoService.judgeTasktype(plcFeedReqLine);
@@ -86,11 +99,11 @@
} else {
bigStorageCageFullAlarm = true;
}
- }else{
+ } else {
log.info("褰撳墠鐜荤拑瀹藉害涓嶅涓婅溅" + glassInfo);
- if(!("1".equals(plcFeedReqLine))){
+ if (!("1".equals(plcFeedReqLine))) {
S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D02Go").getAddress(), 1);
- }else{
+ } else {
S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D05Go").getAddress(), 1);
}
}
@@ -108,24 +121,24 @@
log.info("7銆佸垹闄ゅ凡缁忓畬鎴愮殑杩涚墖浠诲姟");
}
//鍚姩闃堝��
- if(line1Time>=300){
- if("0".equals(plcParameterObject.getPlcParameter("D05Go").getValue())){
+ if (line1Time >= 300) {
+ if ("0".equals(plcParameterObject.getPlcParameter("D05Go").getValue())) {
S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D02Go").getAddress(), 1);
}
}
- if(line2Time>=300){
- if("0".equals(plcParameterObject.getPlcParameter("D02Go").getValue())){
+ if (line2Time >= 300) {
+ if ("0".equals(plcParameterObject.getPlcParameter("D02Go").getValue())) {
S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D05Go").getAddress(), 1);
}
}
}
//鏌ヨ鍑虹墖琛ㄦ槸鍚︽湁浠诲姟鏈畬鎴愮殑浠诲姟
- List<BigStorageCageOutTask> bigStorageCageOutTask=bigStorageCageOutTaskService.querybigStorageCageOutTask(0);
- if(bigStorageCageOutTask.size()==0){
- boolean result=bigStorageCageService.outGlass();
+ List<BigStorageCageOutTask> bigStorageCageOutTask = bigStorageCageOutTaskService.querybigStorageCageOutTask(0);
+ if (bigStorageCageOutTask.size() == 0) {
+ boolean result = bigStorageCageService.outGlass();
log.info("8銆佹病鏈夋湭瀹屾垚浠诲姟鏃惰皟鐢ㄥ嚭鐗囨帴鍙�");
- if (result==false){
+ if (result == false) {
temperingGlassInfoService.schedulingTask();
}
}
@@ -133,11 +146,11 @@
log.info("9銆佹牴鎹换鍔¤〃鐘舵�佷慨鏀归挗鍖栧皬鐗囪〃浠诲姟鐘舵��");
//鏉ヤ笉鍙婇�佹椂鐩存帴璧�
- String line=Integer.toString(edgGlassTaskInfoService.startTask());
+ String line = Integer.toString(edgGlassTaskInfoService.startTask());
- if(!(line.equals(plcFeedReqLine))){
+ if (!(line.equals(plcFeedReqLine))) {
S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D02Go").getAddress(), 1);
- }else{
+ } else {
S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D05Go").getAddress(), 1);
}
@@ -147,4 +160,116 @@
}
}
+ @Scheduled(fixedDelay = 5000)
+ public void plcToHomeEdgFreeCarTask() {
+ PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+ String freeCar = plcParameterObject.getPlcParameter("freeCar").getValue();
+ if ("1".equals(freeCar)) {
+ log.info("澶ц溅闈炵┖闂�");
+ return;
+ }
+ String d01Request = plcParameterObject.getPlcParameter("D01Request").getValue();
+ String d01ID1 = plcParameterObject.getPlcParameter("D01ID1").getValue();
+// 0锛氫笉骞查 锛� 1锛氭潯浠舵弧瓒虫儏鍐典笅绔嬪嵆鍙戣溅
+ String d04Request = plcParameterObject.getPlcParameter("D04Request").getValue();
+ String d04ID1 = plcParameterObject.getPlcParameter("D04ID1").getValue();
+ log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧d01涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{};鑾峰彇鍒扮殑璇锋眰瀛梔04涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{};",
+ d01Request, d01ID1, d04Request, d04ID1);
+ //涓ゆ潯绾块兘鏈夎繘鍗ц浆绔嬩换鍔★紝鐩存帴缁撴潫
+ if (Const.BIG_STORAGE_REQUEST_IN.equals(d01Request)
+ && Const.BIG_STORAGE_REQUEST_IN.equals(d04Request)
+ && StringUtils.isNotBlank(d01ID1)
+ && StringUtils.isNotBlank(d04ID1)) {
+ log.info("涓ゆ潯绾块兘瀛樺湪杩涚墖浠诲姟锛岀粨鏉熶换鍔�");
+ return;
+ }
+ //鑾峰彇涓ゆ潯绾垮崸杞珛鏄惁鏈夌幓鐠冿紝涓斾换鍔＄姸鎬侀兘涓�2
+ List<String> lineList = bigStorageCageFeedTaskService.querySitToUpGlass();
+ if (CollectionUtils.isEmpty(lineList)) {
+ log.info("涓ゆ潯绾垮崸杞珛涓虹┖鎴栬�呮湁杩涚墖浠诲姟鏈畬鎴愶紝缁撴潫浠诲姟");
+ return;
+ }
+// 0锛氫笉骞查 锛� 1锛氭潯浠舵弧瓒虫儏鍐典笅绔嬪嵆鍙戣溅
+ String d02GoAdress = plcParameterObject.getPlcParameter("D02Go").getAddress();
+ // 0锛氫笉骞查 锛� 1锛氭潯浠舵弧瓒虫儏鍐典笅绔嬪嵆鍙戣溅
+ String d05GoAdress = plcParameterObject.getPlcParameter("D05Go").getAddress();
+ String line1 = lineList.get(0);
+ String flagLine = line1.equals(Const.A09_OUT_TARGET_POSITION) ? d01ID1 : d04ID1;
+ if (lineList.size() == 1) {
+ //鍙戦��
+ if (StringUtils.isNotBlank(flagLine)) {
+ return;
+ }
+ //璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
+ computeTargetByLine(Integer.parseInt(flagLine), d02GoAdress, d05GoAdress);
+ }
+ if (StringUtils.isBlank(d01ID1) && StringUtils.isBlank(d04ID1)) {
+ //姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
+ Integer line = getStartLine();
+ //璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
+ computeTargetByLine(line, d02GoAdress, d05GoAdress);
+ return;
+ }
+ int outLine = StringUtils.isBlank(d01ID1) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
+ //璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
+ computeTargetByLine(outLine, d02GoAdress, d05GoAdress);
+ }
+
+ /**
+ * 鑾峰彇闇�瑕佸惎鍔ㄧ殑绾胯矾锛氫袱鏉＄嚎閮藉彲鍚姩 鑾峰彇绗竴鐗囩幓鐠冪増鍥緄d鏈�灏� 鐗堝簭鏈�澶х殑绾胯矾
+ *
+ * @return
+ */
+ private Integer getStartLine() {
+ List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .inSql(BigStorageCageFeedTask::getId, "select min(id) from big_storage_cage_feed_task where task_state = 2 group by line"));
+ Assert.isTrue(CollectionUtils.isEmpty(taskList), "鍗ц浆绔嬩袱鏉＄嚎閮芥病鏈夌幓鐠冭繘鐗囦换鍔�");
+ Map<String, Integer> taskMap = taskList.stream().collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId,
+ BigStorageCageFeedTask::getLine));
+ GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
+ .in(GlassInfo::getGlassId, taskMap.keySet())
+ .orderByAsc(GlassInfo::getTemperingLayoutId)
+ .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence)
+ .last("limit 1"));
+ return taskMap.get(glassInfo.getGlassId());
+ }
+
+ /**
+ * 璁＄畻浠诲姟琛ㄨ繘鐗囩嚎璺殑鐩爣鏍煎瓙锛屽苟鍚姩浠诲姟
+ */
+ private boolean computeTargetByLine(Integer line, String d02GoAdress, String d05GoAdress) {
+ //1銆佽幏鍙栦换鍔¤〃涓殑鎵�鏈夌幓鐠冿紙鎸囧畾绾胯矾涓斿凡缁忚繘鍗ц浆绔嬪畬鎴愶級
+ List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .eq(BigStorageCageFeedTask::getLine, line)
+ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
+ .orderByAsc(BigStorageCageFeedTask::getId));
+ //2銆佸幓绗煎瓙鍐呮煡鎵炬槸鍚﹀彲浠ョ户缁瓨鏀剧殑绗煎瓙
+ List<String> glassIds = taskList.stream().map(BigStorageCageFeedTask::getGlassId).collect(Collectors.toList());
+ List<GlassInfo> glassInfos = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().in(GlassInfo::getGlassId, glassIds));
+ AtomicReference<Integer> temperingLayoutIdTemp = new AtomicReference<>(0);
+ AtomicReference<Integer> temperingFeedSequenceTemp = new AtomicReference<>(0);
+ AtomicReference<BigStorageDTO> bigStorageDTO = new AtomicReference<>(new BigStorageDTO());
+ Map<String, GlassInfo> glassInfoMap = glassInfos.stream().collect(Collectors.toMap(GlassInfo::getGlassId, p -> p));
+ taskList.stream().forEach(e -> {
+ //鎸夌収鐗堝浘淇℃伅鑾峰彇杩涚墖绗煎瓙鏍煎瓙鍙�
+ GlassInfo info = glassInfoMap.get(e.getGlassId());
+ if (temperingLayoutIdTemp.equals(info.getTemperingLayoutId())
+ && temperingFeedSequenceTemp.equals(info.getTemperingFeedSequence() + 1)
+ && info.getWidth() <= bigStorageDTO.get().getWidth()) {
+ bigStorageDTO.get().setWidth(bigStorageDTO.get().getWidth() - info.getWidth().intValue() - Const.BIG_STORAGE_GAP);
+ } else {
+ bigStorageDTO.set(bigStorageCageDetailsService.queryTargetSlotByTempering(info));
+ }
+ e.setTragetSlot(bigStorageDTO.get().getSlot());
+ temperingLayoutIdTemp.set(info.getTemperingLayoutId());
+ temperingFeedSequenceTemp.set(info.getTemperingFeedSequence());
+ });
+ //3銆佹洿鏂拌繘鐗囦换鍔¤〃
+ boolean taskFlag = bigStorageCageFeedTaskService.updateBatchById(taskList);
+ if (taskFlag) {
+ String lineAddress = line.equals(Const.A09_OUT_TARGET_POSITION) ? d02GoAdress : d05GoAdress;
+ S7object.getinstance().plccontrol.writeWord(lineAddress, (short) 1);
+ }
+ return taskFlag;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0