From 93e36c526fe445c14d5fb19f3653f8a8e55e3a6c Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期四, 09 五月 2024 15:49:34 +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 | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 18d8b4b..ffd6491 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
@@ -2,12 +2,16 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import com.mes.workstation.entity.UpWorkSequence;
import com.mes.workstation.entity.UpWorkstation;
import com.mes.workstation.mapper.UpWorkstationMapper;
import com.mes.workstation.service.UpWorkstationService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -19,8 +23,10 @@
*/
@Service
@Slf4j
-public class UpWorkstationServiceImpl extends ServiceImpl<UpWorkstationMapper, UpWorkstation> implements UpWorkstationService {
+public class UpWorkstationServiceImpl extends ServiceImpl<UpWorkstationMapper, UpWorkstation> implements UpWorkstationService {
+ @Resource
+ UpPattenUsageMapper upPattenUsageMapper;
public static final String DB_100_10 = "DB_100_10";
//鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
@@ -33,12 +39,17 @@
//鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
+
public UpWorkSequence selectPriority() {
UpWorkSequence upwork= this.baseMapper.selectPriority(1);
- String start = "鍚哥墖淇″彿";//plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
- if(upwork!=null&&start.equals("1")){
+ String start = "1";//plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
+ UpPattenUsage uplist=new UpPattenUsage();
+ if(start.equals("1")){
//鍙戦�佸嚭鐗囦换鍔�
- //plcmes.getPlcParameter("鍑虹墖淇″彿").setValue("1");
+ UpdateWrapper<UpPattenUsage> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("state",1).last("LIMIT 1");
+ uplist= upPattenUsageMapper.selectOne(updateWrapper);
+ log.info("鏌ヨ鍑烘湰娆″嚭鐗囩殑鐜荤拑淇℃伅[]",uplist);
}
return upwork;
}
--
Gitblit v1.8.0