From 0fe4f45202452d5038efddffe0a5be4fb3745f8b Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 22 九月 2025 13:33:31 +0800
Subject: [PATCH] 1、中空大理片汇总信息改为所有流程卡缺片信息
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 119 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 60 insertions(+), 59 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
index d80c2e9..67d8ed8 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
@@ -106,7 +106,7 @@
private static final List<Integer> ONE_LINE_FIRST = Arrays.asList(930, 931, 932);
private static final List<Integer> TWO_LINE_FIRST = Arrays.asList(931, 930, 932);
- private Integer lastTimeLine = -1;
+
/**
* 鐩撮�氭牸瀛�
*/
@@ -117,27 +117,27 @@
private RedisUtil redisUtil;
@Scheduled(fixedDelay = 1000)
- public void inBigStorageTask() throws Exception {
+ public void inBigStorageTask() {
S7DataZKDLPOne s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
log.info("杩涚墖浠诲姟璇诲彇s7DataZKDLPOne:{}", s7DataZKDLPOne);
Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
- if (true != inkageEntity) {
+ if (!inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
return;
}
- String requestEntity = s7DataZKDLPOne.getRequestMes().toString();
- if (!"1".equals(requestEntity)) {
+ Integer requestEntity = s7DataZKDLPOne.getRequestMes();
+ if (1 != requestEntity) {
log.info("褰撳墠鏈敹鍒拌繘鐗囪姹傦紝缁撴潫杩涚墖浠诲姟");
return;
}
- String mesReplyEntity = s7DataZKDLPOne.getMesReply().toString();
- if ("1".equals(mesReplyEntity)) {
+ Integer mesReplyEntity = s7DataZKDLPOne.getMesReply();
+ if (1 == mesReplyEntity) {
log.info("鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岀粨鏉熻繘鐗囦换鍔�");
return;
}
List<BigStorageCageTask> inTaskList = new ArrayList();
- String fromOpcUa = s7DataZKDLPOne.getFrom1().toString();
+ Integer from = s7DataZKDLPOne.getFrom1();
List<String> glassIdList = new ArrayList<>();
List<String> requestWords = s7DataZKDLPOne.getIds();
for (int i = 1; i <= 6; i++) {
@@ -145,7 +145,7 @@
if (null != requestWord && !requestWord.isEmpty()) {
BigStorageCageTask task = new BigStorageCageTask();
task.setGlassId(requestWord);
- task.setStartSlot(Integer.parseInt(fromOpcUa));
+ task.setStartSlot(from);
inTaskList.add(task);
glassIdList.add(requestWord);
continue;
@@ -245,7 +245,7 @@
if (slotMaxHeight > Math.min(glassInfoList.get(0).getWidth(), glassInfoList.get(0).getHeight()) && glassInfoList.get(0).getThickness() < slotMaxthickness) {
for (BigStorageCageTask task : inTaskList) {
GlassInfo info = glassListMap.get(task.getGlassId()).get(0);
- HollowBigStorageDTO bigStorageDTO = hollowGlassRelationInfoService.queryHollowTargetSlot(info.getFlowCardId(),
+ HollowBigStorageDTO bigStorageDTO = hollowGlassRelationInfoService.queryHollowTargetSlot(info.getFlowCardId(), info.getGlassType(),
info.getWidth(), info.getHeight(), info.getTotalLayer(), info.getLayer());
// 涓存椂鏇存柊鏍煎瓙鐨勫墿浣欏昂瀵革細闃叉鐩搁偦鐜荤拑杩涘悓涓�鏍煎瓙閫犳垚鍓╀綑灏哄涓嶈冻锛岀幓鐠冭秺鐣岀殑鎯呭喌锛屼换鍔″畬鎴愬悗鍐嶆鏇存柊澶х悊鐗囩琛ㄥ墿浣欏搴︼紙鎸夌収绗煎唴鐜荤拑鏁伴噺鏇存柊澶х悊鐗囩鍓╀綑灏哄锛�
hollowBigStorageCageService.update(new LambdaUpdateWrapper<HollowBigStorageCage>()
@@ -307,6 +307,10 @@
}
} catch (Exception exception) {
log.info("杩涚墖浠诲姟鎵ц涓彂鐢熷紓甯革細{}", exception);
+ hollowBigStorageCageDetailsService.update(new LambdaUpdateWrapper<HollowBigStorageCageDetails>()
+ .set(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_TAKE)
+ .eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_NEW));
+
hollowGlassRelationInfoService.update(new LambdaUpdateWrapper<HollowGlassRelationInfo>()
.set(HollowGlassRelationInfo::getGlassId, null)
.set(HollowGlassRelationInfo::getTemperingLayoutId, null)
@@ -315,6 +319,9 @@
.set(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_NEW)
.eq(HollowGlassRelationInfo::getState, Const.HOLLOW_RELATION_OCCUPY)
);
+ //灏嗘牸瀛愬昂瀵告仮澶�
+ hollowBigStorageCageService.resetCage();
+ return;
}
//鍘嗗彶鏁版嵁鍏ュ簱
hollowBigStorageCageHistoryTaskService.saveBatch(historyTasks);
@@ -355,32 +362,30 @@
S7DataZKDLPTwo s7DataZKDLPTwo = s7SerializerZKDLPTwo.read(S7DataZKDLPTwo.class);
log.info("鍑虹墖浠诲姟璇诲彇s7DataZKDLPTwo:{}", s7DataZKDLPTwo);
Boolean inkageEntity = s7DataZKDLPTwo.getMesControl();
- if (true != inkageEntity) {
+ if (!inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
return;
}
- String requestEntity = s7DataZKDLPTwo.getRequestMes().toString();
- if (!"1".equals(requestEntity)) {
+ Integer requestEntity = s7DataZKDLPTwo.getRequestMes();
+ if (1 != requestEntity) {
log.info("褰撳墠鏈敹鍒板嚭鐗囪姹傦紝缁撴潫鍑虹墖浠诲姟");
return;
}
//鑾峰彇鍑虹墖浠诲姟琛�
List<BigStorageCageTask> outTaskList = getOutTaskList(s7DataZKDLPTwo);
-
if (CollectionUtil.isNotEmpty(outTaskList)) {
log.info("鏈夋鍦ㄦ墽琛岀殑鍑虹墖浠诲姟锛岀粨鏉熸湰娆″嚭鐗囦换鍔�");
return;
}
-
- //鑾峰彇绌洪棽涓旈鍙栦换鍔＄殑鏁版嵁淇℃伅锛屾病鏈変换鍔＄洿鎺ヨ蛋鐜荤拑璋冨害
+ //鑾峰彇鎵�鏈夌┖闂茬殑绾胯矾淇℃伅
HashMap<Integer, Boolean> map = new HashMap<>();
- Boolean oneState = Boolean.FALSE;
- Boolean twoState = Boolean.FALSE;
- Boolean threeState = Boolean.FALSE;
+ //鑾峰彇绌洪棽涓旈鍙栦换鍔＄殑鏁版嵁淇℃伅锛屾病鏈変换鍔＄洿鎺ヨ蛋鐜荤拑璋冨害
try {
if (CMJ1ModbusTcp.checkConnected()) {
- oneState = CMJ1ModbusTcp.readUInt16(42027 - 40001) != 0;
+ Boolean oneState = CMJ1ModbusTcp.readUInt16(42027 - 40001) != 0;
map.put(930, oneState);
+ } else {
+ map.put(930, Boolean.FALSE);
}
} catch (Exception e) {
//nothing
@@ -389,53 +394,50 @@
try {
S7DataZKExtra s7DataZKExtra = s7SerializerZKQ2.read(S7DataZKExtra.class);
log.info("涓┖棰濆璇诲彇{}", s7DataZKExtra);
- twoState = s7DataZKExtra.getIsFree();
- threeState = s7DataZKExtra.getIsFree03();
- map.put(931, twoState);
- map.put(932, threeState);
+ map.put(931, s7DataZKExtra.getIsFree());
+ map.put(932, s7DataZKExtra.getIsFree03());
} catch (Exception e) {
//nothing
log.info("浜�/涓夌嚎绾跨┖闂茬姸鎬佽幏鍙栧紓甯�");
}
+ List<Integer> resultList = new ArrayList<>();
+ if (redisUtil.getCacheObject("priorityHollowSwitch")) {
+ resultList = TWO_LINE_FIRST;
+ } else {
+ resultList = ONE_LINE_FIRST;
+ }
+
HollowGlassOutRelationInfo hollowGlassOutRelationInfo = null;
int cell = -1;
- if (oneState && twoState || !(oneState || twoState)) {
- //鑾峰彇涓婁竴娆＄殑浠诲姟淇℃伅绾胯矾
- List<Integer> resultList = lastTimeLine == 930 ? TWO_LINE_FIRST : ONE_LINE_FIRST;
- for (int i : resultList) {
- if (null == hollowGlassOutRelationInfo) {
- cell = i;
+ for (Integer i : resultList) {
+ if (null == hollowGlassOutRelationInfo) {
+ Boolean entity = map.get(i);
+ cell = i;
+ if (null != entity && entity) {
hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService
.getOne(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
.eq(HollowGlassOutRelationInfo::getCell, cell)
.eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
+ .orderByAsc(HollowGlassOutRelationInfo::getId)
+ .last("limit 1")
);
}
+ } else {
+ break;
}
- } else {
- for (int i : ONE_LINE_FIRST) {
- if (null == hollowGlassOutRelationInfo) {
- Boolean freeFlag = map.get(i);
- cell = i;
- if (freeFlag) {
- hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService
- .getOne(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
- .eq(HollowGlassOutRelationInfo::getCell, cell)
- .eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
- );
- }
- }
- }
- for (int i : ONE_LINE_FIRST) {
- if (null == hollowGlassOutRelationInfo) {
- cell = i;
- hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService
- .getOne(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
- .eq(HollowGlassOutRelationInfo::getCell, cell)
- .eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
- );
-
- }
+ }
+ for (Integer i : resultList) {
+ if (null == hollowGlassOutRelationInfo) {
+ cell = i;
+ hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService
+ .getOne(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
+ .eq(HollowGlassOutRelationInfo::getCell, cell)
+ .eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
+ .orderByAsc(HollowGlassOutRelationInfo::getId)
+ .last("limit 1")
+ );
+ } else {
+ break;
}
}
@@ -445,7 +447,7 @@
// 鑾峰彇褰撳墠涓┖浠诲姟鏈畬鎴愬嚭鐗囩殑鐜荤拑淇℃伅
List<HollowGlassQueueInfo> unFinishHollowQueueList = hollowGlassQueueInfoService.list(new LambdaQueryWrapper<HollowGlassQueueInfo>()
.eq(HollowGlassQueueInfo::getFlowCardId, hollowGlassOutRelationInfo.getFlowCardId())
- .eq(HollowGlassQueueInfo::getCell, cell)
+ .eq(HollowGlassQueueInfo::getCell, hollowGlassOutRelationInfo.getCell())
.eq(HollowGlassQueueInfo::getState, Const.TEMPERING_NEW)
.orderByAsc(HollowGlassQueueInfo::getHollowSequence));
if (CollectionUtil.isNotEmpty(unFinishHollowQueueList)) {
@@ -871,7 +873,7 @@
List<String> glassList = noDealTaskList.stream().map(BigStorageCageTask::getGlassId).collect(Collectors.toList());
hollowBigStorageCageDetailsService.update(new LambdaUpdateWrapper<HollowBigStorageCageDetails>()
.set(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
- .ne(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_OUT)
+ .notIn(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_OUT, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
.in(HollowBigStorageCageDetails::getGlassId, glassList));
} else {
@@ -880,7 +882,7 @@
hollowBigStorageCageDetailsService.update(new LambdaUpdateWrapper<HollowBigStorageCageDetails>()
.set(HollowBigStorageCageDetails::getSlot, item.getStartSlot())
.set(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
- .ne(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_OUT)
+ .notIn(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_OUT, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
.eq(HollowBigStorageCageDetails::getGlassId, item.getGlassId()));
}
}
@@ -1067,13 +1069,12 @@
hollowBigStorageCageDetailsService.update(new LambdaUpdateWrapper<HollowBigStorageCageDetails>()
.set(HollowBigStorageCageDetails::getState, state)
.set(Const.BIG_STORAGE_AFTER_DISPATCH.equals(taskType), HollowBigStorageCageDetails::getSlot, targetSlot)
- .ne(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_OUT)
+ .notIn(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_OUT, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
.in(HollowBigStorageCageDetails::getGlassId, glassIds));
try {
s7DataZKDLPTwo = new S7DataZKDLPTwo();
s7DataZKDLPTwo.setMesReply(1);
s7SerializerZKDLPTwo.write(s7DataZKDLPTwo);
- lastTimeLine = targetSlot;
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0