From 65058e7227fcfc53e81d9bb87e0e2667879edd05 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 15 四月 2024 10:40:15 +0800
Subject: [PATCH] 优化查询
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
index 67de8c9..e839f95 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downstorage/service/DownGlassCacheLogic.java
@@ -3,9 +3,13 @@
import com.mes.common.PLCAutoMes;
import com.mes.common.S7control;
import com.mes.device.PlcParameterObject;
+
import com.mes.downstorage.entity.DownStorageCageDetails;
-import com.mes.downstorage.mapper.SelectInfo;
+import com.mes.downstorage.mapper.DownStorageCageDetailsMapper;
+import com.mes.downworkstation.mapper.DownWorkstationMapper;
+import com.mes.tools.WebSocketServer;
import com.mes.uppattenusage.entity.GlassInfo;
+import com.mes.uppattenusage.service.GlassInfoService;
import lombok.Data;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -16,7 +20,9 @@
@Service
public class DownGlassCacheLogic {
@Autowired
- private SelectInfo selectInfo;
+ private DownStorageCageDetailsMapper selectInfo;
+ private GlassInfoService GlassInfoService;
+ private DownStorageCageDetailsService downStorageCageDetailsService;
/**
* @param Number
@@ -71,8 +77,9 @@
*/
public boolean processInto(String Number){
+ GlassInfoService = WebSocketServer.applicationContext.getBean(GlassInfoService.class);
//鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ GlassInfo GlassInfo=GlassInfoService.selectGlassId(Number);
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
//瀛樺湪姝ょ幓鐠冪紪鍙�
if(GlassInfo!=null){
@@ -137,7 +144,7 @@
GlassInfo glassInfo06= selectInfo.SelectLastOutCacheInfo("06");
GlassInfo glassInfo11= selectInfo.SelectLastOutCacheInfo("11");
GlassInfo glassInfo13= selectInfo.SelectLastOutCacheInfo("13");
- if(glassInfo06!=null&&glassInfo11.getWidth()==item.getWidth()&&glassInfo06.getHeight()==item.getHeight()){
+ if(glassInfo06!=null&& glassInfo11.getWidth().equals(item.getWidth()) && glassInfo06.getHeight().equals(item.getHeight())){
endcell="11";
SendEndcell="2";
}else if(item.getHeight()>=3440&&item.getWidth()>=1440){
@@ -154,6 +161,10 @@
//杩斿洖缁撴灉
return false;
}
+//鏌ヨ鏄惁缁戝畾鏋跺瓙
+// public boolean selectFlowCardId(String FlowCardId){
+//
+// }
/**
* @param Number
@@ -162,7 +173,7 @@
public void processMb(String Number){
//鎸塱d鏌ヨ鐜荤拑淇℃伅琛ㄩ噷鐨勭幓鐠�
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ GlassInfo GlassInfo=GlassInfoService.selectGlassId(Number);
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
if(GlassInfo!=null){
//鍙戦�佷换鍔� ID 闀� 瀹� 鍘� 鍊掕 宸ヨ壓鍔熻兘绛�
@@ -185,7 +196,7 @@
public boolean selectMessageId(String Number){
//鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ GlassInfo GlassInfo=GlassInfoService.selectGlassId(Number);
if(GlassInfo==null){
//杩斿洖 涓嶅瓨鍦�
return false;
@@ -203,7 +214,7 @@
public boolean deleteMessageId(String Number){
//鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ GlassInfo GlassInfo=GlassInfoService.selectGlassId(Number);
if(GlassInfo==null){
//杩斿洖 涓嶅瓨鍦�
return false;
@@ -221,7 +232,7 @@
*/
public boolean isExist(String Number){
//鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
+ GlassInfo GlassInfo=GlassInfoService.selectGlassId(Number);
if(GlassInfo==null){
//杩斿洖 涓嶅瓨鍦�
return false;
--
Gitblit v1.8.0