From 979f95e192e306bf8ae6552415d20c57015baab4 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 22 十月 2025 13:59:05 +0800
Subject: [PATCH] 优化：短连接+抛异常 防止异常导致端口占用 无法连接设备
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java
index 15f267f..20e6294 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java
@@ -238,6 +238,7 @@
.eq(Tasking::getScanId,scan_id)
.eq(Tasking::getGlassState,"姝ｅ父")
.eq(Tasking::getState,"绾夸笂")
+ .ne(Tasking::getWorkState,"瀹屽伐")
.le(LineConfiguration::getProcessSequence,machineLineConfiguration.get(0).getProcessSequence())
.orderByAsc(Tasking::getTaskSequence));
if(!list.isEmpty()){
@@ -325,11 +326,12 @@
@Override
public int finishMachineTask(Machine machine) {
List<Tasking> list=this.findMachineWorkStateTask(machine,"姝ｅ湪宸ヤ綔");
- //褰撳墠璁惧鐨勭嚎璺厤缃�
+ //鏌ヨ褰撳墠璁惧绾胯矾閰嶇疆
List<LineConfiguration> machineLineConfiguration=lineConfigurationMapper.selectJoinList(LineConfiguration.class,new MPJLambdaWrapper<LineConfiguration>()
.selectAll(LineConfiguration.class)
.eq(LineConfiguration::getMachineId,machine.getId()));
if(!machineLineConfiguration.isEmpty()){
+ //褰撳墠璁惧瀛樺湪绾胯矾閰嶇疆锛屾煡璇㈠綋鍓嶈澶� 鍦ㄧ嚎璺厤缃〃涓殑涓嬩竴璁惧
List<LineConfiguration> listLineConfiguration=lineConfigurationMapper.selectJoinList(LineConfiguration.class,new MPJLambdaWrapper<LineConfiguration>()
.selectAll(LineConfiguration.class)
.eq(LineConfiguration::getLineId,machineLineConfiguration.get(0).getLineId())
@@ -338,12 +340,16 @@
.orderByAsc(LineConfiguration::getProcessSequence)
.orderByAsc(LineConfiguration::getPrioritySequence)
);
+
if(!list.isEmpty()){
+ //鏍囪浠诲姟鐘舵��
Tasking tasking=list.get(0);
LineConfiguration thisLineConfiguration=lineConfigurationMapper.selectById(tasking.getLineConfigurationId());
tasking.setOperationRecord(thisLineConfiguration.getRemark()+thisLineConfiguration.getLineId());
tasking.setOperationRecordTime(new Date());
tasking.setOperationMode("缁撴潫");
+ //listLineConfiguration涓嶆槸绌�,琛ㄧず褰撳墠璁惧閰嶇疆鍏崇郴涓湁涓嬩竴璁惧
+ // 鍚﹀垯琛ㄧず鏃犱笅涓�宸ュ簭锛屽嵆褰撳墠宸ュ簭涓烘渶鍚庝竴宸ュ簭 鏍囪鐘舵�佸畬宸�
if (!listLineConfiguration.isEmpty()){
tasking.setLineConfigurationId(listLineConfiguration.get(0).getId());
tasking.setWorkState("绛夊緟");
@@ -352,7 +358,6 @@
else{
tasking.setWorkState("瀹屽伐");
return baseMapper.updateById(tasking);
- //return this.stopTasking(tasking);
}
}
@@ -463,6 +468,11 @@
return resultCount;
}
+ @Override
+ public int deleteGlassDownLine() {
+ return baseMapper.delete(new QueryWrapper<Tasking>().lambda().eq(Tasking::getState,"绾夸笅"));
+ }
+
/**
* @param taskingList
* 鎵归噺淇敼鐘舵�� 銆愪笂绾裤��
--
Gitblit v1.8.0