冲突方法改名

严智鑫

2024-09-11 916f102b39d6f2e1ce591fd5cdd4204ee6ec9ab0

 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");