From d6d0b8c6ba79137a0b12e33e5aa4183343197eb0 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 15 三月 2025 15:07:55 +0800
Subject: [PATCH] 1、记录解决lisec中空出片同一车内的玻璃顺序错乱 2、将报工接口地址改为义乌服务器地址
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
index ac51eae..93cfed3 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
@@ -7,6 +7,8 @@
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.engineering.service.EngineeringService;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
import lombok.extern.slf4j.Slf4j;
@@ -33,6 +35,8 @@
OptimizeProjectMapper optimizeProjectMapper;
@Autowired
private EngineeringMapper engineeringMapper;
+ @Autowired
+ private GlassInfoMapper glassInfoMapper;
//寮�濮�/鏆傚仠浠诲姟
@Override
@@ -114,8 +118,21 @@
}
@Override
- public Engineering selectUpInitiate(Integer state, Integer equipmentId) {
- return null;
+ public Engineering selectUpInitiate(String engineerId) {
+ QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
+ wrapper.eq("engineer_id", engineerId)
+ .last("limit 1");
+ return engineeringMapper.selectOne(wrapper);
+
+ }
+
+ @Override
+ public GlassInfo selectGlassinfoIsnull(String engineerId) {
+ QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
+ wrapper.eq("engineer_id", engineerId)
+ .last("limit 1");
+ return glassInfoMapper.selectOne(wrapper);
+
}
@Override
--
Gitblit v1.8.0