From eaf25c57276ebaf28141418199c92e9502884ccf Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 09 三月 2025 23:51:28 +0800
Subject: [PATCH] 1、原片仓储新增任务完成/任务失败接口供用户异常情况恢复处理 2、原片仓储新增历史任务查询按钮 3、卧式理片新增任务完成/任务失败接口供用户异常情况恢复处理 4、大理片笼临时修改：10mm及以上厚度的玻璃走直通任务，厚度可按照实际情况进行配置 5、fixbug:中空理片笼10mm厚度玻璃进入理片笼小格子异常问题查询，同一个流程卡同一层出现2种厚度，导致厚度赋值异常，目前已改为查询最后一次导入的为准
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
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 54db40d..9e3bf8d 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
@@ -135,7 +135,7 @@
PlcParameterObject plcMesObject = S7object.getinstance().PlcMesObject;
if (CollectionUtils.isNotEmpty(list)) {
s7control.writeWord(plcMesObject.getPlcParameter("alarm_signal").getAddress(), 1);
- }else{
+ } else {
s7control.writeWord(plcMesObject.getPlcParameter("alarm_signal").getAddress(), 0);
}
}
@@ -156,7 +156,7 @@
//涓嬬墖鏁伴噺-1
for (DownGlassTask downGlassTask : downGlassTaskList
) {
- if (Const.GLASS_CACHE_TYPE_OUT_ALL.equals(downGlassTask.getTaskType())) {
+ if (Const.GLASS_CACHE_TYPE_OUT_ALL.contains(downGlassTask.getTaskType())) {
downWorkstationService.update(
new LambdaUpdateWrapper<DownWorkstation>()
.setSql("racks_number = racks_number-1")
@@ -197,7 +197,10 @@
//鏇存柊宸ヤ綅鍏朵粬鐜荤拑淇℃伅鐨勬暟閲�
QueryWrapper<Damage> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("process_id", downWorkstation.getFlowCardId());
- queryWrapper.eq("technology_number", downWorkstation.getLayer());
+ queryWrapper.gt("type", 3);
+ if (downWorkstation.getLayer() != 0) {
+ queryWrapper.eq("technology_number", downWorkstation.getLayer());
+ }
int otherNumber = damageService.count(queryWrapper);
downWorkstationService.update(new LambdaUpdateWrapper<DownWorkstation>().set(DownWorkstation::getOtherNumber, otherNumber)
.eq(DownWorkstation::getWorkstationId, downWorkstation.getWorkstationId()));
@@ -686,7 +689,6 @@
downGlassInfoService.save(downGlassInfo);
//鐢熸垚浠诲姟淇℃伅
GlassInfo glassInfo = new GlassInfo();
- downStorageCageDetails.setLayer(0);
BeanUtils.copyProperties(downStorageCageDetails, glassInfo);
//鍒犻櫎鐞嗙墖绗艰〃鎷胯蛋/鐮存崯鏁版嵁鏁版嵁
damageService.deleteByGlassId(glassInfo.getGlassId());
@@ -707,6 +709,14 @@
downGlassTask.setTaskStatus(0);
downGlassTask.setCreateTime(new Date());
downGlassTaskService.save(downGlassTask);
+ //娣诲姞鎶ュ伐鏁版嵁
+ Damage damage = new Damage();
+ damage.setGlassId(glassInfo.getGlassId());
+ damage.setWorkingProcedure("閽㈠寲");
+ damage.setLine(4001);
+ damage.setType(1);
+ damage.setRemark("閽㈠寲鍚庡崸寮忕悊鐗�");
+ damageService.insertDamage(damage);
//鍚憄lc鍙戦�佸懡浠�
return sendMessageToPlc((int) glassInfo.getWidth(), (int) glassInfo.getHeight(), (int) glassInfo.getThickness(),
startCell, endCell, taskType);
--
Gitblit v1.8.0