From ea1a2fc497a5b67f1b32b1697b4c51c3ac5b2ccd Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 18 六月 2024 11:41:23 +0800
Subject: [PATCH] 大理片笼进出片任务逻辑初次提交:功能待调整优化,新增不钢化玻璃按尺寸进大理片笼
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 12
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 419 +++++++++++++++++++--------------------------------
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java | 2
4 files changed, 166 insertions(+), 269 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 73763d9..0c6feb0 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
@@ -28,11 +28,13 @@
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
* 璇嗗埆鍚庢垚鍔熺姸鎬�100
* 鍑虹墖浠诲姟101
+ * 浜哄伐涓嬬墖101
* 鎷胯蛋200
* 鐮存崯201
*/
public static final Integer GLASS_STATE_IN = 100;
public static final Integer GLASS_STATE_OUT = 101;
+ public static final Integer GLASS_STATE_ARTIFICIAL = 102;
public static final Integer GLASS_STATE_TAKE = 200;
public static final Integer GLASS_STATE_DAMAGE = 201;
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
index c0084df..490bbbf 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/entity/BigStorageCageDetails.java
@@ -6,7 +6,6 @@
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -21,7 +20,6 @@
* @author zhoush
* @since 2024-03-27
*/
-@ApiModel(description = "<p> </p>")
@Api(description = "澶х悊鐗囩璇︽儏")
@Data
@EqualsAndHashCode(callSuper = false)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index 6d0014c..13e1d47 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -220,19 +220,17 @@
@Override
public BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo) {
-// MPJLambdaWrapper<BigStorageDTO> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class)
-// .selectAll(BigStorageDTO.class)
-// .leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
-// .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
-// .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1)
-// .last("limit 1");
BigStorageDTO bigStorageDTO = null;
MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class)
.selectAsClass(BigStorageCage.class, BigStorageDTO.class)
.leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
- .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1)
.last("limit 1");
+ if (glassInfo.getTemperingLayoutId() == 0) {
+ wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight());
+ } else {
+ wrapper.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
+ }
bigStorageDTO = bigStorageCageService.selectJoinOne(BigStorageDTO.class, wrapper);
if (null != bigStorageDTO) {
return bigStorageDTO;
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 6bf600b..3e689cb 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
@@ -9,7 +9,6 @@
import com.mes.bigstorage.entity.dto.SlotSequenceDTO;
import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
-import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
@@ -35,8 +34,6 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
/**
@@ -46,8 +43,6 @@
@Slf4j
public class PlcStorageCageTask {
- @Resource
- private BigStorageCageService bigStorageCageService;
@Resource
private BigStorageCageDetailsService bigStorageCageDetailsService;
@Resource
@@ -61,151 +56,45 @@
@Resource
private TemperingGlassInfoService temperingGlassInfoService;
+ private static final String REQUEST_WORD = "1";
+
@Value("${mes.sequence.order}")
private boolean sequenceOrder;
@Value("${mes.slotWidth}")
private Integer slotWidth;
- public static boolean bigStorageCageFullAlarm = false;
-
- private int line1Time = 0;
- private int line2Time = 0;
-
- /**
- * fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
- * fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
- */
-// @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();
-// }
-// if ("1".equals(plcParameterObject.getPlcParameter("D04Request").getValue())) {
-// plcFeedReqLine = "2";
-// plcFeedGlassid = plcParameterObject.getPlcParameter("D04ID1").getValue();
-// }
-// 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) {
-// BigStorageCageDetails slotInfo = bigStorageCageService.feedGlass(glassInfo, bigStorageCageDetails);
-// if (slotInfo != null) {
-// int taskType = edgGlassTaskInfoService.judgeTasktype(plcFeedReqLine);
-// log.info("3銆佹煡璇换鍔¤〃鍒ゆ柇褰撳墠浠诲姟绫诲瀷涓轰笂杞︾瓑鍒拌繕鏄笂杞﹀惎鍔�" + taskType);
-// bigStorageCageFeedTaskService.addFeedTask(slotInfo, Integer.parseInt(plcFeedReqLine), taskType);
-// log.info("4銆佹坊鍔犱换鍔″埌浠诲姟琛�");
-// bigStorageCageFullAlarm = false;
-// } else {
-// bigStorageCageFullAlarm = true;
-// }
-// } else {
-// log.info("褰撳墠鐜荤拑瀹藉害涓嶅涓婅溅" + glassInfo);
-// if (!("1".equals(plcFeedReqLine))) {
-// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D02Go").getAddress(), 1);
-// } else {
-// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D05Go").getAddress(), 1);
-// }
-// }
-// } else {
-// List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskService.querybigStorageCageFeedTask(1);
-// log.info("5銆佹煡璇换鍔¤〃鏄惁鏈夊凡缁忓畬鎴愮殑杩涚墖浠诲姟" + bigStorageCageFeedTaskList.size());
-// for (BigStorageCageFeedTask bigStorageCageFeedTask : bigStorageCageFeedTaskList
-// ) {
-// BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
-// bigStorageCageDetails.setId(bigStorageCageFeedTask.getId());
-// bigStorageCageDetails.setState(1);
-// bigStorageCageDetailsService.updateById(bigStorageCageDetails);
-// log.info("6銆佷慨鏀圭悊鐗囩璇︽儏鐜荤拑鐘舵��");
-// bigStorageCageFeedTaskService.removeById(bigStorageCageFeedTask);
-// log.info("7銆佸垹闄ゅ凡缁忓畬鎴愮殑杩涚墖浠诲姟");
-// }
-// //鍚姩闃堝��
-// 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())) {
-// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D05Go").getAddress(), 1);
-// }
-// }
-// }
-//
-// //鏌ヨ鍑虹墖琛ㄦ槸鍚︽湁浠诲姟鏈畬鎴愮殑浠诲姟
-// List<BigStorageCageOutTask> bigStorageCageOutTask = bigStorageCageOutTaskService.querybigStorageCageOutTask(0);
-// if (bigStorageCageOutTask.size() == 0) {
-// boolean result = bigStorageCageService.outGlass();
-// log.info("8銆佹病鏈夋湭瀹屾垚浠诲姟鏃惰皟鐢ㄥ嚭鐗囨帴鍙�");
-// if (result == false) {
-// temperingGlassInfoService.schedulingTask();
-// }
-// }
-// bigStorageCageOutTaskService.updateOutTask();
-// log.info("9銆佹牴鎹换鍔¤〃鐘舵�佷慨鏀归挗鍖栧皬鐗囪〃浠诲姟鐘舵��");
-//
-// //鏉ヤ笉鍙婇�佹椂鐩存帴璧�
-// String line = Integer.toString(edgGlassTaskInfoService.startTask());
-//
-// if (!(line.equals(plcFeedReqLine))) {
-// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D02Go").getAddress(), 1);
-// } else {
-// S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("D05Go").getAddress(), 1);
-// }
-//
-//
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// }
@Scheduled(fixedDelay = 5000)
public void plcToHomeEdgScan() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
String d01Request = plcParameterObject.getPlcParameter("D01Request").getValue();
- String d01ID1 = plcParameterObject.getPlcParameter("D01ID1").getValue();
+ String d01Id = plcParameterObject.getPlcParameter("D01ID1").getValue();
String d04Request = plcParameterObject.getPlcParameter("D04Request").getValue();
- String d04ID1 = plcParameterObject.getPlcParameter("D04ID1").getValue();
+ String d04Id = plcParameterObject.getPlcParameter("D04ID1").getValue();
log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧d01涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{};鑾峰彇鍒扮殑璇锋眰瀛梔04涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{};",
- d01Request, d01ID1, d04Request, d04ID1);
- if (!"1".equals(d01Request) && !"1".equals(d04Request)) {
+ d01Request, d01Id, d04Request, d04Id);
+ if (!REQUEST_WORD.equals(d01Request) && !REQUEST_WORD.equals(d04Request)) {
log.info("涓ゆ潯绾挎湭鏀跺埌杩涚墖浠诲姟锛岀粨鏉熸湰娆℃壂鎻忚繘鍗ц浆绔嬩换鍔�");
return;
}
- // 0锛氫笉骞查 锛� 1锛氭潯浠舵弧瓒虫儏鍐典笅绔嬪嵆鍙戣溅
- String d02GoAdress = plcParameterObject.getPlcParameter("D02Go").getAddress();
- // 0锛氫笉骞查 锛� 1锛氭潯浠舵弧瓒虫儏鍐典笅绔嬪嵆鍙戣溅
- String d05GoAdress = plcParameterObject.getPlcParameter("D05Go").getAddress();
Boolean flag01 = Boolean.FALSE;
Boolean flag04 = Boolean.FALSE;
//鎸夌収绾胯矾鍙婄幓鐠僫d鑾峰彇鐩搁偦涓ゅ潡鐜荤拑 鍗ц浆绔嬩笂鐨勭幓鐠�
- if ("1".equals(d01Request)) {
- flag01 = judgeGlassTypeStatus(d01ID1, Const.A09_OUT_TARGET_POSITION);
+ if (REQUEST_WORD.equals(d01Request)) {
+ flag01 = judgeGlassTypeStatus(d01Id, Const.A09_OUT_TARGET_POSITION);
}
- if ("1".equals(d04Request)) {
- flag04 = judgeGlassTypeStatus(d04ID1, Const.A10_OUT_TARGET_POSITION);
+ if (REQUEST_WORD.equals(d04Request)) {
+ flag04 = judgeGlassTypeStatus(d04Id, Const.A10_OUT_TARGET_POSITION);
}
if (flag01 && flag04) {
//姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
Integer startLine = getStartLine();
//璁＄畻鐩爣鏍煎瓙锛屽彂閫佸惎鍔ㄤ换鍔�
- computeTargetByLine(startLine, d02GoAdress, d05GoAdress);
+ computeTargetByLine(startLine);
} else if (flag01 || flag04) {
Integer startLine = flag01.equals(Boolean.TRUE) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
//璁＄畻鐩爣鏍煎瓙锛屽彂閫佸惎鍔ㄤ换鍔�
- computeTargetByLine(startLine, d02GoAdress, d05GoAdress);
+ computeTargetByLine(startLine);
} else {
log.info("涓ゆ潯绾挎湭鏀跺埌杩涚墖浠诲姟锛岀粨鏉熸湰娆℃壂鎻忚繘鍗ц浆绔嬩换鍔�");
}
@@ -215,21 +104,21 @@
public void plcToHomeEdgFreeCarTask() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
String freeCar = plcParameterObject.getPlcParameter("freeCar").getValue();
- if ("1".equals(freeCar)) {
+ if (REQUEST_WORD.equals(freeCar)) {
log.info("澶ц溅闈炵┖闂�");
return;
}
String d01Request = plcParameterObject.getPlcParameter("D01Request").getValue();
- String d01ID1 = plcParameterObject.getPlcParameter("D01ID1").getValue();
+ String d01Id = plcParameterObject.getPlcParameter("D01ID1").getValue();
String d04Request = plcParameterObject.getPlcParameter("D04Request").getValue();
- String d04ID1 = plcParameterObject.getPlcParameter("D04ID1").getValue();
+ String d04Id = plcParameterObject.getPlcParameter("D04ID1").getValue();
log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧d01涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{};鑾峰彇鍒扮殑璇锋眰瀛梔04涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{};",
- d01Request, d01ID1, d04Request, d04ID1);
+ d01Request, d01Id, d04Request, d04Id);
//涓ゆ潯绾块兘鏈夎繘鍗ц浆绔嬩换鍔★紝鐩存帴缁撴潫
if (Const.BIG_STORAGE_REQUEST_IN.equals(d01Request)
&& Const.BIG_STORAGE_REQUEST_IN.equals(d04Request)
- && StringUtils.isNotBlank(d01ID1)
- && StringUtils.isNotBlank(d04ID1)) {
+ && StringUtils.isNotBlank(d01Id)
+ && StringUtils.isNotBlank(d04Id)) {
log.info("涓ゆ潯绾块兘瀛樺湪杩涚墖浠诲姟锛岀粨鏉熶换鍔�");
return;
}
@@ -239,122 +128,111 @@
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;
+ String flagLine = line1.equals(Const.A09_OUT_TARGET_POSITION) ? d01Id : d04Id;
if (lineList.size() == 1) {
- //鍙戦��
- if (StringUtils.isNotBlank(flagLine)) {
- return;
- }
//璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
- computeTargetByLine(Integer.parseInt(flagLine), d02GoAdress, d05GoAdress);
+ computeTargetByLine(Integer.parseInt(flagLine));
+ return;
}
- if (StringUtils.isBlank(d01ID1) && StringUtils.isBlank(d04ID1)) {
+ if (StringUtils.isBlank(d01Id) && StringUtils.isBlank(d04Id)) {
//姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
Integer line = getStartLine();
//璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
- computeTargetByLine(line, d02GoAdress, d05GoAdress);
+ computeTargetByLine(line);
return;
}
- int outLine = StringUtils.isBlank(d01ID1) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
+ int outLine = StringUtils.isBlank(d01Id) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
//璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
- computeTargetByLine(outLine, d02GoAdress, d05GoAdress);
+ computeTargetByLine(outLine);
}
@Scheduled(fixedDelay = 5000)
public void plcToHomeEdgOutTask() {
- //todo:鏄惁鏈夋鍦ㄥ嚭鐗囩殑閽㈠寲浠诲姟
+ //浠诲姟鏁版嵁 鑾峰彇杞﹀瓙瀛樻斁鐜荤拑鏈�澶ф暟閲� 鐜荤拑闂撮殧
+ List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
+ //鏄惁鏈夋鍦ㄩ挗鍖栫殑鐜荤拑
List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.list(new LambdaQueryWrapper<TemperingGlassInfo>()
.eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW)
.orderBy(Boolean.TRUE, sequenceOrder, TemperingGlassInfo::getTemperingFeedSequence));
- //浠诲姟鏁版嵁 鑾峰彇杞﹀瓙瀛樻斁鐜荤拑鏈�澶ф暟閲� 鐜荤拑闂撮殧
- List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(temperingGlassInfoList)) {
log.info("鏈夋鍦ㄥ嚭鐗囩殑閽㈠寲浠诲姟");
//鎵撹溅鍓╀綑灏哄
- AtomicReference<Integer> remainWidth = new AtomicReference<>(Const.BIG_STORAGE_WIDTH);
- temperingGlassInfoList.stream().forEach(e -> {
- if (bigStorageCageOutTaskList.size() > 5 || e.getWidth() > remainWidth.get()) {
- return;
+ Integer remainWidth = Const.BIG_STORAGE_WIDTH;
+ for (TemperingGlassInfo e : temperingGlassInfoList) {
+ if (bigStorageCageOutTaskList.size() > 5 || e.getWidth() > remainWidth) {
+ break;
}
- remainWidth.set(remainWidth.get() - e.getWidth().intValue() - Const.BIG_STORAGE_GAP);
+ remainWidth = remainWidth - e.getWidth().intValue() - Const.BIG_STORAGE_GAP;
bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getState(), Const.A09_OUT_TARGET_POSITION,
0, 0, 1));
- });
+ }
bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
return;
}
-
- //鑾峰彇鐘舵�佸瓧 閽㈠寲浼樺厛 or 浜哄伐涓嬬墖浼樺厛
- if (true) {
- //閽㈠寲浼樺厛锛氳幏鍙栫悊鐗囩 鐜荤拑灏忕墖 鐮存崯琛� 鏁伴噺 鍒ゆ柇绗煎唴鐗堝浘鏄惁鍒伴綈
- TemperingLayoutDTO temperingLayoutDTO = bigStorageCageDetailsService.temperingIsAll();
- if (null != temperingLayoutDTO) {
- //鐜荤拑鍒伴綈
- //鍒伴綈锛屽皢鐜荤拑灏忕墖鏁版嵁瀛樺叆閽㈠寲灏忕墖琛紝閫昏緫鐢熸垚鍑虹墖浠诲姟 缁撴潫
- List<BigStorageCageDetails> bigStorageCageDetails = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
- .eq(BigStorageCageDetails::getTemperingLayoutId, temperingLayoutDTO.getTemperingLayoutId())
- .eq(BigStorageCageDetails::getEngineerId, temperingLayoutDTO.getEngineerId()));
- List<TemperingGlassInfo> temperingGlassInfos = bigStorageCageDetails.stream().map(e -> {
- TemperingGlassInfo info = new TemperingGlassInfo();
- BeanUtils.copyProperties(e, info);
- return info;
- }).collect(Collectors.toList());
- temperingGlassInfoService.saveBatch(temperingGlassInfos);
-
- //澶ц溅鍓╀綑灏哄
- AtomicReference<Integer> remainWidth = new AtomicReference<>(Const.BIG_STORAGE_WIDTH);
- temperingGlassInfoList.stream().forEach(e -> {
- if (bigStorageCageOutTaskList.size() > 5 || e.getWidth() > remainWidth.get()) {
- return;
- }
- remainWidth.set(remainWidth.get() - e.getWidth().intValue() - Const.BIG_STORAGE_GAP);
- bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getState(), Const.A09_OUT_TARGET_POSITION,
- 0, 0, 1));
- });
- bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
- return;
- }
- //鏈埌榻� 鎵ц鍐呴儴璋冨害浠诲姟 缁撴潫
- TemperingLayoutDTO temperingOccupySlot = bigStorageCageDetailsService.queryTemperingOccupySlot();
- if (null != temperingOccupySlot) {
- List<SlotSequenceDTO> slotSequenceList = bigStorageCageDetailsService.queryGlassMaxAndMin(temperingOccupySlot.getEngineerId(), temperingOccupySlot.getTemperingLayoutId());
- for (int i = 0; i < slotSequenceList.size() - 1; i++) {
- SlotSequenceDTO first = slotSequenceList.get(i);
- SlotSequenceDTO second = slotSequenceList.get(i + 1);
- if (first.getMinSequence() == second.getMaxSequence() + 1
- && second.getRemainWidth() > Const.BIG_STORAGE_WIDTH - first.getRemainWidth() - Const.BIG_STORAGE_GAP) {
- List<BigStorageCageDetails> list = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
- .eq(BigStorageCageDetails::getSlot, first.getSlot()).eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN));
- List<BigStorageCageOutTask> outTasks = list.stream().map(e -> new BigStorageCageOutTask(e.getGlassId(), first.getSlot(), second.getSlot(),
- 0, 0, 1)).collect(Collectors.toList());
- bigStorageCageOutTaskService.saveBatch(outTasks);
- return;
- }
- }
-
- }
- }
- //绗煎唴鏄惁鏈変汉宸ヤ笅鐗囩幓鐠� 鏈夌洿鎺ュ嚭 鏃� 缁撴潫
- List<BigStorageCageDetails> oneList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
- .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN).orderByDesc(BigStorageCageDetails::getWidth));
- AtomicReference<Integer> remainWidth = new AtomicReference<>(Const.BIG_STORAGE_WIDTH);
- if (CollectionUtils.isNotEmpty(oneList)) {
- oneList.stream().forEach(e -> {
- if (remainWidth.get() < e.getWidth().intValue()) {
- return;
+ //todo:鏄惁鏈変汉宸ヤ笅鐗囦换鍔� 鏈夌洿鎺ュ嚭
+ //绗煎唴鏄惁鏈変汉宸ヤ笅鐗囩幓鐠� 鏃� 缁撴潫
+ List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL).orderByDesc(BigStorageCageDetails::getWidth));
+ if (CollectionUtils.isEmpty(artificialList)) {
+ Integer remainWidth = Const.BIG_STORAGE_WIDTH;
+ for (BigStorageCageDetails e : artificialList) {
+ if (remainWidth < e.getWidth().intValue()) {
+ break;
}
bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), 0, 0, 0, 1));
- remainWidth.set(remainWidth.get() - e.getWidth().intValue() - Const.BIG_STORAGE_GAP);
- });
+ remainWidth = remainWidth - e.getWidth().intValue() - Const.BIG_STORAGE_GAP;
+ }
bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
return;
}
+ //閽㈠寲浼樺厛锛氳幏鍙栫悊鐗囩 鐜荤拑灏忕墖 鐮存崯琛� 鏁伴噺 鍒ゆ柇绗煎唴鐗堝浘鏄惁鍒伴綈
+ TemperingLayoutDTO temperingLayoutDTO = bigStorageCageDetailsService.temperingIsAll();
+ if (null != temperingLayoutDTO) {
+ //鐜荤拑鍒伴綈
+ //鍒伴綈锛屽皢鐜荤拑灏忕墖鏁版嵁瀛樺叆閽㈠寲灏忕墖琛紝閫昏緫鐢熸垚鍑虹墖浠诲姟 缁撴潫
+ List<BigStorageCageDetails> bigStorageCageDetails = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
+ .eq(BigStorageCageDetails::getTemperingLayoutId, temperingLayoutDTO.getTemperingLayoutId())
+ .eq(BigStorageCageDetails::getEngineerId, temperingLayoutDTO.getEngineerId()));
+ List<TemperingGlassInfo> temperingGlassInfos = bigStorageCageDetails.stream().map(e -> {
+ TemperingGlassInfo info = new TemperingGlassInfo();
+ BeanUtils.copyProperties(e, info);
+ return info;
+ }).collect(Collectors.toList());
+ temperingGlassInfoService.saveBatch(temperingGlassInfos);
+
+ //澶ц溅鍓╀綑灏哄
+ Integer remainWidth = Const.BIG_STORAGE_WIDTH;
+ for (TemperingGlassInfo e : temperingGlassInfoList) {
+ if (bigStorageCageOutTaskList.size() > 5 || e.getWidth() > remainWidth) {
+ break;
+ }
+ remainWidth = remainWidth - e.getWidth().intValue() - Const.BIG_STORAGE_GAP;
+ bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getState(), Const.A09_OUT_TARGET_POSITION,
+ 0, 0, 1));
+ }
+ bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
+ return;
+ }
+ //鏈埌榻� 鎵ц鍐呴儴璋冨害浠诲姟
+ TemperingLayoutDTO temperingOccupySlot = bigStorageCageDetailsService.queryTemperingOccupySlot();
+ if (null != temperingOccupySlot) {
+ List<SlotSequenceDTO> slotSequenceList = bigStorageCageDetailsService.queryGlassMaxAndMin(temperingOccupySlot.getEngineerId(), temperingOccupySlot.getTemperingLayoutId());
+ for (int i = 0; i < slotSequenceList.size() - 1; i++) {
+ SlotSequenceDTO first = slotSequenceList.get(i);
+ SlotSequenceDTO second = slotSequenceList.get(i + 1);
+ if (first.getMinSequence() == second.getMaxSequence() + 1
+ && second.getRemainWidth() > Const.BIG_STORAGE_WIDTH - first.getRemainWidth() - Const.BIG_STORAGE_GAP) {
+ List<BigStorageCageDetails> list = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
+ .eq(BigStorageCageDetails::getSlot, first.getSlot()).eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN));
+ List<BigStorageCageOutTask> outTasks = list.stream().map(e -> new BigStorageCageOutTask(e.getGlassId(), first.getSlot(), second.getSlot(),
+ 0, 0, 1)).collect(Collectors.toList());
+ bigStorageCageOutTaskService.saveBatch(outTasks);
+ return;
+ }
+ }
+ }
}
@@ -370,32 +248,29 @@
Assert.isFalse(CollectionUtils.isEmpty(edgGlassTaskInfoList), "璇嗗埆鐜荤拑淇℃伅鏈嚭鐜板湪灏哄琛ㄤ腑,鑾峰彇鐩搁偦涓ゅ潡鐜荤拑澶辫触");
//2銆佽幏鍙栧崸杞珛鍓╀綑瀹藉害
Map<String, Object> map = bigStorageCageFeedTaskService.getMap(new QueryWrapper<BigStorageCageFeedTask>()
- .select("cast(5000 - sum(width + 20) as INT)as remainWidth")
+ .select("cast(" + Const.BIG_STORAGE_WIDTH + " - sum(width + " + Const.BIG_STORAGE_GAP + ") as INT) as remainWidth")
.eq("line", line).eq("task_state", Const.BIG_STORAGE_IN_UP));
- Integer remainWidth = null == map ? 5000 : Integer.parseInt(map.get("remainWidth") + "");
+ Integer remainWidth = null == map ? Const.BIG_STORAGE_WIDTH : Integer.parseInt(map.get("remainWidth") + "");
//2銆佽幏鍙栧崸杞珛
Integer widthFirst = edgGlassTaskInfoList.get(0).getWidth();
if (edgGlassTaskInfoList.size() == 1) {
if (remainWidth >= widthFirst) {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst);
return Boolean.FALSE;
- } else {
- //璁板綍鏃犳硶鏀句笅鐜荤拑锛屽悗缁垽鏂惎鍔�
- return Boolean.TRUE;
}
- }
- Integer widthSecond = edgGlassTaskInfoList.get(1).getWidth();
- if (remainWidth >= widthFirst) {
- if (remainWidth - widthFirst - Const.BIG_STORAGE_GAP >= widthSecond) {
- addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthSecond);
- } else {
- addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthSecond);
- }
- return Boolean.FALSE;
-
} else {
- return Boolean.TRUE;
+ Integer widthSecond = edgGlassTaskInfoList.get(1).getWidth();
+ if (remainWidth >= widthFirst) {
+ if (remainWidth - widthFirst - Const.BIG_STORAGE_GAP >= widthSecond) {
+ addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthSecond);
+ return Boolean.FALSE;
+ } else {
+ addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthSecond);
+ }
+ }
}
+ //璁板綍鏃犳硶鏀句笅鐜荤拑锛屽悗缁垽鏂惎鍔�
+ return Boolean.TRUE;
}
/**
@@ -415,7 +290,7 @@
/**
* 鑾峰彇闇�瑕佸惎鍔ㄧ殑绾胯矾锛氫袱鏉＄嚎閮藉彲鍚姩 鑾峰彇绗竴鐗囩幓鐠冪増鍥緄d鏈�灏� 鐗堝簭鏈�澶х殑绾胯矾
*
- * @return
+ * @return 闇�瑕佸惎鍔ㄧ殑绾胯矾
*/
public Integer getStartLine() {
List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
@@ -434,7 +309,7 @@
/**
* 璁＄畻浠诲姟琛ㄨ繘鐗囩嚎璺殑鐩爣鏍煎瓙锛屽苟鍚姩浠诲姟
*/
- public boolean computeTargetByLine(Integer line, String d02GoAdress, String d05GoAdress) {
+ public boolean computeTargetByLine(Integer line) {
//1銆佽幏鍙栦换鍔¤〃涓殑鎵�鏈夌幓鐠冿紙鎸囧畾绾胯矾涓斿凡缁忚繘鍗ц浆绔嬪畬鎴愶級
List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
.eq(BigStorageCageFeedTask::getLine, line)
@@ -443,43 +318,67 @@
//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));
+
List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>();
- AtomicBoolean taskFlag = new AtomicBoolean(Boolean.TRUE);
- taskList.stream().forEach(e -> {
- BigStorageCageDetails cageDetails = new BigStorageCageDetails();
- //鎸夌収鐗堝浘淇℃伅鑾峰彇杩涚墖绗煎瓙鏍煎瓙鍙�
+ List<BigStorageCageDetails> temperingList = computeIsTemperingTargetByLine(glassInfos, taskList, Boolean.TRUE);
+ List<BigStorageCageDetails> noTemperingList = computeIsTemperingTargetByLine(glassInfos, taskList, Boolean.FALSE);
+ bigStorageCageDetailsList.addAll(temperingList);
+ bigStorageCageDetailsList.addAll(noTemperingList);
+ //4銆佸湪璇︽儏琛ㄤ腑鍔犲叆杩涚墖鐜荤拑淇℃伅
+ bigStorageCageDetailsService.saveBatch(bigStorageCageDetailsList);
+ return Boolean.TRUE;
+ }
+
+ /**
+ * 鏄惁閽㈠寲鐜荤拑杩涚鐩爣浣嶇疆
+ *
+ * @param glassInfos 褰撴潯绾垮崸杞珛鎵�鏈夌幓鐠�
+ * @param taskList 褰撴潯绾垮崸杞珛鎵�鏈変换鍔�
+ * @param isTempering true 閽㈠寲 false 涓嶉挗鍖�
+ */
+ private List<BigStorageCageDetails> computeIsTemperingTargetByLine(List<GlassInfo> glassInfos, List<BigStorageCageFeedTask> taskList, Boolean isTempering) {
+ Map<String, GlassInfo> glassInfoMap;
+ if (isTempering) {
+ glassInfoMap = glassInfos.stream().filter(e -> e.getTemperingLayoutId() != 0)
+ .collect(Collectors.toMap(GlassInfo::getGlassId, p -> p));
+ } else {
+ glassInfoMap = glassInfos.stream().filter(e -> e.getTemperingLayoutId() == 0)
+ .collect(Collectors.toMap(GlassInfo::getGlassId, p -> p));
+ }
+
+ //璁剧疆涓存椂鍙橀噺鎺ュ彈鐗堝浘id锛岀増搴忋�佹牸瀛愬彿鍙婂墿浣欏搴�
+ Integer temperingLayoutIdTemp = 0;
+ Integer temperingFeedSequenceTemp = 0;
+ BigStorageDTO bigStorageDTO = new BigStorageDTO();
+
+ List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>();
+ for (BigStorageCageFeedTask e : taskList) {
GlassInfo info = glassInfoMap.get(e.getGlassId());
+ if (info == null) {
+ continue;
+ }
+ BigStorageCageDetails cageDetails = new BigStorageCageDetails();
BeanUtils.copyProperties(info, cageDetails);
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);
+ && info.getWidth() <= bigStorageDTO.getWidth()) {
+ bigStorageDTO.setWidth(bigStorageDTO.getWidth() - info.getWidth().intValue() - Const.BIG_STORAGE_GAP);
} else {
- bigStorageDTO.set(bigStorageCageDetailsService.queryTargetSlotByTempering(info));
+ bigStorageDTO = bigStorageCageDetailsService.queryTargetSlotByTempering(info);
}
- e.setTargetSlot(bigStorageDTO.get().getSlot());
- cageDetails.setSlot(bigStorageDTO.get().getSlot());
- cageDetails.setState(Const.GLASS_STATE_IN);
- temperingLayoutIdTemp.set(info.getTemperingLayoutId());
- temperingFeedSequenceTemp.set(info.getTemperingFeedSequence());
- bigStorageCageDetailsList.add(cageDetails);
- taskFlag.set(bigStorageCageFeedTaskService.updateById(e));
- if (!taskFlag.get()) {
- return;
- }
- });
- //3銆佹洿鏂拌繘鐗囦换鍔¤〃 閬囧埌闂锛氭棤娉曟壒閲忔洿鏂帮紝鎵归噺鏇存柊鏃犳硶璧版寚瀹氫粠搴�
- //4銆佸湪璇︽儏琛ㄤ腑鍔犲叆杩涚墖鐜荤拑淇℃伅
- bigStorageCageDetailsService.saveBatch(bigStorageCageDetailsList);
- if (taskFlag.get()) {
- String lineAddress = line.equals(Const.A09_OUT_TARGET_POSITION) ? d02GoAdress : d05GoAdress;
-// S7object.getinstance().plccontrol.writeWord(lineAddress, (short) 1);
+ cageDetails.setSlot(bigStorageDTO.getSlot());
+ cageDetails.setState(Const.GLASS_STATE_IN);
+
+ e.setTargetSlot(bigStorageDTO.getSlot());
+ e.setTaskType(Const.BIG_STORAGE_IN_RUN);
+
+ temperingLayoutIdTemp = info.getTemperingLayoutId();
+ temperingFeedSequenceTemp = info.getTemperingFeedSequence();
+ //3銆佹洿鏂拌繘鐗囦换鍔¤〃 閬囧埌闂锛氭棤娉曟壒閲忔洿鏂帮紝鎵归噺鏇存柊鏃犳硶璧版寚瀹氫粠搴�
+ bigStorageCageFeedTaskService.updateById(e);
+ bigStorageCageDetailsList.add(cageDetails);
}
- return taskFlag.get();
+ return bigStorageCageDetailsList;
}
}
\ No newline at end of file
--
Gitblit v1.8.0