目录重构

pang.jiabao

2024-04-22 32b905ac1f907fd0f58784acd8f609e691b2ea6e

目录重构

 pom.xml

@@ -185,7 +185,7 @@
    </dependencies>

    <build>
        <finalName>ykwcs</finalName>
        <finalName>wcs</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

 src/main/java/com/zy/Boot.java

@@ -1,6 +1,6 @@
package com.zy;

import com.zy.common.utils.RandomValidateCodeUtil;
import com.zy.utils.RandomValidateCodeUtil;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;

 src/main/java/com/zy/asrs/service/MainService.java

File was deleted

 src/main/java/com/zy/common/service/CommonService.java

@@ -6,14 +6,14 @@
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.entity.*;
import com.zy.service.*;
import com.zy.utils.Utils;
import com.zy.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import com.zy.common.utils.News;
import com.zy.utils.News;
import com.zy.core.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

 src/main/java/com/zy/common/service/WmsService.java

@@ -1,8 +1,8 @@
package com.zy.common.service;

import com.alibaba.fastjson.JSON;
import com.zy.asrs.entity.WaitPakin;
import com.zy.common.utils.HttpHandler;
import com.zy.entity.WaitPakin;
import com.zy.utils.HttpHandler;
import com.zy.core.properties.SystemProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

 src/main/java/com/zy/common/web/AuthController.java

@@ -8,9 +8,9 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.common.CodeRes;
import com.zy.common.entity.Parameter;
import com.zy.entity.Parameter;
import com.zy.common.model.PowerDto;
import com.zy.common.utils.RandomValidateCodeUtil;
import com.zy.utils.RandomValidateCodeUtil;
import com.zy.system.entity.*;
import com.zy.system.service.*;
import org.springframework.beans.factory.annotation.Autowired;

 src/main/java/com/zy/common/web/FileController.java

@@ -2,9 +2,9 @@

import com.alibaba.excel.EasyExcel;
import com.core.common.R;
import com.zy.common.utils.excel.EnInitData;
import com.zy.common.utils.excel.EnInitDataListener;
import com.zy.common.utils.excel.ExcelUtils;
import com.zy.utils.excel.EnInitData;
import com.zy.utils.excel.EnInitDataListener;
import com.zy.utils.excel.ExcelUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;

 src/main/java/com/zy/config/AdminInterceptor.java

File was renamed from src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -1,10 +1,10 @@
package com.zy.common.config;
package com.zy.config;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.zy.common.utils.Http;
import com.zy.utils.Http;
import com.zy.system.entity.Permission;
import com.zy.system.entity.RolePermission;
import com.zy.system.entity.User;

 src/main/java/com/zy/config/CoolExceptionHandler.java

File was renamed from src/main/java/com/zy/common/config/CoolExceptionHandler.java
@@ -1,4 +1,4 @@
package com.zy.common.config;
package com.zy.config;

import com.core.common.R;
import com.core.exception.CoolException;

 src/main/java/com/zy/config/RedisConfig.java

File was renamed from src/main/java/com/zy/common/config/RedisConfig.java
@@ -1,4 +1,4 @@
package com.zy.common.config;
package com.zy.config;

import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.PropertyAccessor;

 src/main/java/com/zy/config/WebConfig.java

File was renamed from src/main/java/com/zy/common/config/WebConfig.java
@@ -1,4 +1,4 @@
package com.zy.common.config;
package com.zy.config;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;

 src/main/java/com/zy/controller/ConsoleController.java

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

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -8,23 +8,22 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.BasCrnError;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.BasRgvService;
import com.zy.asrs.service.WrkMastService;
import com.zy.enums.CrnStatusType;
import com.zy.enums.SiteStatusType;
import com.zy.entity.param.SystemSwitchParam;
import com.zy.entity.vo.*;
import com.zy.entity.BasCrnError;
import com.zy.entity.BasDevp;
import com.zy.entity.BasRgv;
import com.zy.entity.WrkMast;
import com.zy.mapper.BasCrnErrorMapper;
import com.zy.mapper.LocMastMapper;
import com.zy.service.BasDevpService;
import com.zy.service.BasRgvService;
import com.zy.service.WrkMastService;
import com.zy.common.CodeRes;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.RgvThread2;
import com.zy.core.Slave;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -32,9 +31,7 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.RgvSlave;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;

 src/main/java/com/zy/controller/CrnController.java

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

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -6,22 +6,21 @@
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.param.CrnDemoParam;
import com.zy.asrs.domain.param.CrnOperatorParam;
import com.zy.asrs.domain.vo.CommandLogVo;
import com.zy.asrs.domain.vo.CrnMsgTableVo;
import com.zy.asrs.domain.vo.CrnStateTableVo;
import com.zy.asrs.entity.BasCrnError;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.asrs.utils.VersionUtils;
import com.zy.enums.CrnStatusType;
import com.zy.entity.param.CrnDemoParam;
import com.zy.entity.param.CrnOperatorParam;
import com.zy.entity.vo.CommandLogVo;
import com.zy.entity.vo.CrnMsgTableVo;
import com.zy.entity.vo.CrnStateTableVo;
import com.zy.entity.BasCrnError;
import com.zy.entity.BasCrnp;
import com.zy.entity.LocMast;
import com.zy.entity.WrkMast;
import com.zy.mapper.BasCrnErrorMapper;
import com.zy.service.BasCrnpService;
import com.zy.service.LocMastService;
import com.zy.service.WrkMastService;
import com.zy.service.impl.MainServiceImpl;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;

 src/main/java/com/zy/controller/MonitorController.java

File was renamed from src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -1,12 +1,12 @@
package com.zy.asrs.controller;
package com.zy.controller;

import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.domain.dto.AxisBean;
import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.entity.dto.AxisBean;
import com.zy.entity.dto.WorkChartAxis;
import com.zy.entity.vo.LocChartPie;
import com.zy.mapper.ReportQueryMapper;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;

 src/main/java/com/zy/controller/NewsController.java

File was renamed from src/main/java/com/zy/asrs/controller/NewsController.java
@@ -1,7 +1,7 @@
package com.zy.asrs.controller;
package com.zy.controller;

import com.core.common.R;
import com.zy.common.utils.News;
import com.zy.utils.News;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

 src/main/java/com/zy/controller/RgvController.java

File was renamed from src/main/java/com/zy/asrs/controller/RgvController.java
@@ -1,21 +1,21 @@
package com.zy.asrs.controller;
package com.zy.controller;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.RgvStatusType;
import com.zy.asrs.domain.param.RgvOperatorParam;
import com.zy.asrs.domain.vo.RgvMsgTableVo;
import com.zy.asrs.domain.vo.RgvStateTableVo;
import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.entity.BasRgvErr;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasRgvErrMapper;
import com.zy.asrs.service.BasRgvService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.enums.RgvStatusType;
import com.zy.entity.param.RgvOperatorParam;
import com.zy.entity.vo.RgvMsgTableVo;
import com.zy.entity.vo.RgvStateTableVo;
import com.zy.entity.BasRgv;
import com.zy.entity.BasRgvErr;
import com.zy.entity.WrkMast;
import com.zy.mapper.BasRgvErrMapper;
import com.zy.service.BasRgvService;
import com.zy.service.LocMastService;
import com.zy.service.WrkMastService;
import com.zy.service.impl.MainServiceImpl;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;

 src/main/java/com/zy/controller/SiteController.java

File was renamed from src/main/java/com/zy/asrs/controller/SiteController.java
@@ -1,15 +1,14 @@
package com.zy.asrs.controller;
package com.zy.controller;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.domain.vo.PlcErrorTableVo;
import com.zy.asrs.domain.vo.SiteTableVo;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.BasRgvService;
import com.zy.entity.vo.PlcErrorTableVo;
import com.zy.entity.vo.SiteTableVo;
import com.zy.entity.BasDevp;
import com.zy.service.BasDevpService;
import com.zy.service.BasRgvService;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;

 src/main/java/com/zy/core/MainProcess.java

@@ -1,15 +1,13 @@
package com.zy.core;

import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.service.impl.MainServiceImpl;
import com.zy.core.properties.SystemProperties;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

import javax.annotation.PreDestroy;
import java.util.ArrayList;

/**
 * WCS主流程

 src/main/java/com/zy/core/ServerBootstrap.java

@@ -1,6 +1,6 @@
package com.zy.core;

import com.zy.common.utils.News;
import com.zy.utils.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
@@ -13,7 +13,6 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import javax.annotation.PostConstruct;

 src/main/java/com/zy/core/model/protocol/CrnProtocol.java

@@ -1,6 +1,6 @@
package com.zy.core.model.protocol;

import com.zy.asrs.entity.BasCrnp;
import com.zy.entity.BasCrnp;
import com.zy.core.enums.CrnForkPosType;
import com.zy.core.enums.CrnLiftPosType;
import com.zy.core.enums.CrnModeType;

 src/main/java/com/zy/core/model/protocol/RgvProtocol.java

@@ -1,6 +1,6 @@
package com.zy.core.model.protocol;

import com.zy.asrs.entity.BasRgv;
import com.zy.entity.BasRgv;
import com.zy.core.enums.RgvModeType;
import com.zy.core.enums.RgvStatusType;
import lombok.Data;

 src/main/java/com/zy/core/model/protocol/StaProtocol.java

@@ -1,6 +1,6 @@
package com.zy.core.model.protocol;

import com.zy.asrs.entity.BasDevp;
import com.zy.entity.BasDevp;
import lombok.Data;

/**

 src/main/java/com/zy/core/netty/OnlineServer.java

@@ -1,7 +1,7 @@
package com.zy.core.netty;


import com.zy.common.utils.News;
import com.zy.utils.News;
import com.zy.core.netty.properties.TcpProperties;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.buffer.PooledByteBufAllocator;

 src/main/java/com/zy/core/netty/handle/PackageServerHandler.java

@@ -1,16 +1,11 @@
package com.zy.core.netty.handle;

import com.core.common.Cools;
import com.zy.common.utils.News;
import com.zy.core.Slave;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.utils.News;
import com.zy.core.netty.AbstractInboundHandler;
import com.zy.core.netty.cache.ChannelCache;
import com.zy.core.netty.domain.ChPackage;
import com.zy.core.netty.properties.TcpProperties;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.BarcodeThread;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;

 src/main/java/com/zy/core/netty/handle/ProtectorHandler.java

@@ -1,7 +1,7 @@
package com.zy.core.netty.handle;

import com.core.common.Cools;
import com.zy.common.utils.News;
import com.zy.utils.News;
import com.zy.core.netty.AbstractInboundHandler;
import com.zy.core.netty.cache.ChannelCache;
import com.zy.core.netty.domain.ChPackage;

 src/main/java/com/zy/core/thread/BarcodeThread.java

@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.zy.common.utils.News;
import com.zy.utils.News;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.OutputQueue;

 src/main/java/com/zy/core/thread/LedThread.java

@@ -1,10 +1,6 @@
package com.zy.core.thread;

import com.alibaba.fastjson.JSON;
import com.core.common.Cools;
import com.zy.common.entity.Parameter;
import com.zy.common.model.MatDto;
import com.zy.common.utils.News;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
@@ -13,17 +9,7 @@
import com.zy.core.model.command.LedCommand;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import onbon.bx05.Bx5GEnv;
import onbon.bx05.Bx5GException;
import onbon.bx05.Bx5GScreen;
import onbon.bx05.Bx5GScreenClient;
import onbon.bx05.area.TextCaptionBxArea;
import onbon.bx05.area.page.TextBxPage;
import onbon.bx05.file.ProgramBxFile;
import onbon.bx05.message.led.ReturnControllerStatus;
import onbon.bx05.utils.DisplayStyleFactory;

import java.awt.*;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

 src/main/java/com/zy/core/thread/MelsecCrnThread.java

@@ -7,11 +7,11 @@
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnOpt;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.service.BasCrnOptService;
import com.zy.asrs.service.BasCrnpService;
import com.zy.common.utils.News;
import com.zy.entity.BasCrnOpt;
import com.zy.entity.BasCrnp;
import com.zy.service.BasCrnOptService;
import com.zy.service.BasCrnpService;
import com.zy.utils.News;
import com.zy.core.CrnThread;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;

 src/main/java/com/zy/core/thread/RgvThread.java

@@ -7,13 +7,12 @@
import com.alibaba.fastjson.JSON;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.entity.BasRgvOpt;
import com.zy.asrs.service.BasRgvOptService;
import com.zy.asrs.service.BasRgvService;
import com.zy.common.utils.News;
import com.zy.entity.BasRgv;
import com.zy.entity.BasRgvOpt;
import com.zy.service.BasRgvOptService;
import com.zy.service.BasRgvService;
import com.zy.utils.News;
import com.zy.core.RgvThread2;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.RgvStatusType;
@@ -21,7 +20,6 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.RgvSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.command.RgvCommand;
import com.zy.core.model.protocol.RgvProtocol;
import lombok.Data;

 src/main/java/com/zy/core/thread/ScaleThread.java

@@ -1,7 +1,7 @@
package com.zy.core.thread;

import com.core.common.Cools;
import com.zy.common.utils.News;
import com.zy.utils.News;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import lombok.Data;

 src/main/java/com/zy/core/thread/SiemensCrnThread.java

@@ -8,11 +8,11 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasCrnOpt;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.service.BasCrnOptService;
import com.zy.asrs.service.BasCrnpService;
import com.zy.common.utils.News;
import com.zy.entity.BasCrnOpt;
import com.zy.entity.BasCrnp;
import com.zy.service.BasCrnOptService;
import com.zy.service.BasCrnpService;
import com.zy.utils.News;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -9,11 +9,11 @@
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.BasRgvMap;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.BasRgvMapService;
import com.zy.common.utils.News;
import com.zy.entity.BasDevp;
import com.zy.entity.BasRgvMap;
import com.zy.service.BasDevpService;
import com.zy.service.BasRgvMapService;
import com.zy.utils.News;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;

 src/main/java/com/zy/entity/BasCrnError.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;

 src/main/java/com/zy/entity/BasCrnOpt.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;

 src/main/java/com/zy/entity/BasCrnp.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
@@ -6,8 +6,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.LocMastService;
import com.zy.service.BasDevpService;
import com.zy.service.LocMastService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;

 src/main/java/com/zy/entity/BasDevp.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;

 src/main/java/com/zy/entity/BasErrLog.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;

 src/main/java/com/zy/entity/BasPlcerror.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;

 src/main/java/com/zy/entity/BasRgv.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;

 src/main/java/com/zy/entity/BasRgvErr.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;

 src/main/java/com/zy/entity/BasRgvMap.java

File was renamed from src/main/java/com/zy/asrs/entity/BasRgvMap.java
@@ -1,11 +1,11 @@
package com.zy.asrs.entity;
package com.zy.entity;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasRgvMapService;
import com.zy.service.BasRgvMapService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;


 src/main/java/com/zy/entity/BasRgvOpt.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;

 src/main/java/com/zy/entity/BasWrkIotype.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;

 src/main/java/com/zy/entity/BasWrkStatus.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;

 src/main/java/com/zy/entity/LocDetl.java

File was renamed from src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -1,11 +1,11 @@
package com.zy.asrs.entity;
package com.zy.entity;

import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocMastService;
import com.zy.service.LocMastService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;

 src/main/java/com/zy/entity/LocMast.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;

 src/main/java/com/zy/entity/MatCode.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;

 src/main/java/com/zy/entity/Parameter.java

File was renamed from src/main/java/com/zy/common/entity/Parameter.java
@@ -1,4 +1,4 @@
package com.zy.common.entity;
package com.zy.entity;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;

 src/main/java/com/zy/entity/RowLastno.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;

 src/main/java/com/zy/entity/StaDesc.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
@@ -6,8 +6,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
import com.zy.service.BasCrnpService;
import com.zy.service.BasDevpService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;

 src/main/java/com/zy/entity/WaitPakin.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;

 src/main/java/com/zy/entity/WrkDetl.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;

 src/main/java/com/zy/entity/WrkLastno.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;

 src/main/java/com/zy/entity/WrkMast.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
@@ -6,9 +6,9 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.mapper.BasWrkIotypeMapper;
import com.zy.asrs.mapper.BasWrkStatusMapper;
import com.zy.asrs.service.*;
import com.zy.mapper.BasWrkIotypeMapper;
import com.zy.mapper.BasWrkStatusMapper;
import com.zy.service.*;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;

 src/main/java/com/zy/entity/WrkMastSta.java

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

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;

 src/main/java/com/zy/entity/dto/AxisBean.java

File was renamed from src/main/java/com/zy/asrs/domain/dto/AxisBean.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.dto;
package com.zy.entity.dto;

/**
 * 曲线图表json键

 src/main/java/com/zy/entity/dto/WorkChartAxis.java

File was renamed from src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.dto;
package com.zy.entity.dto;

/**
 * 入出库统计曲线图

 src/main/java/com/zy/entity/param/CrnDemoParam.java

File was renamed from src/main/java/com/zy/asrs/domain/param/CrnDemoParam.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.param;
package com.zy.entity.param;

import lombok.Data;


 src/main/java/com/zy/entity/param/CrnOperatorParam.java

File was renamed from src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.param;
package com.zy.entity.param;

import lombok.Data;


 src/main/java/com/zy/entity/param/RgvOperatorParam.java

File was renamed from src/main/java/com/zy/asrs/domain/param/RgvOperatorParam.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.param;
package com.zy.entity.param;

import lombok.Data;


 src/main/java/com/zy/entity/param/SystemSwitchParam.java

File was renamed from src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.param;
package com.zy.entity.param;

/**
 * 系统运行状态操作入参

 src/main/java/com/zy/entity/vo/BarcodeDataVo.java

File was renamed from src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.vo;
package com.zy.entity.vo;

import lombok.Data;


 src/main/java/com/zy/entity/vo/CommandLogVo.java

File was renamed from src/main/java/com/zy/asrs/domain/vo/CommandLogVo.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.vo;
package com.zy.entity.vo;

import lombok.Data;


 src/main/java/com/zy/entity/vo/CrnDetailVo.java

File was renamed from src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.vo;
package com.zy.entity.vo;

import lombok.Data;


 src/main/java/com/zy/entity/vo/CrnLatestDataVo.java

File was renamed from src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
@@ -1,6 +1,6 @@
package com.zy.asrs.domain.vo;
package com.zy.entity.vo;

import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.enums.CrnStatusType;
import lombok.Data;

/**

 src/main/java/com/zy/entity/vo/CrnMsgTableVo.java

File was renamed from src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
@@ -1,6 +1,6 @@
package com.zy.asrs.domain.vo;
package com.zy.entity.vo;

import com.zy.asrs.utils.Utils;
import com.zy.utils.Utils;
import lombok.Data;

/**

 src/main/java/com/zy/entity/vo/CrnStateTableVo.java

File was renamed from src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.vo;
package com.zy.entity.vo;

import lombok.Data;


 src/main/java/com/zy/entity/vo/LocChartPie.java

File was renamed from src/main/java/com/zy/asrs/domain/vo/LocChartPie.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.vo;
package com.zy.entity.vo;

/**
 * 库位占用百分比

 src/main/java/com/zy/entity/vo/PlcErrorTableVo.java

File was renamed from src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.vo;
package com.zy.entity.vo;

import lombok.Data;


 src/main/java/com/zy/entity/vo/RgvMsgTableVo.java

File was renamed from src/main/java/com/zy/asrs/domain/vo/RgvMsgTableVo.java
@@ -1,6 +1,6 @@
package com.zy.asrs.domain.vo;
package com.zy.entity.vo;

import com.zy.asrs.utils.Utils;
import com.zy.utils.Utils;
import lombok.Data;

/**

 src/main/java/com/zy/entity/vo/RgvStateTableVo.java

File was renamed from src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.vo;
package com.zy.entity.vo;

import lombok.Data;


 src/main/java/com/zy/entity/vo/ScaleDataVo.java

File was renamed from src/main/java/com/zy/asrs/domain/vo/ScaleDataVo.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.vo;
package com.zy.entity.vo;

import lombok.Data;


 src/main/java/com/zy/entity/vo/SiteDetailVo.java

File was renamed from src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.vo;
package com.zy.entity.vo;

import lombok.Data;


 src/main/java/com/zy/entity/vo/SiteLatestDataVo.java

File was renamed from src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java
@@ -1,6 +1,6 @@
package com.zy.asrs.domain.vo;
package com.zy.entity.vo;

import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.enums.SiteStatusType;
import lombok.Data;

/**

 src/main/java/com/zy/entity/vo/SiteTableVo.java

File was renamed from src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.vo;
package com.zy.entity.vo;

import lombok.Data;


 src/main/java/com/zy/enums/CrnStatusType.java

File was renamed from src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.enums;
package com.zy.enums;

/**
 * 堆垛机状态枚举

 src/main/java/com/zy/enums/RgvStatusType.java

File was renamed from src/main/java/com/zy/asrs/domain/enums/RgvStatusType.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.enums;
package com.zy.enums;

/**
 * RGV状态枚举

 src/main/java/com/zy/enums/SiteStatusType.java

File was renamed from src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.enums;
package com.zy.enums;


import com.zy.core.model.protocol.StaProtocol;

 src/main/java/com/zy/enums/WorkNoType.java

File was renamed from src/main/java/com/zy/asrs/domain/enums/WorkNoType.java
@@ -1,4 +1,4 @@
package com.zy.asrs.domain.enums;
package com.zy.enums;

import com.core.exception.CoolException;


 src/main/java/com/zy/mapper/BasCrnErrorMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/BasCrnErrorMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.BasCrnError;
import com.zy.entity.BasCrnError;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;


 src/main/java/com/zy/mapper/BasCrnOptMapper.java

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

import com.zy.asrs.entity.BasCrnOpt;
import com.zy.entity.BasCrnOpt;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

 src/main/java/com/zy/mapper/BasCrnpMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.BasCrnp;
import com.zy.entity.BasCrnp;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;


 src/main/java/com/zy/mapper/BasDevpMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.BasDevp;
import com.zy.entity.BasDevp;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

 src/main/java/com/zy/mapper/BasErrLogMapper.java

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

import com.zy.asrs.entity.BasErrLog;
import com.zy.entity.BasErrLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

 src/main/java/com/zy/mapper/BasPlcerrorMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.BasPlcerror;
import com.zy.entity.BasPlcerror;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;


 src/main/java/com/zy/mapper/BasRgvErrMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/BasRgvErrMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.BasRgvErr;
import com.zy.entity.BasRgvErr;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;


 src/main/java/com/zy/mapper/BasRgvMapMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/BasRgvMapMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.BasRgvMap;
import com.zy.entity.BasRgvMap;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

 src/main/java/com/zy/mapper/BasRgvMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/BasRgvMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.BasRgv;
import com.zy.entity.BasRgv;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;


 src/main/java/com/zy/mapper/BasRgvOptMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/BasRgvOptMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.BasRgvOpt;
import com.zy.entity.BasRgvOpt;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;


 src/main/java/com/zy/mapper/BasWrkIotypeMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.BasWrkIotype;
import com.zy.entity.BasWrkIotype;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;


 src/main/java/com/zy/mapper/BasWrkStatusMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.BasWrkStatus;
import com.zy.entity.BasWrkStatus;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;


 src/main/java/com/zy/mapper/LocDetlMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.LocDetl;
import com.zy.entity.LocDetl;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

 src/main/java/com/zy/mapper/LocMastMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.LocMast;
import com.zy.entity.LocMast;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

 src/main/java/com/zy/mapper/MatCodeMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/MatCodeMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.MatCode;
import com.zy.entity.MatCode;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;


 src/main/java/com/zy/mapper/ReportQueryMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
import com.zy.entity.dto.WorkChartAxis;
import com.zy.entity.vo.LocChartPie;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;

 src/main/java/com/zy/mapper/RowLastnoMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.RowLastno;
import com.zy.entity.RowLastno;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;


 src/main/java/com/zy/mapper/StaDescMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/StaDescMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.StaDesc;
import com.zy.entity.StaDesc;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;


 src/main/java/com/zy/mapper/WaitPakinMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WaitPakin;
import com.zy.entity.WaitPakin;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;


 src/main/java/com/zy/mapper/WrkDetlMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkDetl;
import com.zy.entity.WrkDetl;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

 src/main/java/com/zy/mapper/WrkLastnoMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/WrkLastnoMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkLastno;
import com.zy.entity.WrkLastno;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;


 src/main/java/com/zy/mapper/WrkMastMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMast;
import com.zy.entity.WrkMast;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;


 src/main/java/com/zy/mapper/WrkMastStaMapper.java

File was renamed from src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
package com.zy.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkMastSta;
import com.zy.entity.WrkMastSta;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

 src/main/java/com/zy/service/BasCrnOptService.java

File was renamed from src/main/java/com/zy/asrs/service/BasCrnOptService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
package com.zy.service;

import com.zy.asrs.entity.BasCrnOpt;
import com.zy.entity.BasCrnOpt;
import com.baomidou.mybatisplus.service.IService;

public interface BasCrnOptService extends IService<BasCrnOpt> {

 src/main/java/com/zy/service/BasCrnpService.java

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

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.BasCrnp;
import com.zy.entity.BasCrnp;

public interface BasCrnpService extends IService<BasCrnp> {


 src/main/java/com/zy/service/BasDevpService.java

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

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.BasDevp;
import com.zy.entity.BasDevp;

import java.util.List;


 src/main/java/com/zy/service/BasErrLogService.java

File was renamed from src/main/java/com/zy/asrs/service/BasErrLogService.java
@@ -1,6 +1,6 @@
package com.zy.asrs.service;
package com.zy.service;

import com.zy.asrs.entity.BasErrLog;
import com.zy.entity.BasErrLog;
import com.baomidou.mybatisplus.service.IService;

public interface BasErrLogService extends IService<BasErrLog> {

 src/main/java/com/zy/service/BasRgvErrService.java

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

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.BasRgvErr;
import com.zy.entity.BasRgvErr;

public interface BasRgvErrService extends IService<BasRgvErr> {


 src/main/java/com/zy/service/BasRgvMapService.java

File was renamed from src/main/java/com/zy/asrs/service/BasRgvMapService.java
@@ -1,8 +1,7 @@
package com.zy.asrs.service;
package com.zy.service;

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.BasRgvErr;
import com.zy.asrs.entity.BasRgvMap;
import com.zy.entity.BasRgvMap;

public interface BasRgvMapService extends IService<BasRgvMap> {


 src/main/java/com/zy/service/BasRgvOptService.java

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

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.BasRgvOpt;
import com.zy.entity.BasRgvOpt;

public interface BasRgvOptService extends IService<BasRgvOpt> {


 src/main/java/com/zy/service/BasRgvService.java

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

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.BasRgv;
import com.zy.entity.BasRgv;

public interface BasRgvService extends IService<BasRgv> {


 src/main/java/com/zy/service/LocDetlService.java

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

import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocDetl;
import com.zy.entity.LocDetl;

import java.util.List;


 src/main/java/com/zy/service/LocMastService.java

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

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocMast;
import com.zy.entity.LocMast;

import java.util.List;


 src/main/java/com/zy/service/MainService.java

New file
@@ -0,0 +1,4 @@
package com.zy.service;

public interface MainService {
}

 src/main/java/com/zy/service/MatCodeService.java

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

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.MatCode;
import com.zy.entity.MatCode;

public interface MatCodeService extends IService<MatCode> {


 src/main/java/com/zy/service/RowLastnoService.java

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

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.RowLastno;
import com.zy.entity.RowLastno;

public interface RowLastnoService extends IService<RowLastno> {


 src/main/java/com/zy/service/StaDescService.java

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

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.StaDesc;
import com.zy.entity.StaDesc;

public interface StaDescService extends IService<StaDesc> {


 src/main/java/com/zy/service/WrkDetlService.java

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

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.entity.WaitPakin;
import com.zy.entity.WrkDetl;

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

 src/main/java/com/zy/service/WrkLastnoService.java

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

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.WrkLastno;
import com.zy.entity.WrkLastno;

public interface WrkLastnoService extends IService<WrkLastno> {


 src/main/java/com/zy/service/WrkMastService.java

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

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.WrkMast;
import com.zy.entity.WrkMast;

import java.util.List;


 src/main/java/com/zy/service/impl/BasCrnOptServiceImpl.java

File was renamed from src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java
@@ -1,8 +1,8 @@
package com.zy.asrs.service.impl;
package com.zy.service.impl;

import com.zy.asrs.mapper.BasCrnOptMapper;
import com.zy.asrs.entity.BasCrnOpt;
import com.zy.asrs.service.BasCrnOptService;
import com.zy.mapper.BasCrnOptMapper;
import com.zy.entity.BasCrnOpt;
import com.zy.service.BasCrnOptService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;


 src/main/java/com/zy/service/impl/BasCrnpServiceImpl.java

File was renamed from src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -1,12 +1,12 @@
package com.zy.asrs.service.impl;
package com.zy.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.mapper.BasCrnpMapper;
import com.zy.asrs.service.BasCrnpService;
import com.zy.common.utils.News;
import com.zy.entity.BasCrnp;
import com.zy.mapper.BasCrnpMapper;
import com.zy.service.BasCrnpService;
import com.zy.utils.News;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;


 src/main/java/com/zy/service/impl/BasDevpServiceImpl.java

File was renamed from src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -1,11 +1,11 @@
package com.zy.asrs.service.impl;
package com.zy.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.entity.BasDevp;
import com.zy.mapper.BasDevpMapper;
import com.zy.service.BasDevpService;
import com.zy.service.WrkMastService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;


 src/main/java/com/zy/service/impl/BasErrLogServiceImpl.java

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

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.mapper.BasErrLogMapper;
import com.zy.asrs.entity.BasErrLog;
import com.zy.asrs.service.BasErrLogService;
import com.zy.mapper.BasErrLogMapper;
import com.zy.entity.BasErrLog;
import com.zy.service.BasErrLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;


 src/main/java/com/zy/service/impl/BasRgvErrServiceImpl.java

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

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasRgvErr;
import com.zy.asrs.mapper.BasRgvErrMapper;
import com.zy.asrs.service.BasRgvErrService;
import com.zy.entity.BasRgvErr;
import com.zy.mapper.BasRgvErrMapper;
import com.zy.service.BasRgvErrService;
import org.springframework.stereotype.Service;

@Service("basRgvErrService")

 src/main/java/com/zy/service/impl/BasRgvMapServiceImpl.java

File was renamed from src/main/java/com/zy/asrs/service/impl/BasRgvMapServiceImpl.java
@@ -1,10 +1,9 @@
package com.zy.asrs.service.impl;
package com.zy.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasRgvMap;
import com.zy.asrs.mapper.BasRgvMapMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.BasRgvMapService;
import com.zy.entity.BasRgvMap;
import com.zy.mapper.BasRgvMapMapper;
import com.zy.service.BasRgvMapService;
import org.springframework.stereotype.Service;

@Service("basRgvMapService")

 src/main/java/com/zy/service/impl/BasRgvOptServiceImpl.java

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

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasRgvOpt;
import com.zy.asrs.mapper.BasRgvOptMapper;
import com.zy.asrs.service.BasRgvOptService;
import com.zy.entity.BasRgvOpt;
import com.zy.mapper.BasRgvOptMapper;
import com.zy.service.BasRgvOptService;
import org.springframework.stereotype.Service;

@Service("basRgvOptService")

 src/main/java/com/zy/service/impl/BasRgvServiceImpl.java

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

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.mapper.BasRgvMapper;
import com.zy.asrs.service.BasRgvService;
import com.zy.entity.BasRgv;
import com.zy.mapper.BasRgvMapper;
import com.zy.service.BasRgvService;
import org.springframework.stereotype.Service;

@Service("basRgvService")

 src/main/java/com/zy/service/impl/LocDetlServiceImpl.java

File was renamed from src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -1,11 +1,11 @@
package com.zy.asrs.service.impl;
package com.zy.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.entity.LocDetl;
import com.zy.mapper.LocDetlMapper;
import com.zy.service.LocDetlService;
import org.springframework.stereotype.Service;

import java.util.List;

 src/main/java/com/zy/service/impl/LocMastServiceImpl.java

File was renamed from src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -1,10 +1,10 @@
package com.zy.asrs.service.impl;
package com.zy.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
import com.zy.entity.LocMast;
import com.zy.mapper.LocMastMapper;
import com.zy.service.LocMastService;
import org.springframework.stereotype.Service;

import java.util.List;

 src/main/java/com/zy/service/impl/MainServiceImpl.java

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

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -7,20 +7,20 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.RouteUtils;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.entity.*;
import com.zy.mapper.*;
import com.zy.service.*;
import com.zy.utils.RouteUtils;
import com.zy.utils.Utils;
import com.zy.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.MatDto;
import com.zy.common.model.SearchLocParam;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.utils.CollectionUtils;
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.News;
import com.zy.utils.CollectionUtils;
import com.zy.utils.HttpHandler;
import com.zy.utils.News;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
@@ -46,7 +46,6 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

/**

 src/main/java/com/zy/service/impl/MatCodeServiceImpl.java

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

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.mapper.MatCodeMapper;
import com.zy.asrs.service.MatCodeService;
import com.zy.entity.MatCode;
import com.zy.mapper.MatCodeMapper;
import com.zy.service.MatCodeService;
import org.springframework.stereotype.Service;

@Service("matCodeService")

 src/main/java/com/zy/service/impl/RowLastnoServiceImpl.java

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

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.RowLastno;
import com.zy.asrs.mapper.RowLastnoMapper;
import com.zy.asrs.service.RowLastnoService;
import com.zy.entity.RowLastno;
import com.zy.mapper.RowLastnoMapper;
import com.zy.service.RowLastnoService;
import org.springframework.stereotype.Service;

@Service("rowLastnoService")

 src/main/java/com/zy/service/impl/StaDescServiceImpl.java

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

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.mapper.StaDescMapper;
import com.zy.asrs.service.StaDescService;
import com.zy.entity.StaDesc;
import com.zy.mapper.StaDescMapper;
import com.zy.service.StaDescService;
import org.springframework.stereotype.Service;

@Service("staDescService")

 src/main/java/com/zy/service/impl/WrkDetlServiceImpl.java

File was renamed from src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -1,15 +1,15 @@
package com.zy.asrs.service.impl;
package com.zy.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.mapper.WrkDetlMapper;
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.service.WrkDetlService;
import com.zy.asrs.utils.VersionUtils;
import com.zy.entity.MatCode;
import com.zy.entity.WaitPakin;
import com.zy.entity.WrkDetl;
import com.zy.mapper.WrkDetlMapper;
import com.zy.service.MatCodeService;
import com.zy.service.WrkDetlService;
import com.zy.utils.VersionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

 src/main/java/com/zy/service/impl/WrkLastnoServiceImpl.java

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

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.WrkLastno;
import com.zy.asrs.mapper.WrkLastnoMapper;
import com.zy.asrs.service.WrkLastnoService;
import com.zy.entity.WrkLastno;
import com.zy.mapper.WrkLastnoMapper;
import com.zy.service.WrkLastnoService;
import org.springframework.stereotype.Service;

@Service("wrkLastnoService")

 src/main/java/com/zy/service/impl/WrkMastServiceImpl.java

File was renamed from src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -1,10 +1,10 @@
package com.zy.asrs.service.impl;
package com.zy.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.WrkMastService;
import com.zy.entity.WrkMast;
import com.zy.mapper.WrkMastMapper;
import com.zy.service.WrkMastService;
import org.springframework.stereotype.Service;

import java.util.List;

 src/main/java/com/zy/system/controller/ConfigController.java

@@ -9,7 +9,7 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.controller.AbstractBaseController;
import com.zy.common.entity.Parameter;
import com.zy.entity.Parameter;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import org.springframework.beans.factory.annotation.Autowired;

 src/main/java/com/zy/utils/CollectionUtils.java

File was renamed from src/main/java/com/zy/common/utils/CollectionUtils.java
@@ -1,4 +1,4 @@
package com.zy.common.utils;
package com.zy.utils;

import java.util.Set;


 src/main/java/com/zy/utils/CommonUtils.java

File was renamed from src/main/java/com/zy/common/utils/CommonUtils.java
@@ -1,4 +1,4 @@
package com.zy.common.utils;
package com.zy.utils;

import java.math.BigDecimal;


 src/main/java/com/zy/utils/Http.java

File was renamed from src/main/java/com/zy/common/utils/Http.java
@@ -1,4 +1,4 @@
package com.zy.common.utils;
package com.zy.utils;


import com.alibaba.fastjson.JSON;

 src/main/java/com/zy/utils/HttpHandler.java

File was renamed from src/main/java/com/zy/common/utils/HttpHandler.java
@@ -1,4 +1,4 @@
package com.zy.common.utils;
package com.zy.utils;


import okhttp3.*;

 src/main/java/com/zy/utils/News.java

File was renamed from src/main/java/com/zy/common/utils/News.java
@@ -1,4 +1,4 @@
package com.zy.common.utils;
package com.zy.utils;

import lombok.extern.slf4j.Slf4j;


 src/main/java/com/zy/utils/QrCode.java

File was renamed from src/main/java/com/zy/common/utils/QrCode.java
@@ -1,4 +1,4 @@
package com.zy.common.utils;
package com.zy.utils;

import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;

 src/main/java/com/zy/utils/RandomValidateCodeUtil.java

File was renamed from src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java
@@ -1,4 +1,4 @@
package com.zy.common.utils;
package com.zy.utils;

import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;

 src/main/java/com/zy/utils/RedisUtil.java

File was renamed from src/main/java/com/zy/common/utils/RedisUtil.java
@@ -1,4 +1,4 @@
package com.zy.common.utils;
package com.zy.utils;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;

 src/main/java/com/zy/utils/ReflectUtils.java

File was renamed from src/main/java/com/zy/common/utils/ReflectUtils.java
@@ -1,4 +1,4 @@
package com.zy.common.utils;
package com.zy.utils;

import com.core.common.Cools;


 src/main/java/com/zy/utils/RouteUtils.java

File was renamed from src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -1,4 +1,4 @@
package com.zy.asrs.utils;
package com.zy.utils;

import com.zy.core.enums.RouteCollectCountType;


 src/main/java/com/zy/utils/Struct.java

File was renamed from src/main/java/com/zy/common/utils/Struct.java
@@ -1,4 +1,4 @@
package com.zy.common.utils;
package com.zy.utils;

import com.zy.common.model.annotations.*;
import org.springframework.expression.EvaluationContext;

 src/main/java/com/zy/utils/Utils.java

File was renamed from src/main/java/com/zy/asrs/utils/Utils.java
@@ -1,4 +1,4 @@
package com.zy.asrs.utils;
package com.zy.utils;

import com.core.common.Arith;
import com.core.common.Cools;

 src/main/java/com/zy/utils/VersionUtils.java

File was renamed from src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,10 +1,9 @@
package com.zy.asrs.utils;
package com.zy.utils;

import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.WrkDetl;
import com.zy.entity.LocDetl;
import com.zy.entity.LocMast;
import com.zy.entity.MatCode;
import com.zy.entity.WrkDetl;
import com.zy.common.model.LocTypeDto;

/**

 src/main/java/com/zy/utils/excel/EnInitData.java

File was renamed from src/main/java/com/zy/common/utils/excel/EnInitData.java
@@ -1,4 +1,4 @@
package com.zy.common.utils.excel;
package com.zy.utils.excel;

import com.alibaba.excel.annotation.ExcelProperty;


 src/main/java/com/zy/utils/excel/EnInitDataListener.java

File was renamed from src/main/java/com/zy/common/utils/excel/EnInitDataListener.java
@@ -1,4 +1,4 @@
package com.zy.common.utils.excel;
package com.zy.utils.excel;

import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;

 src/main/java/com/zy/utils/excel/ExcelUtils.java

File was renamed from src/main/java/com/zy/common/utils/excel/ExcelUtils.java
@@ -1,4 +1,4 @@
package com.zy.common.utils.excel;
package com.zy.utils.excel;

import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.read.builder.ExcelReaderBuilder;

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8080
  port: 8081
  servlet:
    context-path: /@pom.build.finalName@

@@ -8,9 +8,9 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://localhost:1433;databasename=gdykasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=ghlnasrs
    username: sa
    password: sa@123
    password: 123456
  mvc:
    static-path-pattern: /**
  redis:
@@ -28,22 +28,23 @@
  path: /stock/out/@pom.build.finalName@/logs

super:
  pwd: xltys1995
  pwd: lnWCS2024

swagger:
  enable: false

wms:
  url: 127.0.0.1:8080/ykwms
  url: 127.0.0.1:8080/wms

# 下位机配置
wcs-slave:
  # 双深
  doubleDeep: true
  # 双深库位排号
  doubleLocs: 1,4,5,8,9,12,13,16
  doubleLocs: 1,4,5,8
  # 一个堆垛机负责的货架排数
  groupCount: 4

  # 堆垛机1
  crn[0]:
    id: 1
@@ -92,142 +93,48 @@
      row: 7
      bay: 1
      lev: 1
  # 堆垛机3
  crn[2]:
    id: 3
    ip: 10.10.10.30
    port: 102
    rack: 0
    slot: 0
    # 偏移量，当堆垛机站点列号=1时，偏移量=2
    offset: 2
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 135
      row: 10
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 139
      row: 11
      bay: 1
      lev: 1
  # 堆垛机4
  crn[3]:
    id: 4
    ip: 10.10.10.40
    port: 102
    rack: 0
    slot: 0
    # 偏移量，当堆垛机站点列号=1时，偏移量=2
    offset: 2
    demo: false
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 144
      row: 14
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 148
      row: 15
      bay: 1
      lev: 1

  # RGV穿梭车1
  rgv[0]:
    id: 1
    ip: 10.10.10.60
    port: 502
    rack: 0
    slot: 0
    #RGV入库源站点
    rgvInSStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 100
    rgvInSStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 101
    #RGV出库源站点
    rgvOutSStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 110
    rgvOutSStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 112
    #RGV目标站点
    rgvDestStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 102
    rgvDestStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 103
  # RGV穿梭车2
  rgv[1]:
    id: 2
    ip: 10.10.10.63
    port: 502
    rack: 0
    slot: 0
    #RGV入库源站点
    rgvInSStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 100
    rgvInSStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 101
    #RGV出库源站点
    rgvOutSStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 110
    rgvOutSStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 112
    #RGV目标站点
    rgvDestStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 102
    rgvDestStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 103
  # RGV穿梭车2
  rgv[2]:
    id: 3
    ip: 10.10.10.66
    port: 502
    rack: 0
    slot: 0
    #RGV入库源站点
    rgvInSStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 100
    rgvInSStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 101
    #RGV出库源站点
    rgvOutSStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 110
    rgvOutSStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 112
    #RGV目标站点
    rgvDestStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 102
    rgvDestStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 103
  # 输送线1
  devp[0]:
    id: 1
    ip: 10.10.10.50
    port: 102
    rack: 0
    slot: 0
    # 入库口1
    inSta[0]:
      staNo: 101
      barcode: ${wcs-slave.barcode[0].id}
      backSta: 100
      led: ${wcs-slave.led[0].id}
    # 入库口1
    inSta[1]:
      staNo: 103
      barcode: ${wcs-slave.barcode[1].id}
      backSta: 102
      led: ${wcs-slave.led[1].id}
    # 空板入库口
    emptyInSta[0]:
      staNo: 101
      barcode: ${wcs-slave.barcode[0].id}
      backSta: 100
      led: ${wcs-slave.led[0].id}
    # 出库口1
    outSta[0]:
      staNo: 100
      led: ${wcs-slave.led[0].id}
    # 出库口2
    outSta[1]:
      staNo: 102
      led: ${wcs-slave.led[1].id}
    # 出库口3
    outSta[2]:
      staNo: 104
      led: ${wcs-slave.led[2].id}

  # 输送线2
  devp[1]:
    id: 2
    ip: 10.10.10.50
    port: 102
    rack: 0
@@ -267,12 +174,12 @@
      barcode: ${wcs-slave.barcode[2].id}
      backSta: 160
      led: ${wcs-slave.led[5].id}
#    # 拣料入库口1
#    pickSta[1]:
#      staNo: 107
#      barcode: ${wcs-slave.barcode[1].id}
#      led: ${wcs-slave.led[1].id}
#      backSta: 108
    #    # 拣料入库口1
    #    pickSta[1]:
    #      staNo: 107
    #      barcode: ${wcs-slave.barcode[1].id}
    #      led: ${wcs-slave.led[1].id}
    #      backSta: 108
    # 出库口1
    outSta[0]:
      staNo: 100
@@ -294,12 +201,8 @@
    id: 2
    ip: 10.10.10.122
    port: 51236
  # 条码扫描仪3
  barcode[2]:
    id: 3
    ip: 10.10.10.123
    port: 51236
   # LED1

  # LED1
  led[0]:
    id: 1
    ip: 10.10.10.101
@@ -312,32 +215,11 @@
    ip: 10.10.10.102
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 106
    staArr: 102
  # LED3
  led[2]:
    id: 3
    ip: 10.10.10.103
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 107
  # LED4
  led[3]:
    id: 4
    ip: 10.10.10.104
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 152
  # LED5
  led[4]:
    id: 5
    ip: 10.10.10.105
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 156
  # LED6
  led[5]:
    id: 6
    ip: 10.10.10.106
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 160,159
    staArr: 104

 src/main/resources/mapper/BasCrnErrorMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.BasCrnErrorMapper">
<mapper namespace="com.zy.mapper.BasCrnErrorMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasCrnError">
    <resultMap id="BaseResultMap" type="com.zy.entity.BasCrnError">
        <id column="error_code" property="errorCode" />
        <result column="err_name" property="errName" />
        <result column="modi_user" property="modiUser" />

 src/main/resources/mapper/BasCrnpMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.BasCrnpMapper">
<mapper namespace="com.zy.mapper.BasCrnpMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasCrnp">
    <resultMap id="BaseResultMap" type="com.zy.entity.BasCrnp">
        <id column="crn_no" property="crnNo" />
        <result column="in_enable" property="inEnable" />
        <result column="out_enable" property="outEnable" />

 src/main/resources/mapper/BasDevpMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.BasDevpMapper">
<mapper namespace="com.zy.mapper.BasDevpMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasDevp">
    <resultMap id="BaseResultMap" type="com.zy.entity.BasDevp">
        <id column="dev_no" property="devNo" />
        <result column="dec_desc" property="decDesc" />
        <result column="dev_mk" property="devMk" />

 src/main/resources/mapper/BasPlcerrorMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.BasPlcerrorMapper">
<mapper namespace="com.zy.mapper.BasPlcerrorMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasPlcerror">
    <resultMap id="BaseResultMap" type="com.zy.entity.BasPlcerror">
        <result column="error_code" property="errorCode" />
        <result column="error_desc" property="errorDesc" />
        <result column="modi_time" property="modiTime" />

 src/main/resources/mapper/BasRgvErrMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.BasRgvErrMapper">
<mapper namespace="com.zy.mapper.BasRgvErrMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasRgvErr">
    <resultMap id="BaseResultMap" type="com.zy.entity.BasRgvErr">
        <result column="error_code" property="errorCode" />
        <result column="err_name" property="errName" />
        <result column="modi_user" property="modiUser" />

 src/main/resources/mapper/BasRgvMapMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.BasRgvMapMapper">
<mapper namespace="com.zy.mapper.BasRgvMapMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasRgvMap">
    <resultMap id="BaseResultMap" type="com.zy.entity.BasRgvMap">
        <result column="rgv_no" property="rgvNo" />
        <result column="start_route" property="startRoute" />
        <result column="end_route" property="endRoute" />

 src/main/resources/mapper/BasRgvMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.BasRgvMapper">
<mapper namespace="com.zy.mapper.BasRgvMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasRgv">
    <resultMap id="BaseResultMap" type="com.zy.entity.BasRgv">
        <result column="rgv_no" property="rgvNo" />
        <result column="in_enable" property="inEnable" />
        <result column="out_enable" property="outEnable" />

 src/main/resources/mapper/BasRgvOptMapper.xml

@@ -1,11 +1,10 @@
<?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.mapper.BasRgvOptMapper">
<mapper namespace="com.zy.mapper.BasRgvOptMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasRgvOpt">
    <resultMap id="BaseResultMap" type="com.zy.entity.BasRgvOpt">
        <result column="id" property="id" />
        <result column="wrk_no" property="wrkNo" />
        <result column="rgv_no" property="rgvNo" />
        <result column="send_time" property="sendTime" />
        <result column="mode" property="mode" />

 src/main/resources/mapper/BasWrkIotypeMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.BasWrkIotypeMapper">
<mapper namespace="com.zy.mapper.BasWrkIotypeMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasWrkIotype">
    <resultMap id="BaseResultMap" type="com.zy.entity.BasWrkIotype">
        <id column="io_type" property="ioType" />
        <result column="io_pri" property="ioPri" />
        <result column="io_desc" property="ioDesc" />

 src/main/resources/mapper/BasWrkStatusMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.BasWrkStatusMapper">
<mapper namespace="com.zy.mapper.BasWrkStatusMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasWrkStatus">
    <resultMap id="BaseResultMap" type="com.zy.entity.BasWrkStatus">
        <id column="wrk_sts" property="wrkSts" />
        <result column="wrk_desc" property="wrkDesc" />
        <result column="modi_user" property="modiUser" />

 src/main/resources/mapper/LocDetlMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.LocDetlMapper">
<mapper namespace="com.zy.mapper.LocDetlMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocDetl">
    <resultMap id="BaseResultMap" type="com.zy.entity.LocDetl">
        <result column="loc_no" property="locNo" />
        <result column="zpallet" property="zpallet" />
        <result column="anfme" property="anfme" />

 src/main/resources/mapper/LocMastMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.LocMastMapper">
<mapper namespace="com.zy.mapper.LocMastMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocMast">
    <resultMap id="BaseResultMap" type="com.zy.entity.LocMast">
        <id column="loc_no" property="locNo" />
        <result column="whs_type" property="whsType" />
        <result column="plt_type" property="pltType" />

 src/main/resources/mapper/MatCodeMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.MatCodeMapper">
<mapper namespace="com.zy.mapper.MatCodeMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.MatCode">
    <resultMap id="BaseResultMap" type="com.zy.entity.MatCode">
        <result column="mat_no" property="matNo" />
        <result column="barcode" property="barcode" />
        <result column="mat_name" property="matName" />

 src/main/resources/mapper/RowLastnoMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.RowLastnoMapper">
<mapper namespace="com.zy.mapper.RowLastnoMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.RowLastno">
    <resultMap id="BaseResultMap" type="com.zy.entity.RowLastno">
        <id column="whs_type" property="whsType" />
        <result column="wrk_mk" property="wrkMk" />
        <result column="current_row" property="currentRow" />

 src/main/resources/mapper/StaDescMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.StaDescMapper">
<mapper namespace="com.zy.mapper.StaDescMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.StaDesc">
    <resultMap id="BaseResultMap" type="com.zy.entity.StaDesc">
        <id column="type_id" property="typeId" />
        <result column="type_no" property="typeNo" />
        <result column="type_desc" property="typeDesc" />

 src/main/resources/mapper/WaitPakinMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.WaitPakinMapper">
<mapper namespace="com.zy.mapper.WaitPakinMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WaitPakin">
    <resultMap id="BaseResultMap" type="com.zy.entity.WaitPakin">
        <result column="matnr" property="matnr" />
        <result column="maktx" property="maktx" />
        <result column="lgnum" property="lgnum" />

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -1,24 +1,24 @@
<?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.mapper.WrkDetlMapper">
<mapper namespace="com.zy.mapper.WrkDetlMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkDetl">
    <resultMap id="BaseResultMap" type="com.zy.entity.WrkDetl">
        <result column="wrk_no" property="wrkNo" />
        <result column="io_time" property="ioTime" />
        <result column="matnr" property="matnr" />
        <result column="maktx" property="maktx" />
        <result column="specs" property="specs" />
        <result column="size" property="size" />
<!--        <result column="size" property="size" />-->
        <result column="color" property="color" />
        <result column="weight" property="weight" />
        <result column="bill_no" property="billNo" />
        <result column="seq_no" property="seqNo" />
<!--        <result column="bill_no" property="billNo" />-->
<!--        <result column="seq_no" property="seqNo" />-->
        <result column="brand" property="brand" />
        <result column="anfme" property="anfme" />
        <result column="unit" property="unit" />
        <result column="zpallet" property="zpallet" />
        <result column="bname" property="bname" />
<!--        <result column="bname" property="bname" />-->
        <result column="memo" property="memo" />
        <result column="modi_user" property="modiUser" />
        <result column="modi_time" property="modiTime" />

 src/main/resources/mapper/WrkLastnoMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.WrkLastnoMapper">
<mapper namespace="com.zy.mapper.WrkLastnoMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkLastno">
    <resultMap id="BaseResultMap" type="com.zy.entity.WrkLastno">
        <id column="wrk_mk" property="wrkMk" />
        <result column="wrk_no" property="wrkNo" />
        <result column="modi_user" property="modiUser" />

 src/main/resources/mapper/WrkMastMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.WrkMastMapper">
<mapper namespace="com.zy.mapper.WrkMastMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMast">
    <resultMap id="BaseResultMap" type="com.zy.entity.WrkMast">
        <id column="wrk_no" property="wrkNo" />
        <result column="inv_wh" property="invWh" />
        <result column="ymd" property="ymd" />

 src/main/resources/mapper/WrkMastStaMapper.xml

@@ -1,9 +1,9 @@
<?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.mapper.WrkMastStaMapper">
<mapper namespace="com.zy.mapper.WrkMastStaMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastSta">
    <resultMap id="BaseResultMap" type="com.zy.entity.WrkMastSta">
        <id column="id" property="id" />
        <result column="wrk_no" property="wrkNo" />
        <result column="wrk_start" property="wrkStart" />