#

Junjie

2024-03-27 9eccc25e5f8e764b18a84ad2d08171dd6fabb452

#

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/MotionController.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/MotionController.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.rcs.controller;
package com.zy.asrs.wcs.core.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,8 +8,8 @@
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.rcs.entity.Motion;
import com.zy.asrs.wcs.rcs.service.MotionService;
import com.zy.asrs.wcs.core.entity.Motion;
import com.zy.asrs.wcs.core.service.MotionService;
import com.zy.asrs.wcs.system.controller.BaseController;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/MotionCtgController.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/MotionCtgController.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.rcs.controller;
package com.zy.asrs.wcs.core.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,8 +8,8 @@
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.rcs.entity.MotionCtg;
import com.zy.asrs.wcs.rcs.service.MotionCtgService;
import com.zy.asrs.wcs.core.entity.MotionCtg;
import com.zy.asrs.wcs.core.service.MotionCtgService;
import com.zy.asrs.wcs.system.controller.BaseController;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/MotionStsController.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/controller/MotionStsController.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.rcs.controller;
package com.zy.asrs.wcs.core.controller;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,8 +8,8 @@
import com.zy.asrs.wcs.common.domain.BaseParam;
import com.zy.asrs.wcs.common.domain.KeyValVo;
import com.zy.asrs.wcs.common.domain.PageParam;
import com.zy.asrs.wcs.rcs.entity.MotionSts;
import com.zy.asrs.wcs.rcs.service.MotionStsService;
import com.zy.asrs.wcs.core.entity.MotionSts;
import com.zy.asrs.wcs.core.service.MotionStsService;
import com.zy.asrs.wcs.system.controller.BaseController;
import com.zy.asrs.wcs.utils.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Motion.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/Motion.java
@@ -1,35 +1,21 @@
package com.zy.asrs.wcs.rcs.entity;
package com.zy.asrs.wcs.core.entity;

import java.text.SimpleDateFormat;
import java.util.Date;

import com.zy.asrs.wcs.core.BuildSupport;
import com.zy.asrs.wcs.core.entity.DeviceCtg;
import com.zy.asrs.wcs.core.model.enums.MotionStsType;
import com.zy.asrs.wcs.core.service.DeviceCtgService;
import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
import com.zy.asrs.wcs.rcs.service.MotionCtgService;
import com.zy.asrs.wcs.rcs.service.MotionStsService;
import com.zy.asrs.wcs.core.service.MotionCtgService;
import com.zy.asrs.wcs.core.service.MotionStsService;
import com.zy.asrs.wcs.system.entity.Host;
import com.zy.asrs.wcs.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableLogic;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
@@ -38,7 +24,6 @@
import com.zy.asrs.wcs.system.service.HostService;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("rcs_motion")

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionCtg.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/MotionCtg.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.rcs.entity;
package com.zy.asrs.wcs.core.entity;

import java.text.SimpleDateFormat;
import java.util.Date;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/MotionSts.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/entity/MotionSts.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.rcs.entity;
package com.zy.asrs.wcs.core.entity;

import java.text.SimpleDateFormat;
import java.util.Date;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java

@@ -3,7 +3,6 @@
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.wcs.core.domain.dto.MotionDto;
import com.zy.asrs.wcs.core.entity.Task;
import com.zy.asrs.wcs.core.model.enums.LiftCodeType;
import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
import com.zy.asrs.wcs.core.model.enums.WorkZoneType;
@@ -12,12 +11,10 @@
import com.zy.asrs.wcs.core.utils.ShuttleDispatcher;
import com.zy.asrs.wcs.core.utils.Utils;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
import com.zy.asrs.wcs.rcs.entity.Motion;
import com.zy.asrs.wcs.core.entity.Motion;
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
import com.zy.asrs.wcs.rcs.service.MotionService;
import com.zy.asrs.wcs.rcs.thread.LiftThread;
import com.zy.asrs.wcs.core.service.MotionService;
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java

@@ -3,8 +3,8 @@
import com.zy.asrs.wcs.core.domain.dto.MotionDto;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
import com.zy.asrs.wcs.rcs.entity.Motion;
import com.zy.asrs.wcs.rcs.service.MotionService;
import com.zy.asrs.wcs.core.entity.Motion;
import com.zy.asrs.wcs.core.service.MotionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/AgvCommandService.java

@@ -1,6 +1,6 @@
package com.zy.asrs.wcs.core.kernel.command;

import com.zy.asrs.wcs.rcs.entity.Motion;
import com.zy.asrs.wcs.core.entity.Motion;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/CraneCommandService.java

@@ -1,6 +1,6 @@
package com.zy.asrs.wcs.core.kernel.command;

import com.zy.asrs.wcs.rcs.entity.Motion;
import com.zy.asrs.wcs.core.entity.Motion;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java

@@ -14,11 +14,11 @@
import com.zy.asrs.wcs.core.utils.*;
import com.zy.asrs.wcs.rcs.News;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
import com.zy.asrs.wcs.rcs.entity.Motion;
import com.zy.asrs.wcs.core.entity.Motion;
import com.zy.asrs.wcs.rcs.model.enums.ShuttleProtocolStatusType;
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
import com.zy.asrs.wcs.rcs.service.MotionService;
import com.zy.asrs.wcs.core.service.MotionService;
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/MotionCtgMapper.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/mapper/MotionCtgMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.wcs.rcs.mapper;
package com.zy.asrs.wcs.core.mapper;

import com.zy.asrs.wcs.rcs.entity.MotionCtg;
import com.zy.asrs.wcs.core.entity.MotionCtg;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/MotionMapper.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/mapper/MotionMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.wcs.rcs.mapper;
package com.zy.asrs.wcs.core.mapper;

import com.zy.asrs.wcs.rcs.entity.Motion;
import com.zy.asrs.wcs.core.entity.Motion;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/mapper/MotionStsMapper.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/mapper/MotionStsMapper.java
@@ -1,6 +1,6 @@
package com.zy.asrs.wcs.rcs.mapper;
package com.zy.asrs.wcs.core.mapper;

import com.zy.asrs.wcs.rcs.entity.MotionSts;
import com.zy.asrs.wcs.core.entity.MotionSts;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/MotionCtgType.java

@@ -2,8 +2,8 @@

import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.rcs.entity.MotionCtg;
import com.zy.asrs.wcs.rcs.service.MotionCtgService;
import com.zy.asrs.wcs.core.entity.MotionCtg;
import com.zy.asrs.wcs.core.service.MotionCtgService;

import static com.zy.asrs.wcs.core.model.enums.DeviceCtgType.*;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/MotionStsType.java

@@ -3,8 +3,8 @@

import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.rcs.entity.MotionSts;
import com.zy.asrs.wcs.rcs.service.MotionStsService;
import com.zy.asrs.wcs.core.entity.MotionSts;
import com.zy.asrs.wcs.core.service.MotionStsService;

public enum MotionStsType {


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/MotionCtgService.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/MotionCtgService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.wcs.rcs.service;
package com.zy.asrs.wcs.core.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wcs.rcs.entity.MotionCtg;
import com.zy.asrs.wcs.core.entity.MotionCtg;

public interface MotionCtgService extends IService<MotionCtg> {


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/MotionService.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/MotionService.java
@@ -1,8 +1,8 @@
package com.zy.asrs.wcs.rcs.service;
package com.zy.asrs.wcs.core.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
import com.zy.asrs.wcs.rcs.entity.Motion;
import com.zy.asrs.wcs.core.entity.Motion;

import java.util.List;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/MotionStsService.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/MotionStsService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.wcs.rcs.service;
package com.zy.asrs.wcs.core.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.wcs.rcs.entity.MotionSts;
import com.zy.asrs.wcs.core.entity.MotionSts;

public interface MotionStsService extends IService<MotionSts> {


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java

@@ -5,8 +5,8 @@
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
import com.zy.asrs.wcs.core.service.TaskService;
import com.zy.asrs.wcs.rcs.News;
import com.zy.asrs.wcs.rcs.entity.Motion;
import com.zy.asrs.wcs.rcs.service.MotionService;
import com.zy.asrs.wcs.core.entity.Motion;
import com.zy.asrs.wcs.core.service.MotionService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionCtgServiceImpl.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/impl/MotionCtgServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.wcs.rcs.service.impl;
package com.zy.asrs.wcs.core.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.wcs.rcs.mapper.MotionCtgMapper;
import com.zy.asrs.wcs.rcs.entity.MotionCtg;
import com.zy.asrs.wcs.rcs.service.MotionCtgService;
import com.zy.asrs.wcs.core.mapper.MotionCtgMapper;
import com.zy.asrs.wcs.core.entity.MotionCtg;
import com.zy.asrs.wcs.core.service.MotionCtgService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionServiceImpl.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/impl/MotionServiceImpl.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wcs.rcs.service.impl;
package com.zy.asrs.wcs.core.service.impl;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -6,11 +6,11 @@
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
import com.zy.asrs.wcs.core.model.enums.MotionStsType;
import com.zy.asrs.wcs.core.service.DeviceCtgService;
import com.zy.asrs.wcs.rcs.mapper.MotionMapper;
import com.zy.asrs.wcs.rcs.entity.Motion;
import com.zy.asrs.wcs.rcs.service.MotionService;
import com.zy.asrs.wcs.core.mapper.MotionMapper;
import com.zy.asrs.wcs.core.entity.Motion;
import com.zy.asrs.wcs.core.service.MotionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.wcs.rcs.service.MotionStsService;
import com.zy.asrs.wcs.core.service.MotionStsService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MotionStsServiceImpl.java

File was renamed from zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/service/impl/MotionStsServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.wcs.rcs.service.impl;
package com.zy.asrs.wcs.core.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.wcs.rcs.mapper.MotionStsMapper;
import com.zy.asrs.wcs.rcs.entity.MotionSts;
import com.zy.asrs.wcs.rcs.service.MotionStsService;
import com.zy.asrs.wcs.core.mapper.MotionStsMapper;
import com.zy.asrs.wcs.core.entity.MotionSts;
import com.zy.asrs.wcs.core.service.MotionStsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/TaskServiceImpl.java

@@ -7,7 +7,7 @@
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
import com.zy.asrs.wcs.core.service.TaskService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.wcs.rcs.service.MotionService;
import com.zy.asrs.wcs.core.service.MotionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/DeviceTimer.java

New file
@@ -0,0 +1,31 @@
package com.zy.asrs.wcs.core.timer;

import com.zy.asrs.wcs.core.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

@Slf4j
@Component
public class DeviceTimer {

    @Autowired
    private RedisUtil redisUtil;

    @Scheduled(cron = "0/1 * * * * ? ")
    public synchronized void executeShuttle() {

    }

    @Scheduled(cron = "0/1 * * * * ? ")
    public synchronized void executeLift() {

    }

    @Scheduled(cron = "0/1 * * * * ? ")
    public synchronized void executeConveyor() {

    }

}

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/MotionTimer.java

@@ -10,8 +10,8 @@
import com.zy.asrs.wcs.core.model.enums.MotionStsType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
import com.zy.asrs.wcs.core.service.TaskService;
import com.zy.asrs.wcs.rcs.entity.Motion;
import com.zy.asrs.wcs.rcs.service.MotionService;
import com.zy.asrs.wcs.core.entity.Motion;
import com.zy.asrs.wcs.core.service.MotionService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java

@@ -1,8 +1,6 @@
package com.zy.asrs.wcs.core.utils;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.wms.service.CommonService;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SnowflakeIdWorker;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.core.entity.Task;
@@ -18,12 +16,11 @@
import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
import com.zy.asrs.wcs.rcs.service.DeviceService;
import com.zy.asrs.wcs.rcs.service.DeviceTypeService;
import com.zy.asrs.wcs.rcs.service.MotionService;
import com.zy.asrs.wcs.core.service.MotionService;
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.List;

/**

 zy-asrs-wcs/src/main/resources/mapper/core/MotionCtgMapper.xml

File was renamed from zy-asrs-wcs/src/main/resources/mapper/rcs/MotionCtgMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.wcs.rcs.mapper.MotionCtgMapper">
<mapper namespace="com.zy.asrs.wcs.core.mapper.MotionCtgMapper">

</mapper>

 zy-asrs-wcs/src/main/resources/mapper/core/MotionMapper.xml

File was renamed from zy-asrs-wcs/src/main/resources/mapper/rcs/MotionMapper.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.wcs.rcs.mapper.MotionMapper">
<mapper namespace="com.zy.asrs.wcs.core.mapper.MotionMapper">

    <select id="selectOfTop1" resultType="com.zy.asrs.wcs.rcs.entity.Motion">
    <select id="selectOfTop1" resultType="com.zy.asrs.wcs.core.entity.Motion">
        select * from rcs_motion
        where 1=1
        and uuid = #{uuid}
@@ -11,7 +11,7 @@
        limit 0,1
    </select>

    <select id="selectOfNext" resultType="com.zy.asrs.wcs.rcs.entity.Motion">
    <select id="selectOfNext" resultType="com.zy.asrs.wcs.core.entity.Motion">
        select * from rcs_motion
        where 1=1
        and uuid = #{uuid}

 zy-asrs-wcs/src/main/resources/mapper/core/MotionStsMapper.xml

copy from zy-asrs-wcs/src/main/resources/mapper/rcs/MotionCtgMapper.xml
copy to zy-asrs-wcs/src/main/resources/mapper/core/MotionStsMapper.xml
File was copied from zy-asrs-wcs/src/main/resources/mapper/rcs/MotionCtgMapper.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.wcs.rcs.mapper.MotionCtgMapper">
<mapper namespace="com.zy.asrs.wcs.core.mapper.MotionStsMapper">

</mapper>

 zy-asrs-wcs/src/main/resources/mapper/rcs/MotionStsMapper.xml

File was deleted