From 67cbfd8f7c2ed9598eef92470313f3cf31028ea1 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 11 三月 2025 08:39:33 +0800
Subject: [PATCH] 2.13-3-7号 现场标注线调试更改
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLoad.java | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 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 cc0b073..d72f449 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
@@ -34,10 +34,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 +47,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");
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 +100,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));
@@ -115,21 +128,18 @@
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())
- .eq(Tasking::getState,"绾夸笂")
- .eq(Tasking::getGlassState,"姝ｅ父")
- );
- if (primitiveTask.getTaskQuantity()>primitiveTask.getReportCount()){
- 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);
--
Gitblit v1.8.0