From d5d652d23a0bdf64ce527a6b592713a849abac7d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 17 十月 2024 15:22:37 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 405 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 334 insertions(+), 71 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 94d89f3..61a0a3c 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
@@ -2,6 +2,7 @@
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.github.yulichang.toolkit.JoinWrappers;
@@ -128,14 +129,18 @@
if (!REQUEST_WORD.equals(mesD01Value) && REQUEST_WORD.equals(d01ToMES) && (StringUtils.isBlank(d02State) || !REQUEST_WORD.equals(d03State))) {
if (!d01GlassId.equals(d01Id)) {
judgeGlassTypeStatus(d01Id, Const.A09_OUT_TARGET_POSITION, mesD01Address);
- d01GlassId = d01Id;
+ edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
+ .set(EdgGlassTaskInfo::getStatus, Const.EDG_GLASS_SUCCESS).eq(EdgGlassTaskInfo::getGlassId, d01Id));
+// d01GlassId = d01Id;
}
}
// 鐘舵�佷负0涓嶆搷浣滐紙D01閫佺墖锛�0涓嶆搷浣滐紝1鍏佽閫佺墖锛夛紝璇锋眰瀛椾负1锛� 鍗ц浆绔嬫湭鍚姩
if (!REQUEST_WORD.equals(mesD04Value) && REQUEST_WORD.equals(d04ToMES) && !REQUEST_WORD.equals(d05State)) {
if (!d04GlassId.equals(d04Id)) {
judgeGlassTypeStatus(d04Id, Const.A10_OUT_TARGET_POSITION, mesD04Address);
- d04GlassId = d04Id;
+ edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
+ .set(EdgGlassTaskInfo::getStatus, Const.EDG_GLASS_SUCCESS).eq(EdgGlassTaskInfo::getGlassId, d04Id));
+// d04GlassId = d04Id;
}
}
Date endDate = new Date();
@@ -146,11 +151,28 @@
public void plcToHomeEdgFreeCarTask() {
Date startDate = new Date();
log.info("澶х悊鐗囩绌鸿溅杩涚墖浠诲姟寮�濮嬫墽琛屾椂闂达細{}", startDate);
+ PlcParameterObject plcMesObject = S7object.getinstance().PlcMesObject;
+ String mesD03Address = plcMesObject.getPlcParameter("MESToD03").getValue();
+ String mesD05Address = plcMesObject.getPlcParameter("MESToD05").getValue();
+ log.info("MESToD03:{},MESToD05:{}", mesD03Address, mesD05Address);
+ if ("2".equals(mesD03Address) || "2".equals(mesD05Address)) {
+ log.info("鏈夊惎鍔ㄤ俊鍙凤紝MESToD03:{},MESToD05:{}", mesD03Address, mesD05Address);
+ }
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);
+ List<BigStorageCageFeedTask> bigStorageCageFeedTasks = bigStorageCageFeedTaskService.list(
+ new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .ne(BigStorageCageFeedTask::getTargetSlot, 0)
+ .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
+ );
+ if (bigStorageCageFeedTasks.size() > 0) {
+ Date endDate = new Date();
+ log.info("澶ц溅鏈夋鍦ㄦ墽琛岀殑浠诲姟{}锛岀粨鏉熼�佺墖浠诲姟锛屼换鍔＄粨鏉熸椂闂达細{}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", bigStorageCageFeedTasks, endDate, endDate.getTime() - startDate.getTime());
+ return;
+ }
if (REQUEST_WORD.equals(e01Status)) {
Date endDate = new Date();
log.info("杩涚墖澶ц溅闈炵┖闂诧紝缁撴潫閫佺墖浠诲姟锛屼换鍔＄粨鏉熸椂闂达細{}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
@@ -244,7 +266,7 @@
log.info("澶х悊鐗囩绌鸿溅杩涚墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
}
- @Scheduled(fixedDelay = 2000)
+ @Scheduled(fixedDelay = 10000)
public void plcToHomeEdgOutTask() {
Date startDate = new Date();
log.info("澶х悊鐗囩绌鸿溅杩涚墖浠诲姟寮�濮嬫墽琛屾椂闂达細{}", startDate);
@@ -271,16 +293,20 @@
.orderBy(Boolean.TRUE, sequenceOrder, TemperingGlassInfo::getTemperingFeedSequence));
if (CollectionUtils.isNotEmpty(temperingGlassInfoList)) {
log.info("鏈夋鍦ㄥ嚭鐗囩殑閽㈠寲浠诲姟");
- computeOutGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
+ computeOutMoreGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
Date endDate = new Date();
log.info("澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
return;
}
//鏄惁鏈変汉宸ヤ笅鐗囦换鍔� 鏈夌洿鎺ュ嚭
+// List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
+// .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL).orderByDesc(BigStorageCageDetails::getWidth));
List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
- .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL).orderByDesc(BigStorageCageDetails::getWidth));
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL)
+ .orderByAsc(BigStorageCageDetails::getSlot)
+ .orderByDesc(BigStorageCageDetails::getId));
if (CollectionUtils.isNotEmpty(artificialList)) {
- computeOutGlassInfo(artificialList, Boolean.FALSE, mesToPLCAddress);
+ computeOutMoreGlassInfo(artificialList, Boolean.FALSE, mesToPLCAddress);
Date endDate = new Date();
log.info("澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
return;
@@ -291,21 +317,23 @@
//鐜荤拑鍒伴綈鍖呮嫭宸插嚭鐗囩殑
//鍒伴綈锛屽皢鐜荤拑灏忕墖鏁版嵁瀛樺叆閽㈠寲灏忕墖琛紝閫昏緫鐢熸垚鍑虹墖浠诲姟 缁撴潫
for (TemperingLayoutDTO item : temperingLayoutDTOList) {
- List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class)
- .selectAll(GlassInfo.class)
- .select("-1 as state")
- .selectAs(BigStorageCageDetails::getSlot, TemperingGlassInfo::getSlot)
- .innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId)
- .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
- .eq(GlassInfo::getTemperingLayoutId, item.getTemperingLayoutId())
- .eq(GlassInfo::getEngineerId, item.getEngineerId())
- .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence));
- if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
- temperingGlassInfoService.saveBatch(temperingGlassInfos);
- computeOutGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
- Date endDate = new Date();
- log.info("澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
- return;
+ if (redisUtil.getCacheObject("temperingengineerId").equals(item.getEngineerId())) {
+ List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class)
+ .selectAll(GlassInfo.class)
+ .select("-1 as state")
+ .selectAs(BigStorageCageDetails::getSlot, TemperingGlassInfo::getSlot)
+ .innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId)
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ .eq(GlassInfo::getTemperingLayoutId, item.getTemperingLayoutId())
+ .eq(GlassInfo::getEngineerId, item.getEngineerId())
+ .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence));
+ if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
+ temperingGlassInfoService.saveBatch(temperingGlassInfos);
+ computeOutMoreGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
+ Date endDate = new Date();
+ log.info("澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
+ return;
+ }
}
}
}
@@ -330,7 +358,7 @@
int serialNumber = 1;
for (BigStorageCageDetails item : list) {
outTasks.add(new BigStorageCageOutTask(item.getGlassId(), first.getSlot(), second.getSlot(),
- item.getWidth() * 10, item.getHeight() * 10, 1, serialNumber++, Const.BIG_STORAGE_OUT_NEW));
+ item.getWidth() * 10, item.getHeight() * 10, 1, serialNumber++, Const.BIG_STORAGE_OUT_NEW, new Date()));
}
//鏂板璋冨害浠诲姟
bigStorageCageOutTaskService.saveBatch(outTasks);
@@ -346,15 +374,15 @@
}
}
}
- //鍚憄lc鍐欏叆纭瀛�
- int returnData = 0;
- int count = 1;
- while (returnData == 0) {
- log.info("宸插悜plc绗瑊}娆￠�佸崗璁�", count);
- S7object.getinstance().plccontrol.writeWord(mesToPLCAddress, 1);
- returnData = S7object.getinstance().plccontrol.readWord(mesToPLCAddress, 1).get(0);
- log.info("宸插悜plc绗瑊}娆″彂閫佸嚭鐗囦换鍔＄‘璁わ紝鍦板潃涓猴細{},鍐欏叆鐨勫唴瀹逛负{}", count++, mesToPLCAddress, returnData);
- }
+// //鍚憄lc鍐欏叆纭瀛�
+// int returnData = 0;
+// int count = 1;
+// while (returnData == 0) {
+// log.info("宸插悜plc绗瑊}娆￠�佸崗璁�", count);
+// S7object.getinstance().plccontrol.writeWord(mesToPLCAddress, 1);
+// returnData = S7object.getinstance().plccontrol.readWord(mesToPLCAddress, 1).get(0);
+// log.info("宸插悜plc绗瑊}娆″彂閫佸嚭鐗囦换鍔＄‘璁わ紝鍦板潃涓猴細{},鍐欏叆鐨勫唴瀹逛负{}", count++, mesToPLCAddress, returnData);
+// }
Date endDate = new Date();
log.info("澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
return;
@@ -409,6 +437,16 @@
List<BigStorageCageOutTask> outSuccessGlass = bigStorageCageOutTaskService.list(new LambdaQueryWrapper<BigStorageCageOutTask>()
.in(BigStorageCageOutTask::getGlassId, glassIds).in(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_ALL));
if (CollectionUtils.isNotEmpty(outSuccessGlass)) {
+ for (BigStorageCageOutTask bigStorageCageOutTask : outSuccessGlass
+ ) {
+ if (bigStorageCageOutTask.getEndSlot().equals(Const.ARTIFICIAL_OUT_TARGET_POSITION)) {
+ temperingGlassInfoService.update(
+ new LambdaUpdateWrapper<TemperingGlassInfo>()
+ .set(TemperingGlassInfo::getState, Const.TEMPERING_END)
+ .eq(TemperingGlassInfo::getGlassId, bigStorageCageOutTask.getGlassId())
+ );
+ }
+ }
log.info("3銆佽幏鍙栧嚭鐗囧凡瀹屾垚鐨勭幓鐠冧俊鎭痠d:{}", outSuccessGlass);
List<UpdateBigStorageCageDTO> storageCageDTOList = outSuccessGlass.stream().map(e -> {
UpdateBigStorageCageDTO storageCageDTO = new UpdateBigStorageCageDTO();
@@ -476,47 +514,56 @@
log.info("澶х悊鐗囩鐮存崯鐜荤拑娓呴櫎浠诲姟寮�濮嬫墽琛屾椂闂达細{}", startDate);
//鑾峰彇杩涚墖浠诲姟琛ㄤ腑鐘舵�佷负鐮存崯鐨勬暟鎹�
List<BigStorageCageFeedTask> inDamageTaskInfoList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
- .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE));
+ .in(BigStorageCageFeedTask::getTaskState, Const.GLASS_STATE_DAMAGE_TAKE));
if (CollectionUtils.isNotEmpty(inDamageTaskInfoList)) {
log.info("鑾峰彇杩涚墖浠诲姟琛ㄤ腑鐮存崯鐨勭幓鐠冧俊鎭瘂}", inDamageTaskInfoList);
- bigStorageCageFeedTaskService.remove(new LambdaQueryWrapper<BigStorageCageFeedTask>().eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE));
+ bigStorageCageFeedTaskService.remove(new LambdaQueryWrapper<BigStorageCageFeedTask>().in(BigStorageCageFeedTask::getTaskState, Const.GLASS_STATE_DAMAGE_TAKE));
//鐞嗙墖绗艰鎯呰〃鏁版嵁鐘舵�佹洿鏂�
bigStorageCageDetailsService.remove(new LambdaQueryWrapper<BigStorageCageDetails>()
.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_NEW).in(BigStorageCageDetails::getGlassId, inDamageTaskInfoList.stream().map(BigStorageCageFeedTask::getGlassId).collect(Collectors.toList())));
//灏嗙牬鎹熶俊鎭柊澧炲叆鐮存崯琛�
+ List<Integer> slotList = new ArrayList<>();
for (BigStorageCageFeedTask bigStorageCageFeedTask : inDamageTaskInfoList) {
Damage damage = new Damage();
damage.setGlassId(bigStorageCageFeedTask.getGlassId());
damage.setLine(bigStorageCageFeedTask.getLine());
- damage.setWorkingProcedure("鍐峰姞宸�");
+ damage.setWorkingProcedure("纾ㄨ竟");
damage.setRemark("杩涚鍓嶅崸杞珛");
- damage.setStatus(2);
+ damage.setStatus(1);
+ damage.setType(bigStorageCageFeedTask.getTaskState());
damageService.insertDamage(damage);
+ slotList.add(bigStorageCageFeedTask.getTargetSlot());
}
+ //鏇存柊鏍煎瓙鍓╀綑瀹藉害
+ updateSlotRemainBySlots(slotList);
log.info("杩涚墖浠诲姟鎵ц瀹屾垚");
}
//鑾峰彇鍑虹墖浠诲姟琛ㄤ腑鐘舵�佷负鐮存崯鐨勬暟鎹�
List<BigStorageCageOutTask> outDamageTaskInfoList = bigStorageCageOutTaskService.list(new LambdaQueryWrapper<BigStorageCageOutTask>()
- .eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_DAMAGE));
+ .in(BigStorageCageOutTask::getTaskState, Const.GLASS_STATE_DAMAGE_TAKE));
if (CollectionUtils.isNotEmpty(outDamageTaskInfoList)) {
log.info("鑾峰彇鍑虹墖浠诲姟琛ㄤ腑鐮存崯鐨勭幓鐠冧俊鎭瘂}", outDamageTaskInfoList);
- bigStorageCageOutTaskService.remove(new LambdaQueryWrapper<BigStorageCageOutTask>().eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_IN_DAMAGE));
+ bigStorageCageOutTaskService.remove(new LambdaQueryWrapper<BigStorageCageOutTask>().in(BigStorageCageOutTask::getTaskState, Const.GLASS_STATE_DAMAGE_TAKE));
List<String> glassIdList = outDamageTaskInfoList.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList());
//绉婚櫎閽㈠寲涓嬬墖琛ㄦ暟鎹�
temperingGlassInfoService.remove(new LambdaQueryWrapper<TemperingGlassInfo>().in(TemperingGlassInfo::getGlassId, glassIdList));
//鐞嗙墖绗艰鎯呰〃鏁版嵁鐘舵�佸垹闄�
bigStorageCageDetailsService.remove(new LambdaQueryWrapper<BigStorageCageDetails>().in(BigStorageCageDetails::getGlassId, glassIdList));
-
//灏嗙牬鎹熶俊鎭柊澧炲叆鐮存崯琛�
+ List<Integer> slotList = new ArrayList<>();
for (BigStorageCageOutTask bigStorageCageOutTask : outDamageTaskInfoList) {
Damage damage = new Damage();
damage.setGlassId(bigStorageCageOutTask.getGlassId());
damage.setLine(bigStorageCageOutTask.getEndSlot());
- damage.setWorkingProcedure("鍐峰姞宸�");
+ damage.setWorkingProcedure("閽㈠寲");
damage.setRemark("鍑虹墖鍚庡崸杞珛");
- damage.setStatus(2);
+ damage.setStatus(1);
+ damage.setType(bigStorageCageOutTask.getTaskState());
damageService.insertDamage(damage);
+ slotList.add(bigStorageCageOutTask.getStartSlot());
}
+ //鏇存柊鏍煎瓙鍓╀綑瀹藉害
+ updateSlotRemainBySlots(slotList);
log.info("鍑虹墖浠诲姟鎵ц瀹屾垚");
}
Date endDate = new Date();
@@ -525,14 +572,132 @@
}
/**
+ * 纭瀛楁竻绌�
+ */
+// @Scheduled(fixedDelay = 300)
+ public void confirmClear() {
+ PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+ String d01ToMES = plcParameterObject.getPlcParameter("D01ToMES").getValue();
+ String d04ToMES = plcParameterObject.getPlcParameter("D04ToMES").getValue();
+ String mesD01Address = plcParameterObject.getPlcParameter("MESToD01").getAddress();
+ String mesD04Address = plcParameterObject.getPlcParameter("MESToD04").getAddress();
+ String d03ToMES = plcParameterObject.getPlcParameter("D03ToMES").getValue();
+ String d05ToMES = plcParameterObject.getPlcParameter("D05ToMES").getValue();
+ String mesD03Address = plcParameterObject.getPlcParameter("MESToD03").getAddress();
+ String mesD05Address = plcParameterObject.getPlcParameter("MESToD05").getAddress();
+ if (!REQUEST_WORD.equals(d01ToMES)) {
+ S7object.getinstance().plccontrol.writeWord(mesD01Address, 0);
+ }
+ if (!REQUEST_WORD.equals(d04ToMES)) {
+ S7object.getinstance().plccontrol.writeWord(mesD04Address, 0);
+ }
+ if (!REQUEST_WORD.equals(d03ToMES)) {
+ S7object.getinstance().plccontrol.writeWord(mesD03Address, 0);
+ }
+ if (!REQUEST_WORD.equals(d05ToMES)) {
+ S7object.getinstance().plccontrol.writeWord(mesD05Address, 0);
+ }
+ }
+
+ /**
+ * 杩涚墖鐘舵�佷慨鏀�
+ */
+// @Scheduled(fixedDelay = 300)
+ public void feedStatusUpdate() {
+ PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+ List<String> glassIds1 = null;
+ List<String> glassIds2 = null;
+ for (int i = 1; i <= 2; i++) {
+ String line1GlassId = plcParameterObject.getPlcParameter("D03ID" + i).getAddress();
+ if (StringUtils.isEmpty(line1GlassId)) {
+ glassIds1.add(line1GlassId);
+ }
+ String line2GlassId = plcParameterObject.getPlcParameter("D05ID" + i).getAddress();
+ if (StringUtils.isEmpty(line2GlassId)) {
+ glassIds1.add(line2GlassId);
+ }
+ }
+ List<BigStorageCageFeedTask> bigStorageCageFeedTasks1 = bigStorageCageFeedTaskService.list(
+ new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .eq(BigStorageCageFeedTask::getTaskState, 1)
+ .eq(BigStorageCageFeedTask::getLine, Const.A09_OUT_TARGET_POSITION)
+ );
+ List<BigStorageCageFeedTask> bigStorageCageFeedTasks2 = bigStorageCageFeedTaskService.list(
+ new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .eq(BigStorageCageFeedTask::getTaskState, 1)
+ .eq(BigStorageCageFeedTask::getLine, Const.A10_OUT_TARGET_POSITION)
+ );
+ if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks1)) {
+ List<String> matchingIds1 = bigStorageCageFeedTasks1.stream()
+ .map(BigStorageCageFeedTask::getGlassId)
+ .filter(glassIds1::contains)
+ .distinct()
+ .collect(Collectors.toList());
+ }
+ if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks2)) {
+ List<String> matchingIds2 = bigStorageCageFeedTasks2.stream()
+ .map(BigStorageCageFeedTask::getGlassId)
+ .filter(glassIds2::contains)
+ .distinct()
+ .collect(Collectors.toList());
+ }
+ bigStorageCageFeedTaskService.update(
+ new LambdaUpdateWrapper<BigStorageCageFeedTask>()
+ .in(BigStorageCageFeedTask::getGlassId, glassIds1, glassIds2)
+ .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
+ .set(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
+ );
+ if (glassIds1 == null) {
+ bigStorageCageFeedTaskService.update(
+ new LambdaUpdateWrapper<BigStorageCageFeedTask>()
+ .eq(BigStorageCageFeedTask::getLine,Const.A09_OUT_TARGET_POSITION)
+ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
+ .gt(BigStorageCageFeedTask::getTargetSlot, 0)
+ .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
+ .set(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_CAR)
+ );
+ }
+ if (glassIds1 == null) {
+ bigStorageCageFeedTaskService.update(
+ new LambdaUpdateWrapper<BigStorageCageFeedTask>()
+ .eq(BigStorageCageFeedTask::getLine,Const.A10_OUT_TARGET_POSITION)
+ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
+ .gt(BigStorageCageFeedTask::getTargetSlot, 0)
+ .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
+ .set(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_CAR)
+ );
+ }
+ }
+
+ /**
* 鎸夌収鐜荤拑id鍒ゆ柇鐜荤拑鐘舵�佸強鍗ц浆绔嬫槸鍚﹀彲鐩存帴鍚姩
*/
public Boolean judgeGlassTypeStatus(String glassId, Integer line, String mesAddress) {
//1銆佽幏鍙栦换鍔¤〃涓浉閭荤幓鐠�
- List<EdgGlassTaskInfo> edgGlassTaskInfoList = edgGlassTaskInfoService.list(new LambdaQueryWrapper<EdgGlassTaskInfo>()
+ List<EdgGlassTaskInfo> edgGlassTaskInfoList;
+ edgGlassTaskInfoList = edgGlassTaskInfoService.list(new LambdaQueryWrapper<EdgGlassTaskInfo>()
.eq(EdgGlassTaskInfo::getLine, line)
- .apply("time >= (select time from edg_glass_task_info where glass_id = '" + glassId + "')")
+ .apply("time >= (select time from edg_glass_task_info where line='" + line + "' and glass_id = '" + glassId + "' and deleted = 0)")
.orderByAsc(EdgGlassTaskInfo::getTime));
+ if (edgGlassTaskInfoList.size() == 0) {
+ edgGlassTaskInfoList = edgGlassTaskInfoService.list(new QueryWrapper<EdgGlassTaskInfo>()
+ .select("Top 1 *")
+ .eq("glass_id", glassId)
+ );
+ log.info("鍦ㄥ昂瀵歌〃涓幏鍙栫幓鐠冧俊鎭瘂}", edgGlassTaskInfoList);
+ if (edgGlassTaskInfoList.size() == 0) {
+ GlassInfo glassInfo = glassInfoService.getOne(
+ new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, glassId)
+ );
+ EdgGlassTaskInfo edgGlassTaskInfo = new EdgGlassTaskInfo();
+ BeanUtils.copyProperties(glassInfo, edgGlassTaskInfo);
+ edgGlassTaskInfo.setWidth((int) glassInfo.getWidth());
+ edgGlassTaskInfo.setHeight((int) glassInfo.getHeight());
+ edgGlassTaskInfoList.add(edgGlassTaskInfo);
+ log.info("鍦ㄧ幓鐠冧俊鎭〃涓幏鍙栫幓鐠冧俊鎭瘂}", edgGlassTaskInfoList);
+ }
+ }
Assert.isFalse(CollectionUtils.isEmpty(edgGlassTaskInfoList), "璇嗗埆鐜荤拑淇℃伅鏈嚭鐜板湪灏哄琛ㄤ腑,鑾峰彇鐩搁偦涓ゅ潡鐜荤拑澶辫触");
//2銆佽幏鍙栧崸杞珛鍓╀綑瀹藉害
BigStorageDTO sitToUpRemainWidth = bigStorageCageFeedTaskService.querySitToUpRemainWidth(line);
@@ -555,7 +720,11 @@
if (glassCount < inCarMaxSize) {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst, heightFirst);
} else {
- addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
+ if (glassCount < inCarMaxSize + 1) {
+ addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
+ } else {
+ return Boolean.FALSE;
+ }
}
} else {
flag = Boolean.FALSE;
@@ -566,12 +735,20 @@
if (remainWidth >= widthFirst) {
if (remainWidth - widthFirst - glassGap >= widthSecond) {
if (glassCount < inCarMaxSize) {
- addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst, heightSecond);
+ addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst, heightFirst);
} else {
- addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightSecond);
+ if (glassCount < inCarMaxSize + 1) {
+ addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
+ } else {
+ return Boolean.FALSE;
+ }
}
} else {
- addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightSecond);
+ if (glassCount < inCarMaxSize + 1) {
+ addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst, heightFirst);
+ } else {
+ return Boolean.FALSE;
+ }
}
} else {
flag = Boolean.FALSE;
@@ -582,11 +759,16 @@
//鍚憄lc鍐欏叆纭瀛�
int returnData = 0;
int count = 1;
- while (returnData == 0) {
+ while (returnData != 0) {
S7object.getinstance().plccontrol.writeWord(mesAddress, 1);
- returnData = S7object.getinstance().plccontrol.readWord(mesAddress, 1).get(0);
- log.info("杩涘崸杞珛绗瑊}娆″彂閫佺‘璁ゅ瓧瀹屾垚锛屽湴鍧�涓猴細{},鍐欏叆鐨勫唴瀹逛负{}", count++, mesAddress, returnData);
-
+ PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+ if (Const.A10_OUT_TARGET_POSITION.equals(line)) {
+ returnData = Integer.parseInt(plcParameterObject.getPlcParameter("D04ToMES").getValue());
+ } else {
+ returnData = Integer.parseInt(plcParameterObject.getPlcParameter("D01ToMES").getValue());
+ }
+// returnData = S7object.getinstance().plccontrol.readWord(mesAddress, 1).get(0);
+ log.info("杩涘崸杞珛绗瑊}娆″彂閫佺‘璁ゅ瓧瀹屾垚锛屽湴鍧�涓猴細{},鍐欏叆鐨勫唴瀹逛负{}", count++, mesAddress, 1);
}
}
//璁板綍鏃犳硶鏀句笅鐜荤拑锛屽悗缁垽鏂惎鍔�
@@ -605,6 +787,15 @@
bigStorageCageFeedTask.setWidth(width);
bigStorageCageFeedTask.setHeight(height);
bigStorageCageFeedTask.setCreateTime(new Date());
+ //鍒犻櫎鐞嗙墖绗艰〃鎷胯蛋/鐮存崯鏁版嵁鏁版嵁
+ damageService.deleteByGlassId(glassId);
+ Damage damage = new Damage();
+ damage.setGlassId(glassId);
+ damage.setWorkingProcedure("纾ㄨ竟");
+ damage.setLine(line);
+ damage.setType(1);
+ damage.setRemark("杩涘ぇ鐞嗙墖");
+ damageService.insertDamage(damage);
return bigStorageCageFeedTaskService.save(bigStorageCageFeedTask);
}
@@ -693,51 +884,55 @@
for (int i = 1; i <= taskList.size(); i++) {
s7control.writeWord(plcMesObject.getPlcParameter("StartAddToImport" + i).getAddress(), taskList.get(i - 1).getLine());
s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport" + i).getAddress(), taskList.get(i - 1).getTargetSlot());
- log.info("鍚憄lc鍙戦�佺{}鐗囩幓鐠冨凡瀹屾垚", i);
+ log.info("鍚憄lc鍙戦�佺{}鐗囩幓鐠冨凡瀹屾垚,璧峰浣嶇疆鏄瘂}锛岀洰鏍囦綅缃槸", i, taskList.get(i - 1).getLine(), taskList.get(i - 1).getTargetSlot());
}
int returnData = 0;
int count = 1;
- while (returnData == 0) {
+ while (returnData != 0) {
s7control.writeWord(outLine, 2);
- returnData = s7control.readWord(outLine, 1).get(0);
- log.info("宸插悜plc绗瑊}娆″彂閫佸嚭鐗囦换鍔＄‘璁わ紝鍦板潃涓猴細{},鍐欏叆鐨勫唴瀹逛负{}", count++, outLine, returnData);
+ if (line.equals(Const.A09_OUT_TARGET_POSITION)) {
+ returnData = Integer.parseInt(plcMesObject.getPlcParameter("MESToD03").getValue());
+ } else {
+ returnData = Integer.parseInt(plcMesObject.getPlcParameter("MESToD05").getValue());
+ }
+// returnData = s7control.readWord(outLine, 1).get(0);
+ log.info("宸插悜plc绗瑊}娆″彂閫佽繘鐗囦换鍔＄‘璁わ紝鍦板潃涓猴細{},鍐欏叆鐨勫唴瀹逛负{}", count++, outLine, 2);
}
}
+ /**
+ * 鍑虹墖涓�娆′粎鐢熸垚涓�杞︾幓鐠�
+ *
+ * @param list
+ * @param isTempering
+ * @param mesToPLCAddress
+ * @param <T>
+ * @return
+ */
private <T extends BigStorageCageBaseInfo> Boolean computeOutGlassInfo(List<T> list, Boolean isTempering, String mesToPLCAddress) {
//浠诲姟鏁版嵁 鑾峰彇杞﹀瓙瀛樻斁鐜荤拑鏈�澶ф暟閲� 鐜荤拑闂撮殧
List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
//鎵撹溅鍓╀綑灏哄
Integer remainWidth = carWidth;
- int trainNumber = 1;
- int serialNumber = 1;
int maxX = 0;
for (T e : list) {
- int maxLength = Math.max((int) e.getWidth(), (int) e.getHeight());
- if (bigStorageCageOutTaskList.size() >= outCarMaxSize || maxLength > remainWidth) {
- remainWidth = carWidth;
- trainNumber = trainNumber + 1;
- serialNumber = 1;
- maxX = 0;
- continue;
+ if (bigStorageCageOutTaskList.size() >= outCarMaxSize || Math.max((int) e.getWidth(), (int) e.getHeight()) > remainWidth) {
+ break;
}
- remainWidth = remainWidth - maxLength - glassGap;
+ remainWidth = remainWidth - Math.max((int) e.getWidth(), (int) e.getHeight()) - glassGap;
if (isTempering) {
int minLength = Math.min((int) e.getWidth(), (int) e.getHeight());
if (maxX + minLength <= xMaxSize) {
bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
- e.getWidth() * 10, e.getHeight() * 10, trainNumber, serialNumber++, 1));
+ e.getWidth() * 10, e.getHeight() * 10, 0, 0, 1, new Date()));
maxX = Math.max(maxX, e.getXCoordinate());
} else {
- remainWidth = carWidth;
- trainNumber = trainNumber + 1;
- serialNumber = 1;
- maxX = 0;
- continue;
+ break;
}
+
} else {
bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
- e.getWidth() * 10, e.getHeight(), trainNumber, serialNumber++, 1));
+ e.getWidth() * 10, e.getHeight(), 0, 0, 1, new Date()));
}
}
Assert.isFalse(CollectionUtils.isEmpty(bigStorageCageOutTaskList), "鏈幏鍙栧嚭鐗囨暟鎹紝缁撴潫鍑虹墖浠诲姟");
@@ -758,6 +953,74 @@
return Boolean.TRUE;
}
+ /**
+ * 鍑虹墖涓�娆＄敓鎴愪竴鐐夌幓鐠�
+ *
+ * @param list
+ * @param isTempering
+ * @param mesToPLCAddress
+ * @param <T>
+ * @return
+ */
+ public <T extends BigStorageCageBaseInfo> Boolean computeOutMoreGlassInfo(List<T> list, Boolean isTempering, String mesToPLCAddress) {
+ //浠诲姟鏁版嵁 鑾峰彇杞﹀瓙瀛樻斁鐜荤拑鏈�澶ф暟閲� 鐜荤拑闂撮殧
+ List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
+ //鎵撹溅鍓╀綑灏哄
+ Integer remainWidth = carWidth;
+ int trainNumber = 1;
+ int serialNumber = 1;
+ int maxX = 0;
+ for (T e : list) {
+ int maxLength = Math.max((int) e.getWidth(), (int) e.getHeight());
+ if (serialNumber > outCarMaxSize || maxLength > remainWidth) {
+ remainWidth = carWidth;
+ trainNumber = trainNumber + 1;
+ serialNumber = 1;
+ maxX = 0;
+ }
+ remainWidth = remainWidth - maxLength - glassGap;
+ if (isTempering) {
+ int minLength = Math.min((int) e.getWidth(), (int) e.getHeight());
+ if (maxX + minLength <= xMaxSize) {
+ bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
+ e.getWidth() * 10, e.getHeight() * 10, trainNumber, serialNumber++, 1, new Date()));
+ maxX = Math.max(maxX, e.getXCoordinate());
+ } else {
+ remainWidth = carWidth - maxLength - glassGap;
+ trainNumber = trainNumber + 1;
+ serialNumber = 1;
+ maxX = e.getXCoordinate();
+ bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
+ e.getWidth() * 10, e.getHeight(), trainNumber, serialNumber++, 1, new Date()));
+ }
+ } else {
+ bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
+ e.getWidth() * 10, e.getHeight(), trainNumber, serialNumber++, 1, new Date()));
+ }
+ }
+ Assert.isFalse(CollectionUtils.isEmpty(bigStorageCageOutTaskList), "鏈幏鍙栧嚭鐗囨暟鎹紝缁撴潫鍑虹墖浠诲姟");
+ log.info("鑾峰彇鍑虹墖浠诲姟鏁版嵁{}鏉★紝鎵ц淇濆瓨", bigStorageCageOutTaskList.size());
+ for (BigStorageCageOutTask bigStorageCageOutTask : bigStorageCageOutTaskList
+ ) {
+ bigStorageCageOutTaskService.save(bigStorageCageOutTask);
+ }
+// bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
+ List<String> glassIds = bigStorageCageOutTaskList.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList());
+ log.info("灏嗗嚭鐗囩幓鐠儃}鐜荤拑鐘舵�佹敼涓哄凡鍑虹墖", glassIds);
+ bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>()
+ .set(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING)
+ .in(BigStorageCageDetails::getGlassId, glassIds)
+ .ne(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT));
+// int returnData = 0;
+// int count = 1;
+// while (returnData == 0) {
+// S7object.getinstance().plccontrol.writeWord(mesToPLCAddress, 1);
+// returnData = S7object.getinstance().plccontrol.readWord(mesToPLCAddress, 1).get(0);
+// log.info("宸插悜plc绗瑊}娆″彂閫佸嚭鐗囦换鍔＄‘璁わ紝鍦板潃涓猴細{},鍐欏叆鐨勫唴瀹逛负{}", count++, mesToPLCAddress, returnData);
+// }
+ return Boolean.TRUE;
+ }
+
public void updateSlotRemainBySlots(List<Integer> slotList) {
//鑾峰彇鏍煎瓙鍐呮墍鏈夌殑鐜荤拑淇℃伅
List<BigStorageCageDetails> inSlotGlassList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
--
Gitblit v1.8.0