From 609818970fb1e7ae59b2535752a5ea063aa229b0 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期六, 06 七月 2024 15:05:52 +0800 Subject: [PATCH] 1:大理片 新增计算最大宽度:避免高度大于宽度 计算出错 2、磨边前卧式理片新增最小尺寸校验 3、下片修复下片逻辑异常,新增配置 人工下片的最大尺寸 最小尺寸 直通任务的最大尺寸 --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java index c54fa2b..813c149 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java @@ -27,7 +27,7 @@ public class DownWorkstationTaskServiceImpl extends ServiceImpl<DownWorkstationTaskMapper, DownWorkstationTask> implements DownWorkstationTaskService { - public void insertdownWorkstationtask(DownGlassInfo downGlassInfo) { + public void insertdownWorkstationtask(DownGlassInfo downGlassInfo,String workstationid) { DownWorkstationTask entity = new DownWorkstationTask(); // 鏌ヨ褰撳墠鏈�澶х殑 id 鍊� Long maxId = getMaxId(); @@ -38,6 +38,7 @@ BeanUtils.copyProperties(downGlassInfo,entity); entity.setId(newId); // 璁剧疆鎵嬪姩閫掑鐨� id entity.setState(1); + entity.setWorkstationid(workstationid); baseMapper.insert(entity); } @@ -66,10 +67,10 @@ } @Override - public void updateTaskStateToZero(DownWorkstationTask downWorkstationTask) { + public void updateTaskState(DownWorkstationTask downWorkstationTask) { LambdaUpdateWrapper<DownWorkstationTask> lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); - lambdaUpdateWrapper.set(DownWorkstationTask::getState, 0) + lambdaUpdateWrapper.set(DownWorkstationTask::getState, 2) .eq(DownWorkstationTask::getGlassId, downWorkstationTask.getGlassId()); baseMapper.update(new DownWorkstationTask(), lambdaUpdateWrapper); -- Gitblit v1.8.0