更新最新代码，上片页面领取任务传递固定值修改为动态获取线路

huang

2025-06-30 935275e79de8415ee3ca0b9a45da548aa6a2ee34

 JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/plcTaskThread/MachineEdging.java

@@ -196,7 +196,7 @@
                    &&"开工".equals(machine.getState())
                    &&taskingCount.size()<machine.getMaxTaskCount())){
                //Machine loadMachine=machineMapper.selectById(2L);
                LineConfiguration lineConfigurationBefore=lineConfigurationService.machineLineConfigurationBefore(machine);
                LineConfiguration lineConfigurationBefore=lineConfigurationService.machineLineConfigurationBeforeEdg(machine);
                Machine loadMachine=machineMapper.selectById(lineConfigurationBefore.getMachineId());
                Tasking tasking;
                String scan_id="";
@@ -280,7 +280,6 @@
        } catch (Exception e) {
            log.info("交互逻辑错误");
        }

        modbusTcp1.close();
        //log.info("无可执行的条件");
    }
@@ -315,11 +314,12 @@
                clientSocket.close();
                return receivedMessage;
            } catch (Exception e) {
                e.printStackTrace();
                log.info("扫码异常");
                //e.printStackTrace();
            }
            clientSocket.close();
        } catch (Exception e) {
            e.printStackTrace();
            log.info("ip或端口异常");
        }
        return "";
    }