From 7e46a5036034052dbdf344850073ce1662bc4569 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 09 十月 2024 10:35:04 +0800
Subject: [PATCH] 修改破损传参，大理片界面添加满炉数量，大理片人工下片后将钢化小片表状态改为4，出片任务表添加任务生成时间
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 23d9449..e96ddf0 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);
}
}
@@ -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()));
@@ -708,7 +711,7 @@
downGlassTask.setCreateTime(new Date());
downGlassTaskService.save(downGlassTask);
//娣诲姞鎶ュ伐鏁版嵁
- Damage damage=new Damage();
+ Damage damage = new Damage();
damage.setGlassId(glassInfo.getGlassId());
damage.setWorkingProcedure("閽㈠寲");
damage.setLine(4001);
--
Gitblit v1.8.0