From 935275e79de8415ee3ca0b9a45da548aa6a2ee34 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 30 六月 2025 08:21:36 +0800
Subject: [PATCH] 更新最新代码，上片页面领取任务传递固定值修改为动态获取线路
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLoad.java | 58 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLoad.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLoad.java
index bc23ffb..0234a10 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLoad.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLoad.java
@@ -1,10 +1,8 @@
package com.mes.plcTaskThread;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mes.md.entity.LineConfiguration;
import com.mes.md.entity.Machine;
import com.mes.md.entity.PrimitiveTask;
-import com.mes.md.entity.Tasking;
import com.mes.md.mapper.MachineMapper;
import com.mes.md.mapper.PrimitiveTaskMapper;
import com.mes.md.mapper.TaskingMapper;
@@ -17,8 +15,9 @@
import com.mes.utils.HexUtil;
import lombok.extern.slf4j.Slf4j;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
@Slf4j
public class MachineLoad extends Thread{
@@ -34,10 +33,12 @@
PrimitiveTaskMapper primitiveTaskMapper;
LineConfigurationService lineConfigurationService;
-
- public Long machineId = 2L;
+ public Machine thisMachine;
+ //public Long machineId = 2L;
public List<Map> sendRecords = new ArrayList<>();
- public MachineLoad(TaskingMapper taskingMapper, MachineMapper machineMapper, TaskingService taskingService, PrimitiveTaskService primitiveTaskService, LineConfigurationService lineConfigurationService){
+ public MachineLoad(Machine machine,PrimitiveTaskMapper primitiveTaskMapper,TaskingMapper taskingMapper, MachineMapper machineMapper, TaskingService taskingService, PrimitiveTaskService primitiveTaskService, LineConfigurationService lineConfigurationService){
+ this.thisMachine = machine;
+ this.primitiveTaskMapper = primitiveTaskMapper;
this.taskingMapper = taskingMapper;
this.machineMapper = machineMapper;
this.taskingService = taskingService;
@@ -45,15 +46,23 @@
this.lineConfigurationService = lineConfigurationService;
}
public void plcStart() {
- Machine machine=machineMapper.selectById(machineId);
- ModbusTcp modbusTcp1 =new ModbusTcp(machine.getIp(),machine.getPort(),"PlcLoad");
+ Machine machine=machineMapper.selectById(thisMachine.getId());
+ ModbusTcp modbusTcp1 =new ModbusTcp(machine.getIp(),machine.getPort(),machine.getFileName());
modbusTcp1.connect();
- PlcAgreement plcAgreement=modbusTcp1.getPlcAgreement("PlcLoad");
+ PlcAgreement plcAgreement=modbusTcp1.getPlcAgreement(machine.getFileName());
try {
if(!modbusTcp1.read(plcAgreement)){
log.info("閫氳璇诲彇鏂版暟鎹け璐�");
+ if(!"鍏虫満".equals(machine.getStatePowerOn())){
+ machine.setStatePowerOn("鍏虫満");
+ machineMapper.updateById(machine);
+ }
modbusTcp1.close();
return;
+ }
+ if(!"寮�鏈�".equals(machine.getStatePowerOn())){
+ machine.setStatePowerOn("寮�鏈�");
+ machineMapper.updateById(machine);
}
PlcParameter plcRequest =plcAgreement.getPlcParameter("plcRequest");//璇锋眰瀛�
PlcParameter mesSend =plcAgreement.getPlcParameter("mesSend");//鍙戦�佸瓧
@@ -90,10 +99,13 @@
LineConfiguration lineConfiguration=lineConfigurationService.machineLineConfiguration(machine);
List<PrimitiveTask> findPrimitiveTasking=primitiveTaskService.findPrimitiveTasking(machine,lineConfiguration.getLineId());
for(PrimitiveTask primitiveTask:findPrimitiveTasking){
- primitiveTask.setReportCount(primitiveTask.getReportCount()+plcReportID.getValueInt());
+ primitiveTask.setLoadCount(primitiveTask.getLoadCount()+1);
primitiveTaskMapper.updateById(primitiveTask);
break;
}
+ }else if(machine.getMode()==3){
+ machine.setFinshCount(machine.getFinshCount()+plcReportID.getValueInt());
+ machineMapper.updateById(machine);
}
String send = HexUtil.intTo2ByteHex(1);
modbusTcp1.writeString(send, HexUtil.intTo2ByteHex(mesConfirm.getAddressStart()/ 2));
@@ -111,22 +123,22 @@
&&"寮�宸�".equals(machine.getState())){
int loadCount=0;
if(machine.getMode()==1){
-
//鏍囧噯妯″紡 鎵惧凡棰嗗彇鏈畬鎴愮殑绗竴鏉′换鍔�
LineConfiguration lineConfiguration=lineConfigurationService.machineLineConfiguration(machine);
List<PrimitiveTask> findPrimitiveTasking=primitiveTaskService.findPrimitiveTasking(machine,lineConfiguration.getLineId());
for(PrimitiveTask primitiveTask:findPrimitiveTasking){
- //浠诲姟鏁�>宸蹭笂鏁伴噺
- List<Tasking> taskingTopList=taskingMapper.selectList(new QueryWrapper<Tasking>().lambda()
- .eq(Tasking::getScanId,primitiveTask.getScanId())
- );
- loadCount=primitiveTask.getTaskQuantity()-taskingTopList.size();
- loadCount=(loadCount>0?loadCount:0);
+ //浠诲姟鏁�-宸蹭笂鏁伴噺>0 杩斿洖1
+ if((primitiveTask.getTaskQuantity()-primitiveTask.getLoadCount())>0){
+ loadCount=1;
+ }
break;
}
- }else{
+ }else if(machine.getMode()==2){
//瀹氬埗妯″紡
loadCount=1;
+ }else if (machine.getMode()==3){
+ loadCount=machine.getTaskCount()-machine.getFinshCount();
+ loadCount=(loadCount>0?1:0);
}
if(loadCount>0){
log.info("4銆佸彂閫佷换鍔� 浠诲姟鏁版嵁锛歿}, 璁惧鐘舵��:{}, ",loadCount,machine);
@@ -134,14 +146,6 @@
modbusTcp1.writeString(send,HexUtil.intTo2ByteHex(mesSend.getAddressStart()/2));
log.info("鍙戦�佷换鍔″彂閫佹姤鏂囧唴瀹癸細{},鍙戦�佽捣濮嬪湴鍧�:{}",send,HexUtil.intTo2ByteHex(mesSend.getAddressStart()/2));
modbusTcp1.close();
- SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- String sendRecord=df.format(new Date())+" "+"1 "+ loadCount;
- if (sendRecords.size()>7){
- sendRecords.remove(0);
- }
- Map sendContentMap=new HashMap();
- sendContentMap.put("sendContent",sendRecord);
- sendRecords.add(sendContentMap);
return;
}
}
--
Gitblit v1.8.0