From 65ae6084f552c035eb5640afbd8f73e6054e3b6c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 七月 2024 21:15:53 +0800
Subject: [PATCH] 1、大理片：fixbug:大理片出片逻辑修改，钢化版图是否到齐：sql逻辑问题，包含人工出片任务，造成钢化版图是否到齐需要获取已出片的玻璃，造成已出笼的玻璃会重复计算并准备生成钢化任务，但获取的玻璃信息为空，造成插入钢化表异常。且排除已出笼的钢化版图较复杂（暂不关联钢化小片表），目前解决方案：把所有到齐的钢化版图数据查出来，排除笼内玻璃为空的 2、移除已配置完mapperscan已扫描仍有@Mapper注解的
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 b7d08c2..ec327ab 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
@@ -74,17 +74,19 @@
* 澧炲姞浜哄伐杈撳叆鐨勫伐浣嶇幓鐠冧俊鎭�/鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
*/
@Override
- public void updateGlassMessage(UpWorkstation upwork) {
+ public Boolean updateGlassMessage(UpWorkstation upwork) {
+ int update = 0;
UpdateWrapper<UpWorkstation> updateWrapper = new UpdateWrapper<>();
if (upwork.getWorkstationId() == 1 || upwork.getWorkstationId() == 3) {
updateWrapper.eq("workstation_id", upwork.getWorkstationId());
- int update = this.baseMapper.update(upwork, updateWrapper);
+ 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);
+ update = this.baseMapper.update(upwork, updateWrapper);
}
}
+ return update>0;
}
@Override
--
Gitblit v1.8.0