From e96e7f5d464ea62e052aaef33de1b8b3a3448b0f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 16 十月 2024 10:04:54 +0800
Subject: [PATCH] 版本整合04
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 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 8ab87a9..d0f2fe9 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
@@ -437,13 +437,13 @@
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)){
+ 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())
+ .set(TemperingGlassInfo::getState, Const.TEMPERING_END)
+ .eq(TemperingGlassInfo::getGlassId, bigStorageCageOutTask.getGlassId())
);
}
}
@@ -527,9 +527,9 @@
Damage damage = new Damage();
damage.setGlassId(bigStorageCageFeedTask.getGlassId());
damage.setLine(bigStorageCageFeedTask.getLine());
- damage.setWorkingProcedure("鍐峰姞宸�");
+ damage.setWorkingProcedure("纾ㄨ竟");
damage.setRemark("杩涚鍓嶅崸杞珛");
- damage.setStatus(0);
+ damage.setStatus(1);
damage.setType(bigStorageCageFeedTask.getTaskState());
damageService.insertDamage(damage);
slotList.add(bigStorageCageFeedTask.getTargetSlot());
@@ -555,9 +555,9 @@
Damage damage = new Damage();
damage.setGlassId(bigStorageCageOutTask.getGlassId());
damage.setLine(bigStorageCageOutTask.getEndSlot());
- damage.setWorkingProcedure("鍐峰姞宸�");
+ damage.setWorkingProcedure("閽㈠寲");
damage.setRemark("鍑虹墖鍚庡崸杞珛");
- damage.setStatus(0);
+ damage.setStatus(1);
damage.setType(bigStorageCageOutTask.getTaskState());
damageService.insertDamage(damage);
slotList.add(bigStorageCageOutTask.getStartSlot());
@@ -572,6 +572,35 @@
}
/**
+ * 纭瀛楁竻绌�
+ */
+// @Scheduled(fixedDelay = 300)
+ /**
+ * 杩涚墖鐘舵�佷慨鏀�
+ */
+// @Scheduled(fixedDelay = 300)
+ public void feedStatusUpdate() {
+ List<String> glassIds1=null;
+ List<String> glassIds2=null;
+ List<BigStorageCageFeedTask> bigStorageCageFeedTasks1=bigStorageCageFeedTaskService.list(
+ new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .eq(BigStorageCageFeedTask::getTaskState,1)
+ .eq(BigStorageCageFeedTask::getLine,Const.ARTIFICIAL_OUT_TARGET_POSITION)
+ );
+ List<BigStorageCageFeedTask> bigStorageCageFeedTasks2=bigStorageCageFeedTaskService.list(
+ new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .eq(BigStorageCageFeedTask::getTaskState,1)
+ .eq(BigStorageCageFeedTask::getLine,Const.TEMPERING_OUT_TARGET_POSITION)
+ );
+// if(CollectionUtils.isNotEmpty(bigStorageCageFeedTasks1)){
+//
+// }
+// if(CollectionUtils.isNotEmpty(bigStorageCageFeedTasks1)){
+//
+// }
+ }
+
+ /**
* 鎸夌収鐜荤拑id鍒ゆ柇鐜荤拑鐘舵�佸強鍗ц浆绔嬫槸鍚﹀彲鐩存帴鍚姩
*/
public Boolean judgeGlassTypeStatus(String glassId, Integer line, String mesAddress) {
@@ -581,14 +610,24 @@
.eq(EdgGlassTaskInfo::getLine, line)
.apply("time >= (select time from edg_glass_task_info where line='" + line + "' and glass_id = '" + glassId + "' and deleted = 0)")
.orderByAsc(EdgGlassTaskInfo::getTime));
- if (edgGlassTaskInfoList == null) {
- log.info("绾胯矾锛歿}璇嗗埆鐜荤拑淇℃伅鏈嚭鐜板湪灏哄琛ㄤ腑,鑾峰彇鐩搁偦涓ゅ潡鐜荤拑澶辫触", line);
- } else {
+ 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銆佽幏鍙栧崸杞珛鍓╀綑瀹藉害
@@ -844,7 +883,7 @@
* @param <T>
* @return
*/
- private <T extends BigStorageCageBaseInfo> Boolean computeOutMoreGlassInfo(List<T> list, Boolean isTempering, String mesToPLCAddress) {
+ public <T extends BigStorageCageBaseInfo> Boolean computeOutMoreGlassInfo(List<T> list, Boolean isTempering, String mesToPLCAddress) {
//浠诲姟鏁版嵁 鑾峰彇杞﹀瓙瀛樻斁鐜荤拑鏈�澶ф暟閲� 鐜荤拑闂撮殧
List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
//鎵撹溅鍓╀綑灏哄
--
Gitblit v1.8.0