From 06fd17d2a1c0155e6432b2bce7e644a119fc77b5 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 05 六月 2024 08:25:03 +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 | 84 ++++++++++++++++++++++++++++-------------
1 files changed, 57 insertions(+), 27 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 ffd6491..b7d08c2 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
@@ -1,10 +1,13 @@
package com.mes.workstation.service.impl;
+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;
@@ -15,7 +18,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
@@ -27,43 +30,70 @@
public class UpWorkstationServiceImpl extends ServiceImpl<UpWorkstationMapper, UpWorkstation> implements UpWorkstationService {
@Resource
UpPattenUsageMapper upPattenUsageMapper;
- public static final String DB_100_10 = "DB_100_10";
-
- //鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
- public boolean isCanLoadGlass() {
- String loadstart = "鍚哥墖淇″彿";//plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
- return "1".equals(loadstart);
-
- }
- //鏄剧ず姝ｅ湪杩涜浠诲姟鐨勫伐绋嬩俊鎭�
+ @Resource
+ UpWorkstationMapper upWorkstationMapper;
//鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
- public UpWorkSequence selectPriority() {
- UpWorkSequence upwork= this.baseMapper.selectPriority(1);
- String start = "1";//plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
- UpPattenUsage uplist=new UpPattenUsage();
- if(start.equals("1")){
- //鍙戦�佸嚭鐗囦换鍔�
- UpdateWrapper<UpPattenUsage> updateWrapper = new UpdateWrapper<>();
- updateWrapper.eq("state",1).last("LIMIT 1");
- uplist= upPattenUsageMapper.selectOne(updateWrapper);
- log.info("鏌ヨ鍑烘湰娆″嚭鐗囩殑鐜荤拑淇℃伅[]",uplist);
- }
- return upwork;
+ @Override
+ public UpPattenUsage selectPriority(Engineering engineering) {
+ QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
+ wrapper.eq("state", 0)
+ .eq("engineering_id", engineering.getEngineerId())
+ .orderByAsc("layout_sequence")
+ .last("limit 1");
+ return upPattenUsageMapper.selectOne(wrapper);
+ }
+
+ //鍒ゆ柇宸ヤ綅鏄惁鏈夌鍚堟潯浠剁殑鐜荤拑
+ @Override
+ public UpWorkstation selectWorkstation(UpPattenUsage upPattenUsage) {
+ QueryWrapper<UpWorkstation> wrapper = new QueryWrapper<>();
+ wrapper.eq("pattern_width", upPattenUsage.getWidth())
+ .eq("pattern_height", upPattenUsage.getHeight())
+ .eq("pattern_thickness", upPattenUsage.getThickness())
+ .eq("films_id", upPattenUsage.getFilmsId())
+ .gt("number", 0)
+ .orderByAsc("number")
+ .last("limit 1");
+ return this.baseMapper.selectOne(wrapper);
+ }
+
+ @Override
+ public void reduceWorkstationNumber(Integer upworkId) {
+ UpdateWrapper<UpWorkstation> wrapper = new UpdateWrapper<>();
+ wrapper.eq("id", upworkId)
+ .setSql("number = number - 1");
+ boolean updateResult = upWorkstationMapper.update(null, wrapper) > 0;
+ log.info("鍑忓皯宸ヤ綅鏁伴噺{}", updateResult);
+
}
/**
* 澧炲姞浜哄伐杈撳叆鐨勫伐浣嶇幓鐠冧俊鎭�/鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
- * @param upwork
*/
@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);
+ //璇诲彇plc鐨勫��
+ return plcParameterObject.getPlcParameter("InkageStatus").getValue();
+ }
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0