From 32b905ac1f907fd0f58784acd8f609e691b2ea6e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 22 四月 2024 09:17:10 +0800
Subject: [PATCH] 目录重构
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 2
src/main/java/com/zy/entity/Parameter.java | 2
src/main/resources/mapper/BasRgvOptMapper.xml | 5
src/main/java/com/zy/service/BasRgvService.java | 4
src/main/java/com/zy/service/LocDetlService.java | 4
src/main/java/com/zy/service/impl/MatCodeServiceImpl.java | 8
src/main/java/com/zy/entity/LocDetl.java | 4
src/main/java/com/zy/service/BasRgvOptService.java | 4
src/main/java/com/zy/entity/BasRgv.java | 2
src/main/java/com/zy/utils/Struct.java | 2
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 2
src/main/java/com/zy/entity/vo/ScaleDataVo.java | 2
src/main/java/com/zy/service/impl/BasRgvMapServiceImpl.java | 9
src/main/java/com/zy/core/thread/ScaleThread.java | 2
src/main/java/com/zy/mapper/BasCrnpMapper.java | 4
src/main/java/com/zy/mapper/BasRgvOptMapper.java | 4
src/main/java/com/zy/common/web/AuthController.java | 4
src/main/resources/mapper/BasWrkIotypeMapper.xml | 4
src/main/java/com/zy/mapper/WrkMastStaMapper.java | 4
src/main/java/com/zy/service/impl/BasCrnpServiceImpl.java | 10
src/main/java/com/zy/config/WebConfig.java | 2
src/main/java/com/zy/entity/vo/CommandLogVo.java | 2
src/main/java/com/zy/Boot.java | 2
src/main/java/com/zy/service/MainService.java | 4
src/main/java/com/zy/service/StaDescService.java | 4
src/main/java/com/zy/mapper/BasRgvMapMapper.java | 4
src/main/java/com/zy/common/service/CommonService.java | 10
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 10
src/main/java/com/zy/entity/BasDevp.java | 2
src/main/java/com/zy/utils/CollectionUtils.java | 2
src/main/java/com/zy/controller/SiteController.java | 13
src/main/java/com/zy/entity/MatCode.java | 2
src/main/java/com/zy/service/impl/WrkDetlServiceImpl.java | 16
src/main/java/com/zy/mapper/WrkDetlMapper.java | 4
src/main/java/com/zy/service/impl/MainServiceImpl.java | 21
src/main/java/com/zy/entity/vo/CrnLatestDataVo.java | 4
src/main/java/com/zy/mapper/BasRgvMapper.java | 4
src/main/java/com/zy/mapper/BasWrkIotypeMapper.java | 4
src/main/java/com/zy/mapper/BasCrnOptMapper.java | 4
src/main/java/com/zy/entity/BasRgvMap.java | 4
src/main/java/com/zy/mapper/WrkLastnoMapper.java | 4
src/main/java/com/zy/entity/BasWrkIotype.java | 2
src/main/java/com/zy/entity/BasWrkStatus.java | 2
src/main/java/com/zy/service/BasCrnOptService.java | 4
src/main/java/com/zy/service/MatCodeService.java | 4
src/main/java/com/zy/entity/vo/SiteTableVo.java | 2
src/main/java/com/zy/entity/vo/CrnStateTableVo.java | 2
src/main/java/com/zy/core/model/protocol/RgvProtocol.java | 2
src/main/java/com/zy/service/BasRgvMapService.java | 5
src/main/java/com/zy/service/impl/BasDevpServiceImpl.java | 10
src/main/java/com/zy/service/RowLastnoService.java | 4
src/main/java/com/zy/service/WrkLastnoService.java | 4
src/main/resources/mapper/BasDevpMapper.xml | 4
src/main/java/com/zy/mapper/RowLastnoMapper.java | 4
src/main/java/com/zy/core/thread/LedThread.java | 14
src/main/java/com/zy/entity/BasRgvOpt.java | 2
src/main/java/com/zy/entity/param/CrnDemoParam.java | 2
src/main/java/com/zy/utils/excel/EnInitData.java | 2
src/main/java/com/zy/entity/param/SystemSwitchParam.java | 2
src/main/java/com/zy/entity/BasRgvErr.java | 2
src/main/resources/mapper/BasCrnpMapper.xml | 4
pom.xml | 2
src/main/java/com/zy/service/impl/BasRgvOptServiceImpl.java | 8
src/main/java/com/zy/mapper/MatCodeMapper.java | 4
src/main/java/com/zy/service/impl/BasRgvErrServiceImpl.java | 8
src/main/java/com/zy/mapper/BasRgvErrMapper.java | 4
src/main/java/com/zy/mapper/StaDescMapper.java | 4
src/main/resources/mapper/StaDescMapper.xml | 4
src/main/java/com/zy/entity/dto/AxisBean.java | 2
src/main/java/com/zy/entity/vo/SiteLatestDataVo.java | 4
src/main/java/com/zy/mapper/ReportQueryMapper.java | 6
src/main/java/com/zy/mapper/WrkMastMapper.java | 4
src/main/java/com/zy/entity/BasPlcerror.java | 2
src/main/java/com/zy/utils/ReflectUtils.java | 2
src/main/java/com/zy/service/impl/BasCrnOptServiceImpl.java | 8
src/main/java/com/zy/utils/excel/ExcelUtils.java | 2
src/main/resources/mapper/BasCrnErrorMapper.xml | 4
src/main/java/com/zy/service/impl/LocMastServiceImpl.java | 8
src/main/resources/mapper/WrkMastMapper.xml | 4
src/main/java/com/zy/entity/WrkMastSta.java | 2
src/main/java/com/zy/config/CoolExceptionHandler.java | 2
src/main/java/com/zy/config/AdminInterceptor.java | 4
src/main/java/com/zy/core/netty/handle/PackageServerHandler.java | 7
src/main/java/com/zy/mapper/BasCrnErrorMapper.java | 4
src/main/java/com/zy/mapper/BasPlcerrorMapper.java | 4
src/main/java/com/zy/core/thread/RgvThread.java | 12
src/main/java/com/zy/service/impl/LocDetlServiceImpl.java | 8
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 10
src/main/java/com/zy/enums/WorkNoType.java | 2
src/main/resources/mapper/BasRgvMapper.xml | 4
src/main/java/com/zy/service/impl/StaDescServiceImpl.java | 8
src/main/resources/application.yml | 228 +++---------
src/main/java/com/zy/entity/vo/BarcodeDataVo.java | 2
src/main/java/com/zy/controller/MonitorController.java | 10
src/main/java/com/zy/mapper/WaitPakinMapper.java | 4
src/main/java/com/zy/core/thread/MelsecCrnThread.java | 10
src/main/java/com/zy/entity/param/RgvOperatorParam.java | 2
src/main/java/com/zy/service/BasErrLogService.java | 4
src/main/resources/mapper/LocDetlMapper.xml | 4
src/main/resources/mapper/LocMastMapper.xml | 4
src/main/java/com/zy/service/BasRgvErrService.java | 4
src/main/java/com/zy/utils/RandomValidateCodeUtil.java | 2
src/main/java/com/zy/config/RedisConfig.java | 2
src/main/java/com/zy/system/controller/ConfigController.java | 2
src/main/java/com/zy/entity/BasCrnError.java | 2
src/main/java/com/zy/entity/vo/LocChartPie.java | 2
src/main/resources/mapper/BasRgvMapMapper.xml | 4
src/main/java/com/zy/controller/CrnController.java | 33
src/main/java/com/zy/controller/NewsController.java | 4
src/main/java/com/zy/utils/RouteUtils.java | 2
src/main/java/com/zy/entity/RowLastno.java | 2
src/main/java/com/zy/service/impl/BasRgvServiceImpl.java | 8
src/main/java/com/zy/entity/vo/PlcErrorTableVo.java | 2
src/main/java/com/zy/utils/CommonUtils.java | 2
src/main/java/com/zy/utils/Http.java | 2
src/main/java/com/zy/entity/vo/RgvMsgTableVo.java | 4
src/main/java/com/zy/service/BasDevpService.java | 4
src/main/java/com/zy/service/impl/WrkMastServiceImpl.java | 8
src/main/resources/mapper/WaitPakinMapper.xml | 4
src/main/java/com/zy/mapper/LocDetlMapper.java | 4
src/main/java/com/zy/entity/LocMast.java | 2
src/main/java/com/zy/core/netty/OnlineServer.java | 2
src/main/java/com/zy/enums/CrnStatusType.java | 2
src/main/java/com/zy/controller/RgvController.java | 26
src/main/java/com/zy/core/ServerBootstrap.java | 3
src/main/java/com/zy/entity/vo/CrnMsgTableVo.java | 4
src/main/java/com/zy/mapper/BasErrLogMapper.java | 4
src/main/java/com/zy/mapper/BasDevpMapper.java | 4
src/main/java/com/zy/entity/WrkDetl.java | 2
src/main/java/com/zy/entity/vo/RgvStateTableVo.java | 2
src/main/java/com/zy/entity/vo/CrnDetailVo.java | 2
src/main/java/com/zy/entity/BasErrLog.java | 2
src/main/java/com/zy/entity/vo/SiteDetailVo.java | 2
src/main/java/com/zy/enums/RgvStatusType.java | 2
src/main/java/com/zy/mapper/LocMastMapper.java | 4
src/main/java/com/zy/service/impl/WrkLastnoServiceImpl.java | 8
src/main/java/com/zy/utils/excel/EnInitDataListener.java | 2
src/main/java/com/zy/utils/HttpHandler.java | 2
src/main/java/com/zy/entity/WaitPakin.java | 2
src/main/java/com/zy/entity/StaDesc.java | 6
src/main/resources/mapper/BasRgvErrMapper.xml | 4
src/main/java/com/zy/service/impl/BasErrLogServiceImpl.java | 8
src/main/resources/mapper/BasWrkStatusMapper.xml | 4
src/main/java/com/zy/controller/ConsoleController.java | 31
src/main/java/com/zy/entity/param/CrnOperatorParam.java | 2
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 2
src/main/java/com/zy/service/WrkMastService.java | 4
src/main/resources/mapper/WrkDetlMapper.xml | 12
src/main/java/com/zy/core/netty/handle/ProtectorHandler.java | 2
src/main/java/com/zy/utils/QrCode.java | 2
src/main/java/com/zy/service/LocMastService.java | 4
src/main/java/com/zy/utils/RedisUtil.java | 2
src/main/resources/mapper/BasPlcerrorMapper.xml | 4
src/main/java/com/zy/core/MainProcess.java | 4
src/main/java/com/zy/service/BasCrnpService.java | 4
src/main/java/com/zy/entity/WrkMast.java | 8
src/main/java/com/zy/entity/dto/WorkChartAxis.java | 2
src/main/resources/mapper/WrkLastnoMapper.xml | 4
src/main/java/com/zy/service/WrkDetlService.java | 6
src/main/resources/mapper/RowLastnoMapper.xml | 4
src/main/java/com/zy/entity/WrkLastno.java | 2
src/main/resources/mapper/MatCodeMapper.xml | 4
src/main/java/com/zy/common/service/WmsService.java | 4
src/main/java/com/zy/common/web/FileController.java | 6
src/main/resources/mapper/WrkMastStaMapper.xml | 4
src/main/java/com/zy/entity/BasCrnp.java | 6
src/main/java/com/zy/enums/SiteStatusType.java | 2
/dev/null | 4
src/main/java/com/zy/service/impl/RowLastnoServiceImpl.java | 8
src/main/java/com/zy/entity/BasCrnOpt.java | 2
src/main/java/com/zy/utils/VersionUtils.java | 11
src/main/java/com/zy/utils/News.java | 2
src/main/java/com/zy/mapper/BasWrkStatusMapper.java | 4
src/main/java/com/zy/utils/Utils.java | 2
174 files changed, 449 insertions(+), 601 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0e0b3b6..c427b83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
</dependencies>
<build>
- <finalName>ykwcs</finalName>
+ <finalName>wcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/Boot.java b/src/main/java/com/zy/Boot.java
index f25a356..2f3a7c0 100644
--- a/src/main/java/com/zy/Boot.java
+++ b/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;
diff --git a/src/main/java/com/zy/asrs/service/MainService.java b/src/main/java/com/zy/asrs/service/MainService.java
deleted file mode 100644
index a2f8ca1..0000000
--- a/src/main/java/com/zy/asrs/service/MainService.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.zy.asrs.service;
-
-public interface MainService {
-}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index fa0d583..1c73e24 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/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;
diff --git a/src/main/java/com/zy/common/service/WmsService.java b/src/main/java/com/zy/common/service/WmsService.java
index d188461..d2690e6 100644
--- a/src/main/java/com/zy/common/service/WmsService.java
+++ b/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;
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index badc290..8ad7105 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/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;
diff --git a/src/main/java/com/zy/common/web/FileController.java b/src/main/java/com/zy/common/web/FileController.java
index f2b7f7a..6bdf468 100644
--- a/src/main/java/com/zy/common/web/FileController.java
+++ b/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;
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/config/AdminInterceptor.java
similarity index 98%
rename from src/main/java/com/zy/common/config/AdminInterceptor.java
rename to src/main/java/com/zy/config/AdminInterceptor.java
index 04ca10f..dc3407c 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/common/config/CoolExceptionHandler.java b/src/main/java/com/zy/config/CoolExceptionHandler.java
similarity index 96%
rename from src/main/java/com/zy/common/config/CoolExceptionHandler.java
rename to src/main/java/com/zy/config/CoolExceptionHandler.java
index 9a6fe2d..3d80d56 100644
--- a/src/main/java/com/zy/common/config/CoolExceptionHandler.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/common/config/RedisConfig.java b/src/main/java/com/zy/config/RedisConfig.java
similarity index 98%
rename from src/main/java/com/zy/common/config/RedisConfig.java
rename to src/main/java/com/zy/config/RedisConfig.java
index d356517..609a09d 100644
--- a/src/main/java/com/zy/common/config/RedisConfig.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/common/config/WebConfig.java b/src/main/java/com/zy/config/WebConfig.java
similarity index 95%
rename from src/main/java/com/zy/common/config/WebConfig.java
rename to src/main/java/com/zy/config/WebConfig.java
index 11bb6b2..f66adeb 100644
--- a/src/main/java/com/zy/common/config/WebConfig.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/controller/ConsoleController.java
similarity index 94%
rename from src/main/java/com/zy/asrs/controller/ConsoleController.java
rename to src/main/java/com/zy/controller/ConsoleController.java
index 208b218..3da518a 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/controller/CrnController.java
similarity index 96%
rename from src/main/java/com/zy/asrs/controller/CrnController.java
rename to src/main/java/com/zy/controller/CrnController.java
index e076aaf..0a83618 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/controller/MonitorController.java
similarity index 98%
rename from src/main/java/com/zy/asrs/controller/MonitorController.java
rename to src/main/java/com/zy/controller/MonitorController.java
index 35e0eae..652a07d 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/controller/NewsController.java b/src/main/java/com/zy/controller/NewsController.java
similarity index 86%
rename from src/main/java/com/zy/asrs/controller/NewsController.java
rename to src/main/java/com/zy/controller/NewsController.java
index a09bc3b..48d73d9 100644
--- a/src/main/java/com/zy/asrs/controller/NewsController.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/controller/RgvController.java
similarity index 95%
rename from src/main/java/com/zy/asrs/controller/RgvController.java
rename to src/main/java/com/zy/controller/RgvController.java
index 06c8f03..d177f2a 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/controller/SiteController.java
similarity index 97%
rename from src/main/java/com/zy/asrs/controller/SiteController.java
rename to src/main/java/com/zy/controller/SiteController.java
index e6b9711..08107b6 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 3341f0a..714c8c1 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/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涓绘祦绋�
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 520f386..7592969 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/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;
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index aaa114d..8fcc8c8 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/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;
diff --git a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
index 1dffde9..fcedb02 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/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;
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index eb6fe1b..b65ca3f 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/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;
/**
diff --git a/src/main/java/com/zy/core/netty/OnlineServer.java b/src/main/java/com/zy/core/netty/OnlineServer.java
index b81091f..1b4c2d8 100644
--- a/src/main/java/com/zy/core/netty/OnlineServer.java
+++ b/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;
diff --git a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java b/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
index 38797f6..bda2ae9 100644
--- a/src/main/java/com/zy/core/netty/handle/PackageServerHandler.java
+++ b/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;
diff --git a/src/main/java/com/zy/core/netty/handle/ProtectorHandler.java b/src/main/java/com/zy/core/netty/handle/ProtectorHandler.java
index a3ac4f2..4a66348 100644
--- a/src/main/java/com/zy/core/netty/handle/ProtectorHandler.java
+++ b/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;
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 6a0d544..fa67951 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/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;
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index fb69130..f7805c9 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/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;
diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
index fb24a86..e329723 100644
--- a/src/main/java/com/zy/core/thread/MelsecCrnThread.java
+++ b/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;
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index ede2cbc..3b2d4cc 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/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;
diff --git a/src/main/java/com/zy/core/thread/ScaleThread.java b/src/main/java/com/zy/core/thread/ScaleThread.java
index ad595c8..fa38cd8 100644
--- a/src/main/java/com/zy/core/thread/ScaleThread.java
+++ b/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;
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 9587987..71def4c 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/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;
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 1c45bd3..5869e51 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/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;
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnError.java b/src/main/java/com/zy/entity/BasCrnError.java
similarity index 99%
rename from src/main/java/com/zy/asrs/entity/BasCrnError.java
rename to src/main/java/com/zy/entity/BasCrnError.java
index 8702140..942db89 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnError.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java b/src/main/java/com/zy/entity/BasCrnOpt.java
similarity index 99%
rename from src/main/java/com/zy/asrs/entity/BasCrnOpt.java
rename to src/main/java/com/zy/entity/BasCrnOpt.java
index ed98925..663bd96 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnp.java b/src/main/java/com/zy/entity/BasCrnp.java
similarity index 98%
rename from src/main/java/com/zy/asrs/entity/BasCrnp.java
rename to src/main/java/com/zy/entity/BasCrnp.java
index 2ce3c36..ed0ce09 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnp.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/entity/BasDevp.java
similarity index 99%
rename from src/main/java/com/zy/asrs/entity/BasDevp.java
rename to src/main/java/com/zy/entity/BasDevp.java
index 1e3d022..6e0c482 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/BasErrLog.java b/src/main/java/com/zy/entity/BasErrLog.java
similarity index 99%
rename from src/main/java/com/zy/asrs/entity/BasErrLog.java
rename to src/main/java/com/zy/entity/BasErrLog.java
index f135e6b..5a3cd54 100644
--- a/src/main/java/com/zy/asrs/entity/BasErrLog.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/BasPlcerror.java b/src/main/java/com/zy/entity/BasPlcerror.java
similarity index 99%
rename from src/main/java/com/zy/asrs/entity/BasPlcerror.java
rename to src/main/java/com/zy/entity/BasPlcerror.java
index f8f681e..e3896fe 100644
--- a/src/main/java/com/zy/asrs/entity/BasPlcerror.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/BasRgv.java b/src/main/java/com/zy/entity/BasRgv.java
similarity index 99%
rename from src/main/java/com/zy/asrs/entity/BasRgv.java
rename to src/main/java/com/zy/entity/BasRgv.java
index 6cbfd58..9ded737 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgv.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvErr.java b/src/main/java/com/zy/entity/BasRgvErr.java
similarity index 98%
rename from src/main/java/com/zy/asrs/entity/BasRgvErr.java
rename to src/main/java/com/zy/entity/BasRgvErr.java
index a6ebd2b..42e2687 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvErr.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvMap.java b/src/main/java/com/zy/entity/BasRgvMap.java
similarity index 96%
rename from src/main/java/com/zy/asrs/entity/BasRgvMap.java
rename to src/main/java/com/zy/entity/BasRgvMap.java
index 300d642..015905d 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvMap.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvOpt.java b/src/main/java/com/zy/entity/BasRgvOpt.java
similarity index 99%
rename from src/main/java/com/zy/asrs/entity/BasRgvOpt.java
rename to src/main/java/com/zy/entity/BasRgvOpt.java
index 0db9725..e19b536 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java b/src/main/java/com/zy/entity/BasWrkIotype.java
similarity index 99%
rename from src/main/java/com/zy/asrs/entity/BasWrkIotype.java
rename to src/main/java/com/zy/entity/BasWrkIotype.java
index 91fb456..8fae018 100644
--- a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java b/src/main/java/com/zy/entity/BasWrkStatus.java
similarity index 98%
rename from src/main/java/com/zy/asrs/entity/BasWrkStatus.java
rename to src/main/java/com/zy/entity/BasWrkStatus.java
index c02168d..8534852 100644
--- a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/entity/LocDetl.java
similarity index 98%
rename from src/main/java/com/zy/asrs/entity/LocDetl.java
rename to src/main/java/com/zy/entity/LocDetl.java
index 87c44d8..ba69072 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/entity/LocMast.java
similarity index 99%
rename from src/main/java/com/zy/asrs/entity/LocMast.java
rename to src/main/java/com/zy/entity/LocMast.java
index cd931b9..54576af 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/entity/MatCode.java
similarity index 99%
rename from src/main/java/com/zy/asrs/entity/MatCode.java
rename to src/main/java/com/zy/entity/MatCode.java
index e6f8431..24512af 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/common/entity/Parameter.java b/src/main/java/com/zy/entity/Parameter.java
similarity index 98%
rename from src/main/java/com/zy/common/entity/Parameter.java
rename to src/main/java/com/zy/entity/Parameter.java
index 548158f..ca8b7c4 100644
--- a/src/main/java/com/zy/common/entity/Parameter.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/entity/RowLastno.java
similarity index 99%
rename from src/main/java/com/zy/asrs/entity/RowLastno.java
rename to src/main/java/com/zy/entity/RowLastno.java
index 07107cd..af3bcf5 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/StaDesc.java b/src/main/java/com/zy/entity/StaDesc.java
similarity index 98%
rename from src/main/java/com/zy/asrs/entity/StaDesc.java
rename to src/main/java/com/zy/entity/StaDesc.java
index 9c61158..bbd8200 100644
--- a/src/main/java/com/zy/asrs/entity/StaDesc.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/entity/WaitPakin.java
similarity index 98%
rename from src/main/java/com/zy/asrs/entity/WaitPakin.java
rename to src/main/java/com/zy/entity/WaitPakin.java
index a18b5bf..ef6c26a 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/entity/WrkDetl.java
similarity index 99%
rename from src/main/java/com/zy/asrs/entity/WrkDetl.java
rename to src/main/java/com/zy/entity/WrkDetl.java
index 05c9703..fb871de 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/WrkLastno.java b/src/main/java/com/zy/entity/WrkLastno.java
similarity index 99%
rename from src/main/java/com/zy/asrs/entity/WrkLastno.java
rename to src/main/java/com/zy/entity/WrkLastno.java
index 514079f..95fb10e 100644
--- a/src/main/java/com/zy/asrs/entity/WrkLastno.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/entity/WrkMast.java
similarity index 98%
rename from src/main/java/com/zy/asrs/entity/WrkMast.java
rename to src/main/java/com/zy/entity/WrkMast.java
index e896efc..aaa0edb 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/entity/WrkMastSta.java
similarity index 99%
rename from src/main/java/com/zy/asrs/entity/WrkMastSta.java
rename to src/main/java/com/zy/entity/WrkMastSta.java
index f3a2b96..8bf4fb7 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSta.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/domain/dto/AxisBean.java b/src/main/java/com/zy/entity/dto/AxisBean.java
similarity index 91%
rename from src/main/java/com/zy/asrs/domain/dto/AxisBean.java
rename to src/main/java/com/zy/entity/dto/AxisBean.java
index 4b86146..02089f8 100644
--- a/src/main/java/com/zy/asrs/domain/dto/AxisBean.java
+++ b/src/main/java/com/zy/entity/dto/AxisBean.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.dto;
+package com.zy.entity.dto;
/**
* 鏇茬嚎鍥捐〃json閿�
diff --git a/src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java b/src/main/java/com/zy/entity/dto/WorkChartAxis.java
similarity index 93%
rename from src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java
rename to src/main/java/com/zy/entity/dto/WorkChartAxis.java
index cbb46b7..bb6318e 100644
--- a/src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java
+++ b/src/main/java/com/zy/entity/dto/WorkChartAxis.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.dto;
+package com.zy.entity.dto;
/**
* 鍏ュ嚭搴撶粺璁℃洸绾垮浘
diff --git a/src/main/java/com/zy/asrs/domain/param/CrnDemoParam.java b/src/main/java/com/zy/entity/param/CrnDemoParam.java
similarity index 88%
rename from src/main/java/com/zy/asrs/domain/param/CrnDemoParam.java
rename to src/main/java/com/zy/entity/param/CrnDemoParam.java
index c724435..6339670 100644
--- a/src/main/java/com/zy/asrs/domain/param/CrnDemoParam.java
+++ b/src/main/java/com/zy/entity/param/CrnDemoParam.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.param;
+package com.zy.entity.param;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java b/src/main/java/com/zy/entity/param/CrnOperatorParam.java
similarity index 93%
rename from src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java
rename to src/main/java/com/zy/entity/param/CrnOperatorParam.java
index f85698e..64e9cfe 100644
--- a/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java
+++ b/src/main/java/com/zy/entity/param/CrnOperatorParam.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.param;
+package com.zy.entity.param;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/domain/param/RgvOperatorParam.java b/src/main/java/com/zy/entity/param/RgvOperatorParam.java
similarity index 91%
rename from src/main/java/com/zy/asrs/domain/param/RgvOperatorParam.java
rename to src/main/java/com/zy/entity/param/RgvOperatorParam.java
index 3b0881f..97dfca5 100644
--- a/src/main/java/com/zy/asrs/domain/param/RgvOperatorParam.java
+++ b/src/main/java/com/zy/entity/param/RgvOperatorParam.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.param;
+package com.zy.entity.param;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java b/src/main/java/com/zy/entity/param/SystemSwitchParam.java
similarity index 94%
rename from src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java
rename to src/main/java/com/zy/entity/param/SystemSwitchParam.java
index 02bec5a..0fb5fa9 100644
--- a/src/main/java/com/zy/asrs/domain/param/SystemSwitchParam.java
+++ b/src/main/java/com/zy/entity/param/SystemSwitchParam.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.param;
+package com.zy.entity.param;
/**
* 绯荤粺杩愯鐘舵�佹搷浣滃叆鍙�
diff --git a/src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java b/src/main/java/com/zy/entity/vo/BarcodeDataVo.java
similarity index 88%
rename from src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java
rename to src/main/java/com/zy/entity/vo/BarcodeDataVo.java
index acfc261..8b97fcd 100644
--- a/src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java
+++ b/src/main/java/com/zy/entity/vo/BarcodeDataVo.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.vo;
+package com.zy.entity.vo;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/domain/vo/CommandLogVo.java b/src/main/java/com/zy/entity/vo/CommandLogVo.java
similarity index 88%
rename from src/main/java/com/zy/asrs/domain/vo/CommandLogVo.java
rename to src/main/java/com/zy/entity/vo/CommandLogVo.java
index 37fa9c0..74b9902 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CommandLogVo.java
+++ b/src/main/java/com/zy/entity/vo/CommandLogVo.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.vo;
+package com.zy.entity.vo;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java b/src/main/java/com/zy/entity/vo/CrnDetailVo.java
similarity index 95%
rename from src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java
rename to src/main/java/com/zy/entity/vo/CrnDetailVo.java
index 434cedc..635d8fa 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnDetailVo.java
+++ b/src/main/java/com/zy/entity/vo/CrnDetailVo.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.vo;
+package com.zy.entity.vo;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java b/src/main/java/com/zy/entity/vo/CrnLatestDataVo.java
similarity index 84%
rename from src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
rename to src/main/java/com/zy/entity/vo/CrnLatestDataVo.java
index 3200202..3b4d4f4 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnLatestDataVo.java
+++ b/src/main/java/com/zy/entity/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;
/**
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java b/src/main/java/com/zy/entity/vo/CrnMsgTableVo.java
similarity index 96%
rename from src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
rename to src/main/java/com/zy/entity/vo/CrnMsgTableVo.java
index ef124a3..de57aaf 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnMsgTableVo.java
+++ b/src/main/java/com/zy/entity/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;
/**
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java b/src/main/java/com/zy/entity/vo/CrnStateTableVo.java
similarity index 96%
rename from src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
rename to src/main/java/com/zy/entity/vo/CrnStateTableVo.java
index 4e9f53a..e0653f5 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnStateTableVo.java
+++ b/src/main/java/com/zy/entity/vo/CrnStateTableVo.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.vo;
+package com.zy.entity.vo;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java b/src/main/java/com/zy/entity/vo/LocChartPie.java
similarity index 94%
rename from src/main/java/com/zy/asrs/domain/vo/LocChartPie.java
rename to src/main/java/com/zy/entity/vo/LocChartPie.java
index 1492d1b..f941999 100644
--- a/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java
+++ b/src/main/java/com/zy/entity/vo/LocChartPie.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.vo;
+package com.zy.entity.vo;
/**
* 搴撲綅鍗犵敤鐧惧垎姣�
diff --git a/src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java b/src/main/java/com/zy/entity/vo/PlcErrorTableVo.java
similarity index 88%
rename from src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java
rename to src/main/java/com/zy/entity/vo/PlcErrorTableVo.java
index 38fed7e..ff436cb 100644
--- a/src/main/java/com/zy/asrs/domain/vo/PlcErrorTableVo.java
+++ b/src/main/java/com/zy/entity/vo/PlcErrorTableVo.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.vo;
+package com.zy.entity.vo;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/domain/vo/RgvMsgTableVo.java b/src/main/java/com/zy/entity/vo/RgvMsgTableVo.java
similarity index 94%
rename from src/main/java/com/zy/asrs/domain/vo/RgvMsgTableVo.java
rename to src/main/java/com/zy/entity/vo/RgvMsgTableVo.java
index 10191ba..13f3258 100644
--- a/src/main/java/com/zy/asrs/domain/vo/RgvMsgTableVo.java
+++ b/src/main/java/com/zy/entity/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;
/**
diff --git a/src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java b/src/main/java/com/zy/entity/vo/RgvStateTableVo.java
similarity index 96%
rename from src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java
rename to src/main/java/com/zy/entity/vo/RgvStateTableVo.java
index a205d5d..4ca81e4 100644
--- a/src/main/java/com/zy/asrs/domain/vo/RgvStateTableVo.java
+++ b/src/main/java/com/zy/entity/vo/RgvStateTableVo.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.vo;
+package com.zy.entity.vo;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/domain/vo/ScaleDataVo.java b/src/main/java/com/zy/entity/vo/ScaleDataVo.java
similarity index 88%
rename from src/main/java/com/zy/asrs/domain/vo/ScaleDataVo.java
rename to src/main/java/com/zy/entity/vo/ScaleDataVo.java
index 1b1aefb..a44ff06 100644
--- a/src/main/java/com/zy/asrs/domain/vo/ScaleDataVo.java
+++ b/src/main/java/com/zy/entity/vo/ScaleDataVo.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.vo;
+package com.zy.entity.vo;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java b/src/main/java/com/zy/entity/vo/SiteDetailVo.java
similarity index 95%
rename from src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
rename to src/main/java/com/zy/entity/vo/SiteDetailVo.java
index 68b61ac..4dcab3c 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteDetailVo.java
+++ b/src/main/java/com/zy/entity/vo/SiteDetailVo.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.vo;
+package com.zy.entity.vo;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java b/src/main/java/com/zy/entity/vo/SiteLatestDataVo.java
similarity index 85%
rename from src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java
rename to src/main/java/com/zy/entity/vo/SiteLatestDataVo.java
index ce27481..725cca3 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteLatestDataVo.java
+++ b/src/main/java/com/zy/entity/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;
/**
diff --git a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java b/src/main/java/com/zy/entity/vo/SiteTableVo.java
similarity index 94%
rename from src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
rename to src/main/java/com/zy/entity/vo/SiteTableVo.java
index 8512360..365a246 100644
--- a/src/main/java/com/zy/asrs/domain/vo/SiteTableVo.java
+++ b/src/main/java/com/zy/entity/vo/SiteTableVo.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.vo;
+package com.zy.entity.vo;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java b/src/main/java/com/zy/enums/CrnStatusType.java
similarity index 96%
rename from src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
rename to src/main/java/com/zy/enums/CrnStatusType.java
index 99b6d01..708d18d 100644
--- a/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/enums/CrnStatusType.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.enums;
+package com.zy.enums;
/**
* 鍫嗗灈鏈虹姸鎬佹灇涓�
diff --git a/src/main/java/com/zy/asrs/domain/enums/RgvStatusType.java b/src/main/java/com/zy/enums/RgvStatusType.java
similarity index 95%
rename from src/main/java/com/zy/asrs/domain/enums/RgvStatusType.java
rename to src/main/java/com/zy/enums/RgvStatusType.java
index ee4e2ce..474a421 100644
--- a/src/main/java/com/zy/asrs/domain/enums/RgvStatusType.java
+++ b/src/main/java/com/zy/enums/RgvStatusType.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.enums;
+package com.zy.enums;
/**
* RGV鐘舵�佹灇涓�
diff --git a/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java b/src/main/java/com/zy/enums/SiteStatusType.java
similarity index 96%
rename from src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
rename to src/main/java/com/zy/enums/SiteStatusType.java
index b3adb37..1e0666f 100644
--- a/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
+++ b/src/main/java/com/zy/enums/SiteStatusType.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.enums;
+package com.zy.enums;
import com.zy.core.model.protocol.StaProtocol;
diff --git a/src/main/java/com/zy/asrs/domain/enums/WorkNoType.java b/src/main/java/com/zy/enums/WorkNoType.java
similarity index 96%
rename from src/main/java/com/zy/asrs/domain/enums/WorkNoType.java
rename to src/main/java/com/zy/enums/WorkNoType.java
index 4aa3911..77fde15 100644
--- a/src/main/java/com/zy/asrs/domain/enums/WorkNoType.java
+++ b/src/main/java/com/zy/enums/WorkNoType.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.domain.enums;
+package com.zy.enums;
import com.core.exception.CoolException;
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnErrorMapper.java b/src/main/java/com/zy/mapper/BasCrnErrorMapper.java
similarity index 78%
rename from src/main/java/com/zy/asrs/mapper/BasCrnErrorMapper.java
rename to src/main/java/com/zy/mapper/BasCrnErrorMapper.java
index 5323679..23effc5 100644
--- a/src/main/java/com/zy/asrs/mapper/BasCrnErrorMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java b/src/main/java/com/zy/mapper/BasCrnOptMapper.java
similarity index 78%
rename from src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java
rename to src/main/java/com/zy/mapper/BasCrnOptMapper.java
index 744c664..ed37644 100644
--- a/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java b/src/main/java/com/zy/mapper/BasCrnpMapper.java
similarity index 78%
rename from src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java
rename to src/main/java/com/zy/mapper/BasCrnpMapper.java
index baffc35..1574bb7 100644
--- a/src/main/java/com/zy/asrs/mapper/BasCrnpMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java b/src/main/java/com/zy/mapper/BasDevpMapper.java
similarity index 87%
rename from src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
rename to src/main/java/com/zy/mapper/BasDevpMapper.java
index 668d2ca..2cc805d 100644
--- a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java b/src/main/java/com/zy/mapper/BasErrLogMapper.java
similarity index 78%
rename from src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java
rename to src/main/java/com/zy/mapper/BasErrLogMapper.java
index cd49855..30097ce 100644
--- a/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java b/src/main/java/com/zy/mapper/BasPlcerrorMapper.java
similarity index 78%
rename from src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java
rename to src/main/java/com/zy/mapper/BasPlcerrorMapper.java
index 93346b1..dee773d 100644
--- a/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/BasRgvErrMapper.java b/src/main/java/com/zy/mapper/BasRgvErrMapper.java
similarity index 78%
rename from src/main/java/com/zy/asrs/mapper/BasRgvErrMapper.java
rename to src/main/java/com/zy/mapper/BasRgvErrMapper.java
index b21d5af..834b1ce 100644
--- a/src/main/java/com/zy/asrs/mapper/BasRgvErrMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/BasRgvMapMapper.java b/src/main/java/com/zy/mapper/BasRgvMapMapper.java
similarity index 86%
rename from src/main/java/com/zy/asrs/mapper/BasRgvMapMapper.java
rename to src/main/java/com/zy/mapper/BasRgvMapMapper.java
index c28c9e3..b391c7e 100644
--- a/src/main/java/com/zy/asrs/mapper/BasRgvMapMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/BasRgvMapper.java b/src/main/java/com/zy/mapper/BasRgvMapper.java
similarity index 78%
rename from src/main/java/com/zy/asrs/mapper/BasRgvMapper.java
rename to src/main/java/com/zy/mapper/BasRgvMapper.java
index b426ee2..1408f61 100644
--- a/src/main/java/com/zy/asrs/mapper/BasRgvMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/BasRgvOptMapper.java b/src/main/java/com/zy/mapper/BasRgvOptMapper.java
similarity index 78%
rename from src/main/java/com/zy/asrs/mapper/BasRgvOptMapper.java
rename to src/main/java/com/zy/mapper/BasRgvOptMapper.java
index 97fbeb1..4107a83 100644
--- a/src/main/java/com/zy/asrs/mapper/BasRgvOptMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java b/src/main/java/com/zy/mapper/BasWrkIotypeMapper.java
similarity index 77%
rename from src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java
rename to src/main/java/com/zy/mapper/BasWrkIotypeMapper.java
index 50f490d..6095fac 100644
--- a/src/main/java/com/zy/asrs/mapper/BasWrkIotypeMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java b/src/main/java/com/zy/mapper/BasWrkStatusMapper.java
similarity index 77%
rename from src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java
rename to src/main/java/com/zy/mapper/BasWrkStatusMapper.java
index 7432bbc..d7a8340 100644
--- a/src/main/java/com/zy/asrs/mapper/BasWrkStatusMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/mapper/LocDetlMapper.java
similarity index 95%
rename from src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
rename to src/main/java/com/zy/mapper/LocDetlMapper.java
index bc2cd84..595007c 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/mapper/LocMastMapper.java
similarity index 95%
rename from src/main/java/com/zy/asrs/mapper/LocMastMapper.java
rename to src/main/java/com/zy/mapper/LocMastMapper.java
index 9fd1d06..7c61d74 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/MatCodeMapper.java b/src/main/java/com/zy/mapper/MatCodeMapper.java
similarity index 78%
rename from src/main/java/com/zy/asrs/mapper/MatCodeMapper.java
rename to src/main/java/com/zy/mapper/MatCodeMapper.java
index a09bd26..d8f711f 100644
--- a/src/main/java/com/zy/asrs/mapper/MatCodeMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/mapper/ReportQueryMapper.java
similarity index 93%
rename from src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
rename to src/main/java/com/zy/mapper/ReportQueryMapper.java
index bd14d54..805fea6 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java b/src/main/java/com/zy/mapper/RowLastnoMapper.java
similarity index 78%
rename from src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java
rename to src/main/java/com/zy/mapper/RowLastnoMapper.java
index bfb9079..546af05 100644
--- a/src/main/java/com/zy/asrs/mapper/RowLastnoMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/StaDescMapper.java b/src/main/java/com/zy/mapper/StaDescMapper.java
similarity index 78%
rename from src/main/java/com/zy/asrs/mapper/StaDescMapper.java
rename to src/main/java/com/zy/mapper/StaDescMapper.java
index 1518045..0a53cdd 100644
--- a/src/main/java/com/zy/asrs/mapper/StaDescMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java b/src/main/java/com/zy/mapper/WaitPakinMapper.java
similarity index 78%
rename from src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
rename to src/main/java/com/zy/mapper/WaitPakinMapper.java
index cbca94b..c27a800 100644
--- a/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/mapper/WrkDetlMapper.java
similarity index 87%
rename from src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
rename to src/main/java/com/zy/mapper/WrkDetlMapper.java
index 3ff2711..dff69f1 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/WrkLastnoMapper.java b/src/main/java/com/zy/mapper/WrkLastnoMapper.java
similarity index 78%
rename from src/main/java/com/zy/asrs/mapper/WrkLastnoMapper.java
rename to src/main/java/com/zy/mapper/WrkLastnoMapper.java
index ebeb20f..3a943a7 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkLastnoMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/mapper/WrkMastMapper.java
similarity index 98%
rename from src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
rename to src/main/java/com/zy/mapper/WrkMastMapper.java
index 2e59546..cddcc58 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java b/src/main/java/com/zy/mapper/WrkMastStaMapper.java
similarity index 93%
rename from src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
rename to src/main/java/com/zy/mapper/WrkMastStaMapper.java
index da34693..2706b03 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/service/BasCrnOptService.java b/src/main/java/com/zy/service/BasCrnOptService.java
similarity index 64%
rename from src/main/java/com/zy/asrs/service/BasCrnOptService.java
rename to src/main/java/com/zy/service/BasCrnOptService.java
index 7538c73..1ff27a5 100644
--- a/src/main/java/com/zy/asrs/service/BasCrnOptService.java
+++ b/src/main/java/com/zy/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> {
diff --git a/src/main/java/com/zy/asrs/service/BasCrnpService.java b/src/main/java/com/zy/service/BasCrnpService.java
similarity index 77%
rename from src/main/java/com/zy/asrs/service/BasCrnpService.java
rename to src/main/java/com/zy/service/BasCrnpService.java
index 10c3feb..fe39b5b 100644
--- a/src/main/java/com/zy/asrs/service/BasCrnpService.java
+++ b/src/main/java/com/zy/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> {
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/service/BasDevpService.java
similarity index 92%
rename from src/main/java/com/zy/asrs/service/BasDevpService.java
rename to src/main/java/com/zy/service/BasDevpService.java
index 8628feb..8eecfa1 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/service/BasErrLogService.java b/src/main/java/com/zy/service/BasErrLogService.java
similarity index 77%
rename from src/main/java/com/zy/asrs/service/BasErrLogService.java
rename to src/main/java/com/zy/service/BasErrLogService.java
index 3c335c1..ce9be6a 100644
--- a/src/main/java/com/zy/asrs/service/BasErrLogService.java
+++ b/src/main/java/com/zy/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> {
diff --git a/src/main/java/com/zy/asrs/service/BasRgvErrService.java b/src/main/java/com/zy/service/BasRgvErrService.java
similarity index 64%
rename from src/main/java/com/zy/asrs/service/BasRgvErrService.java
rename to src/main/java/com/zy/service/BasRgvErrService.java
index a434c73..e26dcfd 100644
--- a/src/main/java/com/zy/asrs/service/BasRgvErrService.java
+++ b/src/main/java/com/zy/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> {
diff --git a/src/main/java/com/zy/asrs/service/BasRgvMapService.java b/src/main/java/com/zy/service/BasRgvMapService.java
similarity index 67%
rename from src/main/java/com/zy/asrs/service/BasRgvMapService.java
rename to src/main/java/com/zy/service/BasRgvMapService.java
index 8090e3e..a8b633c 100644
--- a/src/main/java/com/zy/asrs/service/BasRgvMapService.java
+++ b/src/main/java/com/zy/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> {
diff --git a/src/main/java/com/zy/asrs/service/BasRgvOptService.java b/src/main/java/com/zy/service/BasRgvOptService.java
similarity index 64%
rename from src/main/java/com/zy/asrs/service/BasRgvOptService.java
rename to src/main/java/com/zy/service/BasRgvOptService.java
index 29dd8eb..2161e74 100644
--- a/src/main/java/com/zy/asrs/service/BasRgvOptService.java
+++ b/src/main/java/com/zy/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> {
diff --git a/src/main/java/com/zy/asrs/service/BasRgvService.java b/src/main/java/com/zy/service/BasRgvService.java
similarity index 64%
rename from src/main/java/com/zy/asrs/service/BasRgvService.java
rename to src/main/java/com/zy/service/BasRgvService.java
index 29dac13..38070c7 100644
--- a/src/main/java/com/zy/asrs/service/BasRgvService.java
+++ b/src/main/java/com/zy/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> {
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/service/LocDetlService.java
similarity index 90%
rename from src/main/java/com/zy/asrs/service/LocDetlService.java
rename to src/main/java/com/zy/service/LocDetlService.java
index 737a98c..04ab78f 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/service/LocMastService.java
similarity index 93%
rename from src/main/java/com/zy/asrs/service/LocMastService.java
rename to src/main/java/com/zy/service/LocMastService.java
index bc45966..90b4523 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/service/MainService.java b/src/main/java/com/zy/service/MainService.java
new file mode 100644
index 0000000..dc3b819
--- /dev/null
+++ b/src/main/java/com/zy/service/MainService.java
@@ -0,0 +1,4 @@
+package com.zy.service;
+
+public interface MainService {
+}
diff --git a/src/main/java/com/zy/asrs/service/MatCodeService.java b/src/main/java/com/zy/service/MatCodeService.java
similarity index 64%
rename from src/main/java/com/zy/asrs/service/MatCodeService.java
rename to src/main/java/com/zy/service/MatCodeService.java
index 0f78ed5..f66d484 100644
--- a/src/main/java/com/zy/asrs/service/MatCodeService.java
+++ b/src/main/java/com/zy/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> {
diff --git a/src/main/java/com/zy/asrs/service/RowLastnoService.java b/src/main/java/com/zy/service/RowLastnoService.java
similarity index 64%
rename from src/main/java/com/zy/asrs/service/RowLastnoService.java
rename to src/main/java/com/zy/service/RowLastnoService.java
index dca50fd..f3731d1 100644
--- a/src/main/java/com/zy/asrs/service/RowLastnoService.java
+++ b/src/main/java/com/zy/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> {
diff --git a/src/main/java/com/zy/asrs/service/StaDescService.java b/src/main/java/com/zy/service/StaDescService.java
similarity index 64%
rename from src/main/java/com/zy/asrs/service/StaDescService.java
rename to src/main/java/com/zy/service/StaDescService.java
index b0ea462..7a17345 100644
--- a/src/main/java/com/zy/asrs/service/StaDescService.java
+++ b/src/main/java/com/zy/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> {
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/service/WrkDetlService.java
similarity index 77%
rename from src/main/java/com/zy/asrs/service/WrkDetlService.java
rename to src/main/java/com/zy/service/WrkDetlService.java
index 18f7637..f70beff 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/service/WrkLastnoService.java b/src/main/java/com/zy/service/WrkLastnoService.java
similarity index 64%
rename from src/main/java/com/zy/asrs/service/WrkLastnoService.java
rename to src/main/java/com/zy/service/WrkLastnoService.java
index c3c2df8..8532291 100644
--- a/src/main/java/com/zy/asrs/service/WrkLastnoService.java
+++ b/src/main/java/com/zy/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> {
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/service/WrkMastService.java
similarity index 84%
rename from src/main/java/com/zy/asrs/service/WrkMastService.java
rename to src/main/java/com/zy/service/WrkMastService.java
index 04771dc..08a7a6e 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java b/src/main/java/com/zy/service/impl/BasCrnOptServiceImpl.java
similarity index 61%
rename from src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java
rename to src/main/java/com/zy/service/impl/BasCrnOptServiceImpl.java
index 299afa8..3e332ab 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/service/impl/BasCrnpServiceImpl.java
similarity index 91%
rename from src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
rename to src/main/java/com/zy/service/impl/BasCrnpServiceImpl.java
index 3446c77..e97b297 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/service/impl/BasDevpServiceImpl.java
similarity index 90%
rename from src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
rename to src/main/java/com/zy/service/impl/BasDevpServiceImpl.java
index 1f87a7d..2bd0341 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java b/src/main/java/com/zy/service/impl/BasErrLogServiceImpl.java
similarity index 87%
rename from src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java
rename to src/main/java/com/zy/service/impl/BasErrLogServiceImpl.java
index 817212c..e73cd61 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/service/impl/BasRgvErrServiceImpl.java b/src/main/java/com/zy/service/impl/BasRgvErrServiceImpl.java
similarity index 61%
rename from src/main/java/com/zy/asrs/service/impl/BasRgvErrServiceImpl.java
rename to src/main/java/com/zy/service/impl/BasRgvErrServiceImpl.java
index bd4b40d..6ff5588 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasRgvErrServiceImpl.java
+++ b/src/main/java/com/zy/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")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasRgvMapServiceImpl.java b/src/main/java/com/zy/service/impl/BasRgvMapServiceImpl.java
similarity index 71%
rename from src/main/java/com/zy/asrs/service/impl/BasRgvMapServiceImpl.java
rename to src/main/java/com/zy/service/impl/BasRgvMapServiceImpl.java
index c5d67bb..5059c52 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasRgvMapServiceImpl.java
+++ b/src/main/java/com/zy/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")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasRgvOptServiceImpl.java b/src/main/java/com/zy/service/impl/BasRgvOptServiceImpl.java
similarity index 61%
rename from src/main/java/com/zy/asrs/service/impl/BasRgvOptServiceImpl.java
rename to src/main/java/com/zy/service/impl/BasRgvOptServiceImpl.java
index fb27c6c..6862128 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasRgvOptServiceImpl.java
+++ b/src/main/java/com/zy/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")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasRgvServiceImpl.java b/src/main/java/com/zy/service/impl/BasRgvServiceImpl.java
similarity index 61%
rename from src/main/java/com/zy/asrs/service/impl/BasRgvServiceImpl.java
rename to src/main/java/com/zy/service/impl/BasRgvServiceImpl.java
index 0fbdc7c..8b44e65 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasRgvServiceImpl.java
+++ b/src/main/java/com/zy/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")
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/service/impl/LocDetlServiceImpl.java
similarity index 89%
rename from src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
rename to src/main/java/com/zy/service/impl/LocDetlServiceImpl.java
index 57f3645..ecac30e 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/service/impl/LocMastServiceImpl.java
similarity index 90%
rename from src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
rename to src/main/java/com/zy/service/impl/LocMastServiceImpl.java
index ababf93..333e43d 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/service/impl/MainServiceImpl.java
similarity index 99%
rename from src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
rename to src/main/java/com/zy/service/impl/MainServiceImpl.java
index e321e05..786003a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/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;
/**
diff --git a/src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java b/src/main/java/com/zy/service/impl/MatCodeServiceImpl.java
similarity index 61%
rename from src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java
rename to src/main/java/com/zy/service/impl/MatCodeServiceImpl.java
index 72ae4e0..ecaab6a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatCodeServiceImpl.java
+++ b/src/main/java/com/zy/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")
diff --git a/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java b/src/main/java/com/zy/service/impl/RowLastnoServiceImpl.java
similarity index 61%
rename from src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java
rename to src/main/java/com/zy/service/impl/RowLastnoServiceImpl.java
index 1a32cff..efffe66 100644
--- a/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java
+++ b/src/main/java/com/zy/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")
diff --git a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java b/src/main/java/com/zy/service/impl/StaDescServiceImpl.java
similarity index 61%
rename from src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
rename to src/main/java/com/zy/service/impl/StaDescServiceImpl.java
index 87a3f20..747dfe8 100644
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ b/src/main/java/com/zy/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")
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/service/impl/WrkDetlServiceImpl.java
similarity index 85%
rename from src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
rename to src/main/java/com/zy/service/impl/WrkDetlServiceImpl.java
index 017911a..7214814 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java b/src/main/java/com/zy/service/impl/WrkLastnoServiceImpl.java
similarity index 61%
rename from src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
rename to src/main/java/com/zy/service/impl/WrkLastnoServiceImpl.java
index f069f52..0782f1a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkLastnoServiceImpl.java
+++ b/src/main/java/com/zy/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")
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/service/impl/WrkMastServiceImpl.java
similarity index 87%
rename from src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
rename to src/main/java/com/zy/service/impl/WrkMastServiceImpl.java
index bf4ca83..eb591d6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/system/controller/ConfigController.java b/src/main/java/com/zy/system/controller/ConfigController.java
index a005512..1f795f5 100644
--- a/src/main/java/com/zy/system/controller/ConfigController.java
+++ b/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;
diff --git a/src/main/java/com/zy/common/utils/CollectionUtils.java b/src/main/java/com/zy/utils/CollectionUtils.java
similarity index 92%
rename from src/main/java/com/zy/common/utils/CollectionUtils.java
rename to src/main/java/com/zy/utils/CollectionUtils.java
index 4f0fe4c..dc13391 100644
--- a/src/main/java/com/zy/common/utils/CollectionUtils.java
+++ b/src/main/java/com/zy/utils/CollectionUtils.java
@@ -1,4 +1,4 @@
-package com.zy.common.utils;
+package com.zy.utils;
import java.util.Set;
diff --git a/src/main/java/com/zy/common/utils/CommonUtils.java b/src/main/java/com/zy/utils/CommonUtils.java
similarity index 96%
rename from src/main/java/com/zy/common/utils/CommonUtils.java
rename to src/main/java/com/zy/utils/CommonUtils.java
index d3233b7..031e01b 100644
--- a/src/main/java/com/zy/common/utils/CommonUtils.java
+++ b/src/main/java/com/zy/utils/CommonUtils.java
@@ -1,4 +1,4 @@
-package com.zy.common.utils;
+package com.zy.utils;
import java.math.BigDecimal;
diff --git a/src/main/java/com/zy/common/utils/Http.java b/src/main/java/com/zy/utils/Http.java
similarity index 96%
rename from src/main/java/com/zy/common/utils/Http.java
rename to src/main/java/com/zy/utils/Http.java
index b0f9672..5c59528 100644
--- a/src/main/java/com/zy/common/utils/Http.java
+++ b/src/main/java/com/zy/utils/Http.java
@@ -1,4 +1,4 @@
-package com.zy.common.utils;
+package com.zy.utils;
import com.alibaba.fastjson.JSON;
diff --git a/src/main/java/com/zy/common/utils/HttpHandler.java b/src/main/java/com/zy/utils/HttpHandler.java
similarity index 99%
rename from src/main/java/com/zy/common/utils/HttpHandler.java
rename to src/main/java/com/zy/utils/HttpHandler.java
index 70adcc7..eb9dacd 100644
--- a/src/main/java/com/zy/common/utils/HttpHandler.java
+++ b/src/main/java/com/zy/utils/HttpHandler.java
@@ -1,4 +1,4 @@
-package com.zy.common.utils;
+package com.zy.utils;
import okhttp3.*;
diff --git a/src/main/java/com/zy/common/utils/News.java b/src/main/java/com/zy/utils/News.java
similarity index 99%
rename from src/main/java/com/zy/common/utils/News.java
rename to src/main/java/com/zy/utils/News.java
index 63c8762..dc69822 100644
--- a/src/main/java/com/zy/common/utils/News.java
+++ b/src/main/java/com/zy/utils/News.java
@@ -1,4 +1,4 @@
-package com.zy.common.utils;
+package com.zy.utils;
import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/zy/common/utils/QrCode.java b/src/main/java/com/zy/utils/QrCode.java
similarity index 98%
rename from src/main/java/com/zy/common/utils/QrCode.java
rename to src/main/java/com/zy/utils/QrCode.java
index 174d713..350a354 100644
--- a/src/main/java/com/zy/common/utils/QrCode.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java b/src/main/java/com/zy/utils/RandomValidateCodeUtil.java
similarity index 98%
rename from src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java
rename to src/main/java/com/zy/utils/RandomValidateCodeUtil.java
index fd04503..d5d04fd 100644
--- a/src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/common/utils/RedisUtil.java b/src/main/java/com/zy/utils/RedisUtil.java
similarity index 99%
rename from src/main/java/com/zy/common/utils/RedisUtil.java
rename to src/main/java/com/zy/utils/RedisUtil.java
index b2df114..c0488f1 100644
--- a/src/main/java/com/zy/common/utils/RedisUtil.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/common/utils/ReflectUtils.java b/src/main/java/com/zy/utils/ReflectUtils.java
similarity index 98%
rename from src/main/java/com/zy/common/utils/ReflectUtils.java
rename to src/main/java/com/zy/utils/ReflectUtils.java
index 470e6e0..cb81037 100644
--- a/src/main/java/com/zy/common/utils/ReflectUtils.java
+++ b/src/main/java/com/zy/utils/ReflectUtils.java
@@ -1,4 +1,4 @@
-package com.zy.common.utils;
+package com.zy.utils;
import com.core.common.Cools;
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/utils/RouteUtils.java
similarity index 99%
rename from src/main/java/com/zy/asrs/utils/RouteUtils.java
rename to src/main/java/com/zy/utils/RouteUtils.java
index 6a11135..82d8d3a 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/utils/RouteUtils.java
@@ -1,4 +1,4 @@
-package com.zy.asrs.utils;
+package com.zy.utils;
import com.zy.core.enums.RouteCollectCountType;
diff --git a/src/main/java/com/zy/common/utils/Struct.java b/src/main/java/com/zy/utils/Struct.java
similarity index 99%
rename from src/main/java/com/zy/common/utils/Struct.java
rename to src/main/java/com/zy/utils/Struct.java
index 0ee0939..3a89117 100644
--- a/src/main/java/com/zy/common/utils/Struct.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/utils/Utils.java
similarity index 99%
rename from src/main/java/com/zy/asrs/utils/Utils.java
rename to src/main/java/com/zy/utils/Utils.java
index 36a0324..ec92253 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/utils/VersionUtils.java
similarity index 93%
rename from src/main/java/com/zy/asrs/utils/VersionUtils.java
rename to src/main/java/com/zy/utils/VersionUtils.java
index 0e8be1f..5a6a4b9 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/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;
/**
diff --git a/src/main/java/com/zy/common/utils/excel/EnInitData.java b/src/main/java/com/zy/utils/excel/EnInitData.java
similarity index 96%
rename from src/main/java/com/zy/common/utils/excel/EnInitData.java
rename to src/main/java/com/zy/utils/excel/EnInitData.java
index e352810..23a28a2 100644
--- a/src/main/java/com/zy/common/utils/excel/EnInitData.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/common/utils/excel/EnInitDataListener.java b/src/main/java/com/zy/utils/excel/EnInitDataListener.java
similarity index 97%
rename from src/main/java/com/zy/common/utils/excel/EnInitDataListener.java
rename to src/main/java/com/zy/utils/excel/EnInitDataListener.java
index 2a54e8f..4fa2144 100644
--- a/src/main/java/com/zy/common/utils/excel/EnInitDataListener.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/java/com/zy/common/utils/excel/ExcelUtils.java b/src/main/java/com/zy/utils/excel/ExcelUtils.java
similarity index 96%
rename from src/main/java/com/zy/common/utils/excel/ExcelUtils.java
rename to src/main/java/com/zy/utils/excel/ExcelUtils.java
index 0532402..6fe4cbc 100644
--- a/src/main/java/com/zy/common/utils/excel/ExcelUtils.java
+++ b/src/main/java/com/zy/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;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cfdc523..72d67cf 100644
--- a/src/main/resources/application.yml
+++ b/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
\ No newline at end of file
+ staArr: 104
\ No newline at end of file
diff --git a/src/main/resources/mapper/BasCrnErrorMapper.xml b/src/main/resources/mapper/BasCrnErrorMapper.xml
index e911e0f..1578443 100644
--- a/src/main/resources/mapper/BasCrnErrorMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/BasCrnpMapper.xml b/src/main/resources/mapper/BasCrnpMapper.xml
index b9a10bc..6431eb9 100644
--- a/src/main/resources/mapper/BasCrnpMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index b00be22..73fe347 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/BasPlcerrorMapper.xml b/src/main/resources/mapper/BasPlcerrorMapper.xml
index 58c22d4..25a1fd8 100644
--- a/src/main/resources/mapper/BasPlcerrorMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/BasRgvErrMapper.xml b/src/main/resources/mapper/BasRgvErrMapper.xml
index c3eb284..1fc9b75 100644
--- a/src/main/resources/mapper/BasRgvErrMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/BasRgvMapMapper.xml b/src/main/resources/mapper/BasRgvMapMapper.xml
index bee3fae..a089b58 100644
--- a/src/main/resources/mapper/BasRgvMapMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/BasRgvMapper.xml b/src/main/resources/mapper/BasRgvMapper.xml
index a826fab..6907823 100644
--- a/src/main/resources/mapper/BasRgvMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/BasRgvOptMapper.xml b/src/main/resources/mapper/BasRgvOptMapper.xml
index febd94a..1304757 100644
--- a/src/main/resources/mapper/BasRgvOptMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/BasWrkIotypeMapper.xml b/src/main/resources/mapper/BasWrkIotypeMapper.xml
index 814748c..5b6e9e8 100644
--- a/src/main/resources/mapper/BasWrkIotypeMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/BasWrkStatusMapper.xml b/src/main/resources/mapper/BasWrkStatusMapper.xml
index e363bf4..6a2d04e 100644
--- a/src/main/resources/mapper/BasWrkStatusMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 4fb3cbf..48cfab8 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 7821af2..26e5424 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/MatCodeMapper.xml b/src/main/resources/mapper/MatCodeMapper.xml
index 8e78b20..f8f11be 100644
--- a/src/main/resources/mapper/MatCodeMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/RowLastnoMapper.xml b/src/main/resources/mapper/RowLastnoMapper.xml
index 45639f6..2760008 100644
--- a/src/main/resources/mapper/RowLastnoMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/StaDescMapper.xml b/src/main/resources/mapper/StaDescMapper.xml
index 5c4c726..612d4ae 100644
--- a/src/main/resources/mapper/StaDescMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/WaitPakinMapper.xml b/src/main/resources/mapper/WaitPakinMapper.xml
index 4615185..39ca703 100644
--- a/src/main/resources/mapper/WaitPakinMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index da1c6d3..6e87030 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/WrkLastnoMapper.xml b/src/main/resources/mapper/WrkLastnoMapper.xml
index 86bc298..f9658b2 100644
--- a/src/main/resources/mapper/WrkLastnoMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 7921056..6ce2d79 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/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" />
diff --git a/src/main/resources/mapper/WrkMastStaMapper.xml b/src/main/resources/mapper/WrkMastStaMapper.xml
index 6997839..52e4667 100644
--- a/src/main/resources/mapper/WrkMastStaMapper.xml
+++ b/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" />
--
Gitblit v1.9.1