From 044c32c15ee9ccac6f3b60eb6745025e2f4480f2 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 11 十二月 2024 16:59:54 +0800
Subject: [PATCH] 报工回传+库位显示
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineLoad.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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..eb30a6a 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
@@ -111,7 +111,6 @@
&&"寮�宸�".equals(machine.getState())){
int loadCount=0;
if(machine.getMode()==1){
-
//鏍囧噯妯″紡 鎵惧凡棰嗗彇鏈畬鎴愮殑绗竴鏉′换鍔�
LineConfiguration lineConfiguration=lineConfigurationService.machineLineConfiguration(machine);
List<PrimitiveTask> findPrimitiveTasking=primitiveTaskService.findPrimitiveTasking(machine,lineConfiguration.getLineId());
@@ -119,9 +118,13 @@
//浠诲姟鏁�>宸蹭笂鏁伴噺
List<Tasking> taskingTopList=taskingMapper.selectList(new QueryWrapper<Tasking>().lambda()
.eq(Tasking::getScanId,primitiveTask.getScanId())
+ .eq(Tasking::getState,"绾夸笂")
+ .eq(Tasking::getGlassState,"姝ｅ父")
);
- loadCount=primitiveTask.getTaskQuantity()-taskingTopList.size();
- loadCount=(loadCount>0?loadCount:0);
+ if (primitiveTask.getTaskQuantity()>primitiveTask.getReportCount()){
+ loadCount=primitiveTask.getTaskQuantity()-taskingTopList.size();
+ loadCount=(loadCount>0?loadCount:0);
+ }
break;
}
}else{
--
Gitblit v1.8.0