冲突方法改名

严智鑫

2024-09-11 916f102b39d6f2e1ce591fd5cdd4204ee6ec9ab0

冲突方法改名

 JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java

@@ -34,7 +34,7 @@
            glass.setWorkState("工作");
            glass.setCurrentCraft("磨边");
            glass.setState("线上");
            Tasking tasking =taskingService.selectTaskLoad(glass);
            Tasking tasking =taskingService.selectTasking(glass);
            //发送长宽厚尺寸
            S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("length").getAddress(), Integer.parseInt(tasking.getLength().toString()));
            S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("width").getAddress(), Integer.parseInt(tasking.getWidth().toString()));

 JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/TaskingService.java

@@ -43,7 +43,7 @@
     * 根据不同工艺查询即将上片的数据
     * @return List<Tasking>
     */
    Tasking selectTaskLoad(Tasking tasking);
    Tasking selectTasking(Tasking tasking);
    /**
     * 根据标准模式的任务顺序获取玻璃数据
     * @return List<Tasking>

 JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/TaskingServiceImpl.java

@@ -40,6 +40,10 @@

    }

    /**
     * @param state
     * @return
     */
    @Override
    public boolean updateLoadState(Integer state) {
        //更改联机状态
@@ -108,9 +112,9 @@
    }

    @Override
    public Tasking selectTaskLoad(Tasking tasking) {
    public Tasking selectTasking(Tasking tasking) {
        QueryWrapper<Tasking> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("current_craft",tasking.getGlassId())
        queryWrapper.eq("current_craft",tasking.getCurrentCraft())
                .eq("state",tasking.getState())
                .eq("work_state",tasking.getWorkState())
                .orderByAsc("glass_id");