报工回传+库位显示

严智鑫

2024-12-11 044c32c15ee9ccac6f3b60eb6745025e2f4480f2

 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{