From 670c66f36b2cff5ad4eadb3afb106273d8a64088 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 16 十二月 2024 09:22:27 +0800
Subject: [PATCH] 卧式理片进片最小尺寸判断，玻璃id替换添加打标条件，卧转立启动逻辑优化
---
hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java | 3
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 7 +
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java | 3
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 27 +++++----
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java | 8 +-
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 41 +++++++++----
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java | 16 +++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 22 +++---
hangzhoumesParent/JsonFile/PlcCacheGlass.json | 9 ++
12 files changed, 94 insertions(+), 48 deletions(-)
diff --git a/hangzhoumesParent/JsonFile/PlcCacheGlass.json b/hangzhoumesParent/JsonFile/PlcCacheGlass.json
index 01969b7..374c6d4 100644
--- a/hangzhoumesParent/JsonFile/PlcCacheGlass.json
+++ b/hangzhoumesParent/JsonFile/PlcCacheGlass.json
@@ -59,6 +59,13 @@
"addressLenght":"2",
"ratio":"1",
"unit":""
- }
+ },
+ {
+ "codeId": "A09_glass_status",
+ "addressIndex": "76",
+ "addressLenght": "2",
+ "ratio": "1",
+ "unit": ""
+ }
]
}
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 a05dfe6..731b871 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
@@ -30,18 +30,18 @@
* A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 3001
* A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 浜哄伐鍑虹墖 3002
*/
-// public static final Integer TEMPERING_OUT_TARGET_POSITION = 3001;
-// public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 3002;
-// public static final List<Integer> OUT_TARGET_POSITION_ALL = Arrays.asList(3001, 3002);
+ public static final Integer TEMPERING_OUT_TARGET_POSITION = 3001;
+ public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 3002;
+ public static final List<Integer> OUT_TARGET_POSITION_ALL = Arrays.asList(3001, 3002);
- /**
- * 涔変箤纾ㄨ竟绾�
- * A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 930
- * A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 浜哄伐鍑虹墖 931
- */
- public static final Integer TEMPERING_OUT_TARGET_POSITION = 930;
- public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 931;
- public static final List<Integer> OUT_TARGET_POSITION_ALL = Arrays.asList(930, 931);
+// /**
+// * 涔変箤纾ㄨ竟绾�
+// * A09鍑虹墖鐩爣浣嶇疆 d02鍗ц浆绔� 閽㈠寲鍑虹墖 930
+// * A10鍑虹墖鐩爣浣嶇疆 d05鍗ц浆绔� 浜哄伐鍑虹墖 931
+// */
+// public static final Integer TEMPERING_OUT_TARGET_POSITION = 930;
+// public static final Integer ARTIFICIAL_OUT_TARGET_POSITION = 931;
+// public static final List<Integer> OUT_TARGET_POSITION_ALL = Arrays.asList(930, 931);
/**
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
index 8a16cb4..81cb630 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -148,7 +148,7 @@
/**
* 棰勬帓鏍煎瓙
*/
- private Integer Slot;
+ private Integer targetSlot;
/**
* 鎵撴爣灞炴��
*/
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
index aecb3b9..3cb2744 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/entity/TemperingGlassInfo.java
@@ -1,6 +1,7 @@
package com.mes.temperingglass.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.mes.base.entity.BigStorageCageBaseInfo;
@@ -88,11 +89,24 @@
private Integer state;
/**
+ * 鏍煎瓙
+ */
+ @TableField("Slot")
+ @ApiModelProperty(value = "鏍煎瓙", position = 17)
+ private Integer slot;
+
+ /**
* 宸ョ▼id
*/
- @ApiModelProperty(value = "宸ョ▼id", position = 17)
+ @ApiModelProperty(value = "宸ョ▼id", position = 18)
private String engineerId;
+ /**
+ * 閽㈠寲绫诲瀷
+ */
+ @ApiModelProperty(value = "閽㈠寲绫诲瀷", position = 19)
+ private Integer temperingType;
+
@TableLogic
private int deleted;
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index f1cad3a..ab9669a 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -211,8 +211,11 @@
new LambdaQueryWrapper<GlassInfo>()
.eq(GlassInfo::getGlassId, glassId)
);
- if (Math.max(feedGlassInfo.getWidth(), feedGlassInfo.getHeight()) > cacheWidth || Math.min(feedGlassInfo.getWidth(), feedGlassInfo.getHeight()) > cacheHeight) {
- log.info("1.1銆佺幓鐠冭秴杩囧崸寮忕悊鐗囨渶澶у昂瀵�:{}", feedGlassInfo);
+ if (Math.max(feedGlassInfo.getWidth(), feedGlassInfo.getHeight()) > cacheWidth ||
+ Math.min(feedGlassInfo.getWidth(), feedGlassInfo.getHeight()) > cacheHeight
+ || Math.min(feedGlassInfo.getWidth(), feedGlassInfo.getHeight()) < Integer.parseInt(minTwoFirstLength)
+ ) {
+ log.info("1.1銆佺幓鐠冭秴杩囧崸寮忕悊鐗囧昂瀵歌寖鍥�:{}", feedGlassInfo);
return;
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
index 68cc6a7..66371a9 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassTask.java
@@ -89,12 +89,12 @@
// miloService.subscriptionFromOpcUa(Arrays.asList("mes.WL2.edg_storage_device_two_task[1].task_state"), cacheGlassStartCallback);
// }
- @Scheduled(fixedDelay = 1000)
+// @Scheduled(fixedDelay = 1000)
public void startOneOpcTask() {
startOneOpcTaskChild(EDG_STORAGE_DEVICE_ONE_TASK, 1);
}
- @Scheduled(fixedDelay = 1000)
+// @Scheduled(fixedDelay = 1000)
public void startTwoOpcTask() {
startOneOpcTaskChild(EDG_STORAGE_DEVICE_TWO_TASK, 2);
}
@@ -142,7 +142,7 @@
}
- @Scheduled(fixedDelay = 1000)
+// @Scheduled(fixedDelay = 1000)
public void edgOneOpcTask() throws Exception {
EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(EDG_STORAGE_DEVICE_ONE_TASK);
String glassId = task.getGlassId();
@@ -153,7 +153,7 @@
edgTaskChild(glassId, 1);
}
- @Scheduled(fixedDelay = 1000)
+// @Scheduled(fixedDelay = 1000)
public void edgTwoOpcTask() throws Exception {
EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(EDG_STORAGE_DEVICE_TWO_TASK);
String glassId = task.getGlassId();
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
index 61259b4..38e391f 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -74,7 +74,8 @@
public void testChangeCellSize() {
// String url=getClass().getResource("").getPath();
// log.info("瀹屾暣璺緞锛歿}", Arrays.asList(url));
- cacheGlassTask.queryChangeGlassInfo(Const.A09_OUT_TARGET_POSITION, "");
+// cacheGlassTask.queryChangeGlassInfo(Const.A09_OUT_TARGET_POSITION, "");
+ cacheGlassTask.inTo("P24110503|26|2","","2");
}
@Test
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 d3e4d48..deb1045 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
@@ -272,7 +272,7 @@
new LambdaQueryWrapper<GlassInfo>()
.eq(GlassInfo::getEngineerId, glassInfo.getEngineerId())
.eq(GlassInfo::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
- .eq(GlassInfo::getSlot, glassInfo.getSlot())
+ .eq(GlassInfo::getTargetSlot, glassInfo.getTargetSlot())
);
List<String> glassIds = glassInfoList.stream().map(GlassInfo::getGlassId).collect(Collectors.toList());
BigStorageDTO bigStorageDTO = null;
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 a677319..78840f9 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
@@ -304,7 +304,7 @@
log.info("澶х悊鐗囩绌鸿溅杩涚墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
}
- @Scheduled(fixedDelay = 10000)
+ @Scheduled(fixedDelay = 5000)
public void plcToHomeEdgOutTask() {
Date startDate = new Date();
log.info("澶х悊鐗囩鍑虹墖浠诲姟寮�濮嬫墽琛屾椂闂达細{}", startDate);
@@ -393,7 +393,7 @@
+ temperingOccupySlot.getEngineerId() + "' and tempering_layout_id = '" + temperingOccupySlot.getTemperingLayoutId() + "'")
.orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence)
);
- Map<Integer, List<GlassInfo>> listMap = glassInfos.stream().collect(Collectors.groupingBy(item -> item.getSlot()));
+ Map<Integer, List<GlassInfo>> listMap = glassInfos.stream().collect(Collectors.groupingBy(item -> item.getTargetSlot()));
for (Map.Entry<Integer, List<GlassInfo>> entry : listMap.entrySet()) {
List<GlassInfo> valueList = entry.getValue();
List<String> glassIds = valueList.stream().map(GlassInfo::getGlassId).collect(Collectors.toList());
@@ -427,9 +427,9 @@
.ne(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT));
//涓ゆ鏇存柊绗煎瓙鐨勫墿浣欏昂瀵革細绗竴娆￠槻姝㈡湁鐜荤拑缁х画杩涜皟搴﹀悗鐨勭瀛愶紝绗簩娆℃洿鏂帮細璁＄畻鏍煎瓙鐨勫疄闄呭昂瀵�
// 浠呮洿鏂拌皟搴﹀悗鐨勬牸瀛愪俊鎭細璧峰鏍煎瓙瀹屾垚鍚庢洿鏂帮細闃叉璋冨害鍑虹墖杩囩▼涓湁鏂扮幓鐠冭繘鍏ワ紝
- List<Integer> updateSlots = new ArrayList<>();
- updateSlots.add(bigStorageCageDetails.getSlot());
- updateSlotRemainBySlots(updateSlots);
+// List<Integer> updateSlots = new ArrayList<>();
+// updateSlots.add(bigStorageCageDetails.getSlot());
+// updateSlotRemainBySlots(updateSlots);
}
}
break loop;
@@ -673,7 +673,10 @@
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())));
+// .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_NEW)
+ .and(e -> e.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_NEW).or()
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN))
+ .in(BigStorageCageDetails::getGlassId, inDamageTaskInfoList.stream().map(BigStorageCageFeedTask::getGlassId).collect(Collectors.toList())));
//灏嗙牬鎹熶俊鎭柊澧炲叆鐮存崯琛�
List<Integer> slotList = new ArrayList<>();
for (BigStorageCageFeedTask bigStorageCageFeedTask : inDamageTaskInfoList) {
@@ -867,9 +870,20 @@
.eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
.eq(BigStorageCageFeedTask::getTargetSlot, 0)
);
- if(CollectionUtils.isNotEmpty(bigStorageCageFeedTasks)){
- log.info("鑾峰彇鍒扮殑杩涚墖浠诲姟淇℃伅{}", bigStorageCageFeedTasks);
+ if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks)) {
+ log.info("璁＄畻鐩爣鏍煎瓙鍙戦�佷换鍔}", bigStorageCageFeedTasks);
computeTargetByLineCar(bigStorageCageFeedTasks.get(0).getLine(), glassIdsCar);
+ } else {
+ log.info("鍐嶆鍙戦�佽繘鐗囦换鍔}", bigStorageCageFeedTasks);
+ List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskService.list(
+ new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .in(BigStorageCageFeedTask::getGlassId, glassIdsCar)
+ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_CAR)
+ .gt(BigStorageCageFeedTask::getTargetSlot, 0)
+ );
+ if (CollectionUtils.isNotEmpty(bigStorageCageFeedTaskList)) {
+ sendTaskListToPLCCar(bigStorageCageFeedTaskList);
+ }
}
}
@@ -1005,7 +1019,7 @@
new LambdaQueryWrapper<GlassInfo>()
.eq(GlassInfo::getGlassId, glassId)
);
- if (glassInfo.getSlot() == null) {
+ if (glassInfo.getTargetSlot() == null) {
List<GlassInfo> glassInfos = glassInfoService.list(
new LambdaQueryWrapper<GlassInfo>()
.eq(GlassInfo::getEngineerId, glassInfo.getEngineerId())
@@ -1025,7 +1039,7 @@
glassInfoService.update(
new LambdaUpdateWrapper<GlassInfo>()
.eq(GlassInfo::getGlassId, bigStorageCageOutTask.getGlassId())
- .set(GlassInfo::getSlot, bigStorageCageOutTask.getTrainNumber())
+ .set(GlassInfo::getTargetSlot, bigStorageCageOutTask.getTrainNumber())
);
}
}
@@ -1123,11 +1137,11 @@
if (info == null) {
continue;
}
- if(info.getSlot()==null){
+ if (info.getTargetSlot() == null) {
computeSlot(info.getGlassId());
- info=glassInfoService.getOne(
+ info = glassInfoService.getOne(
new LambdaQueryWrapper<GlassInfo>()
- .eq(GlassInfo::getGlassId,info.getGlassId())
+ .eq(GlassInfo::getGlassId, info.getGlassId())
);
}
BigStorageCageDetails cageDetails = new BigStorageCageDetails();
@@ -1422,6 +1436,7 @@
.eq(GlassInfo::getTotalLayer, glassInfo.getTotalLayer())
.eq(GlassInfo::getLayer, glassInfo.getLayer())
.eq(GlassInfo::getEngineerId, glassInfo.getEngineerId())
+ .eq(GlassInfo::getMarkIcon, glassInfo.getMarkIcon())
.notInSql(GlassInfo::getGlassId, "select distinct glass_id from big_storage_cage_details " +
"where state!=101 and engineer_id = '" + glassInfo.getEngineerId() + "' and width = " + glassInfo.getWidth() + " and height = " + glassInfo.getHeight())
.orderByAsc(GlassInfo::getTemperingLayoutId)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml
index 4ce8961..67975ee 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageFeedTaskMapper.xml
@@ -18,8 +18,10 @@
and deleted = 0
and (target_slot = 0 or target_slot is null)
group by line
+ HAVING DATEDIFF(SECOND, max(create_time), GETDATE()) + 45>20 or SUM(case task_state when 2 then 1 else 0 end)>1
) t
where t.total_count = t.real_count
+ order by real_count desc,line desc
</select>
<select id="querySitToUpRemainWidth" resultMap="bigStorageDTO">
SELECT CAST
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
index fea0ede..46719e4 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -24,6 +24,7 @@
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.job.PlcSlicecage;
import com.mes.job.PlcStorageCageTask;
import com.mes.pp.entity.ReportingWork;
import com.mes.pp.entity.ReportingWorkDetail;
@@ -283,18 +284,20 @@
// .eq(GlassInfo::getGlassId,"P24120801|1|2")
// );
// bigStorageCageDetailsService.queryTargetSlotByTempering(glassInfo);
- List<String> glassIdsCar=new ArrayList<>();
- glassIdsCar.add("P24120801|4|3");
- List<BigStorageCageFeedTask> bigStorageCageFeedTasks = bigStorageCageFeedTaskService.list(
- new LambdaQueryWrapper<BigStorageCageFeedTask>()
- .in(BigStorageCageFeedTask::getGlassId, glassIdsCar)
- .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
- .eq(BigStorageCageFeedTask::getTargetSlot, 0)
- );
- if(CollectionUtils.isNotEmpty(bigStorageCageFeedTasks)){
- log.info("鑾峰彇鍒扮殑杩涚墖浠诲姟淇℃伅{}", bigStorageCageFeedTasks);
- plcStorageCageTask.computeTargetByLineCar(bigStorageCageFeedTasks.get(0).getLine(), glassIdsCar);
- }
+// List<String> glassIdsCar=new ArrayList<>();
+// glassIdsCar.add("P24120801|4|3");
+// List<BigStorageCageFeedTask> bigStorageCageFeedTasks = bigStorageCageFeedTaskService.list(
+// new LambdaQueryWrapper<BigStorageCageFeedTask>()
+// .in(BigStorageCageFeedTask::getGlassId, glassIdsCar)
+// .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
+// .eq(BigStorageCageFeedTask::getTargetSlot, 0)
+// );
+// if(CollectionUtils.isNotEmpty(bigStorageCageFeedTasks)){
+// log.info("鑾峰彇鍒扮殑杩涚墖浠诲姟淇℃伅{}", bigStorageCageFeedTasks);
+// plcStorageCageTask.computeTargetByLineCar(bigStorageCageFeedTasks.get(0).getLine(), glassIdsCar);
+// }
+// plcStorageCageTask.queryAndChangeGlass("P24111102|1|6");
+ bigStorageCageDetailsService.selectFeedTask();
}
@Test
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
index 9e3bf8d..b16e1b6 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
@@ -275,7 +275,8 @@
for (DownGlassInfoDTO e : downGlassInfoDTOList) {
List<GlassInfo> glassInfoList = e.getGlassInfoList();
List<GlassInfo> glassInfoTempList = glassInfoList.stream().filter(item -> item.getWidth() == glassInfo.getWidth() && item.getHeight() == glassInfo.getHeight()
- && item.getThickness() == glassInfo.getThickness() && item.getFilmsid().equals(glassInfo.getFilmsid())).collect(Collectors.toList());
+ && item.getThickness() == glassInfo.getThickness() && item.getMarkIcon().equals(glassInfo.getMarkIcon())
+ && item.getFilmsid().equals(glassInfo.getFilmsid())).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(glassInfoTempList)) {
for (GlassInfo item : glassInfoTempList) {
//鐜荤拑鏄惁涓哄灞傦細1銆佸厛鑾峰彇褰撳墠娴佺▼鍗¤惤鏋舵渶澶氱殑灞傛暟锛屽鏋滀负绌猴紝琛ㄦ槑鏈粦瀹氭祦绋嬪崱锛屾湭钀芥灦锛岀劧鍚庢寜鐓ф槸鍚﹀彲缁戝畾鏋跺瓙鍐冲畾鏄惁鏇挎崲銆傦紙鍙拷鐣ヤ笉璁★紝鏈牎楠屼粎鍦ㄥ墠涓�娆¤皟鐢ㄨ捣浣滅敤锛�
--
Gitblit v1.8.0