From f68d3c71819feb59e7a227a5d992b059b900916c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 28 三月 2025 08:28:26 +0800
Subject: [PATCH] 修改报表，界面添加查询流程卡个数，调整推送数据到前端的间隔
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java | 109 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 71 insertions(+), 38 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 9639aa5..ec327ab 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,68 +1,101 @@
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.workstation.entity.UpWorkSequence;
+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.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>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
* @since 2024-04-07
*/
@Service
+@Slf4j
+
public class UpWorkstationServiceImpl extends ServiceImpl<UpWorkstationMapper, UpWorkstation> implements UpWorkstationService {
+ @Resource
+ UpPattenUsageMapper upPattenUsageMapper;
+ @Resource
+ UpWorkstationMapper upWorkstationMapper;
- public static final String DB_100_10 = "DB_100_10";
- //鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
- public boolean isCanLoadGlass() {
- String loadstart="鍚哥墖淇″彿";//plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
- return "1".equals(loadstart);
-
- }
//鍒ゆ柇浼樺厛鍚哥墖浣嶇疆鍚庡彂閫佸嚭鐗囦换鍔�
- public void selectPriority() {
- //todo:鍒ゆ柇鏄惁鍙互鍚哥墖杩涜浠诲姟
-// String loadstart="鍚哥墖淇″彿";//plcmes.getPlcParameter("鍚哥墖淇″彿").getValue();
-// if (!"1".equals(loadstart)) {
-// return;
-// }
- UpWorkSequence loadid1 = this.baseMapper.selectPriority(1).get(0);
- UpWorkSequence loadid2 = this.baseMapper.selectPriority(2).get(0);
- //鍒ゆ柇涓�浜屽彿宸ヤ綅鍝竟鐨勯『搴忔洿鍏�
-// if(loadid1.getSequence()>loadid2.getSequence()) {
-// S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2);
-// }else if(loadid1.getSequence()==loadid2.getSequence()){
-// //褰撲袱涓伐浣嶄笂鐨勭幓鐠冩暟鐩稿悓鏃讹紝鍒ゆ柇鍝釜宸ヤ綅涓婄殑鐜荤拑鏁版洿灏�,浼樺厛娓呯┖涓�涓灦瀛�
-// int glassnum1=loadid1.getNumber();//Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
-// int glassnum2=loadid2.getNumber();//Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
-// if(glassnum1>glassnum2){
-// S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)2);
-// }else{
-// S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1);
-// }
-// }else{
-// S7object.getinstance().plccontrol.WriteWord(DB_100_10, (short)1);
-// }
+
+ @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) {
+ public Boolean updateGlassMessage(UpWorkstation upwork) {
+ int update = 0;
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());
+ update = this.baseMapper.update(upwork, updateWrapper);
+ } else {
+ if (upwork.getPatternHeight() > 2700 || upwork.getPatternHeight() == 0) {
+ updateWrapper.eq("workstation_id", upwork.getWorkstationId());
+ update = this.baseMapper.update(upwork, updateWrapper);
+ }
+ }
+ return update>0;
}
-}
+ @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