From b3cb0f942ff70be8b9f7ef0d6ff0b0ce2c52c25b Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期五, 17 五月 2024 19:31:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
index 1e24d13..93af99f 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
@@ -46,7 +46,7 @@
//鍒ゆ柇宸ヤ綅鏄惁鏈夌鍚堟潯浠剁殑鐜荤拑
@Override
- public UpWorkstation selectworkstation(UpPattenUsage upPattenUsage) {
+ public UpWorkstation selectWorkstation(UpPattenUsage upPattenUsage) {
QueryWrapper<UpWorkstation> wrapper = new QueryWrapper<>();
wrapper.eq("pattern_width", upPattenUsage.getWidth())
.eq("pattern_height", upPattenUsage.getHeight())
@@ -59,9 +59,9 @@
}
@Override
- public void reduceWorkstationNumber(UpWorkstation upwork) {
+ public void reduceWorkstationNumber(Integer upworkId) {
UpdateWrapper<UpWorkstation> wrapper = new UpdateWrapper<>();
- wrapper.eq("id", upwork.getWorkstationId())
+ wrapper.eq("id", upworkId)
.setSql("number = number - 1");
boolean updateResult = upWorkstationMapper.update(null, wrapper) > 0;
log.info("鍑忓皯宸ヤ綅鏁伴噺{}",updateResult);
@@ -74,9 +74,17 @@
@Override
public void updateGlassMessage(UpWorkstation upwork) {
UpdateWrapper<UpWorkstation> updateWrapper = new UpdateWrapper<>();
- updateWrapper.eq("workstation_id", upwork.getWorkstationId());
- int update = this.baseMapper.update(upwork, updateWrapper);
- }
+ if (upwork.getWorkstationId() == 1 || upwork.getWorkstationId() == 3) {
+ updateWrapper.eq("workstation_id", upwork.getWorkstationId());
+ int update = this.baseMapper.update(upwork, updateWrapper);
+ } else {
+ if (upwork.getPatternHeight() > 2700 || upwork.getPatternHeight() == 0) {
+ updateWrapper.eq("workstation_id", upwork.getWorkstationId());
+ int update = this.baseMapper.update(upwork, updateWrapper);
+ }
+ }
+
}
+}
\ No newline at end of file
--
Gitblit v1.8.0