From ffcbd9cb24743ebe329ba2e1945f855d786179cb Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 17 五月 2024 15:20:41 +0800
Subject: [PATCH] 增加工位新增判断,2，4工位只保存2米7以上的玻璃
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 4 ++--
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java | 13 ++++++++++---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java | 1 +
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
index 6f81e0a..dd4950e 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -62,8 +62,8 @@
List<GlassInfo> glassinfo=glassInfoService.selectGlassInfo(engineering.getEngineerId());
glassInfoService.saveGlassInfo(glassinfo);
log.info("浠嶱P琛ㄦ煡璇ngineering鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
- List<Engineering> listengineering= engineeringService.selectEngineering(engineering.getEngineerId());
- engineeringService.saveEngineering(listengineering);
+ List<Engineering> listEngineering= engineeringService.selectEngineering(engineering.getEngineerId());
+ engineeringService.saveEngineering(listEngineering);
log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�");
optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
// List<UpPattenUsage> data=upPattenUsageService.prioritylist();
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java
index b4d0fc6..f439b06 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java
@@ -67,6 +67,7 @@
.eq(SysUser::getId, user.getId())
.like(StringUtils.isNotBlank(request.getKey()), SysMenu::getMenuName, request.getKey());
+ //
List<SysMenu> menuList = sysUserRoleMapper.selectJoinList(SysMenu.class, wrapper);
return create(menuList);
}
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 3b8a57a..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
@@ -74,10 +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