From 09381335e11d32e01c8067b71d897c7064ec279d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 20 五月 2024 14:38:18 +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 | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 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 1e24d13..9949483 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
@@ -3,10 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.common.S7object;
+import com.mes.device.PlcParameterObject;
import com.mes.engineering.entity.Engineering;
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;
@@ -17,7 +18,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
@@ -35,10 +36,11 @@
//鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
+ @Override
public UpPattenUsage selectPriority(Engineering engineering) {
- QueryWrapper<UpPattenUsage> wrapper=new QueryWrapper<>();
+ QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
wrapper.eq("state", 0)
- .eq("engineering_id",engineering.getEngineerId())
+ .eq("engineering_id", engineering.getEngineerId())
.orderByAsc("layout_sequence")
.last("limit 1");
return upPattenUsageMapper.selectOne(wrapper);
@@ -46,7 +48,7 @@
//鍒ゆ柇宸ヤ綅鏄惁鏈夌鍚堟潯浠剁殑鐜荤拑
@Override
- public UpWorkstation selectworkstation(UpPattenUsage upPattenUsage) {
+ public UpWorkstation selectWorkstation(UpPattenUsage upPattenUsage) {
QueryWrapper<UpWorkstation> wrapper = new QueryWrapper<>();
wrapper.eq("pattern_width", upPattenUsage.getWidth())
.eq("pattern_height", upPattenUsage.getHeight())
@@ -59,12 +61,12 @@
}
@Override
- public void reduceWorkstationNumber(UpWorkstation upwork) {
+ public void reduceWorkstationNumber(Integer upworkId) {
UpdateWrapper<UpWorkstation> wrapper = new UpdateWrapper<>();
- wrapper.eq("id", upwork.getWorkstationId())
+ wrapper.eq("id", upworkId)
.setSql("number = number - 1");
boolean updateResult = upWorkstationMapper.update(null, wrapper) > 0;
- log.info("鍑忓皯宸ヤ綅鏁伴噺{}",updateResult);
+ log.info("鍑忓皯宸ヤ綅鏁伴噺{}", updateResult);
}
@@ -74,9 +76,23 @@
@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);
+ }
+ }
}
+ @Override
+ public String updateMesInkageLoad(short inKageWord) {
+ PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+ log.info("淇敼璁惧涓ゆ爧璇锋眰涓簕}锛�0鑱旂嚎锛�1鑱斿姩", inKageWord);
+ S7object.getinstance().plccontrol.WriteWord(plcParameterObject.getPlcParameter("InkageStatus").getAddress(), inKageWord);
+ return "success";
+ }
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0