From 03b588712e7f044e267460ee234dc9de27605b5b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 12 Jun 2024 08:13:49 +0800
Subject: [PATCH] md

---
 .gitignore                                    |   3 +
 .idea/compiler.xml                            |   3 +
 .idea/encodings.xml                           |   2 +
 .../Maven__com_xdadan_emis_biz_1_0_2.xml      |  13 --
 .../Maven__com_xdadan_emis_common_1_0_4.xml   |  13 --
 .../Maven__com_xdadan_emis_system_1_0_4.xml   |  13 --
 .idea/modules.xml                             |   1 +
 emis-oms2c-web/emis-oms2c-web.iml             |   6 +-
 emis-oms2c-web/pom.xml                        |   2 +-
 .../erp/web/oms2c/Oms2cCommonController.java  |  18 +-
 .../web/oms2c/Oms2cCommonToolsController.java |   8 +-
 .../erp/web/oms2c/Oms2cCountryController.java |  16 +-
 .../oms2c/Oms2cCustomerAccountController.java |  14 +-
 .../oms2c/Oms2cCustomerAddressController.java |  16 +-
 .../Oms2cCustomerSettleBillController.java    |  14 +-
 .../oms2c/Oms2cCustomerUserController.java    |  16 +-
 .../erp/web/oms2c/Oms2cGoodsController.java   |  16 +-
 .../erp/web/oms2c/Oms2cRegionController.java  |  16 +-
 .../web/oms2c/Oms2cTransLineController.java   |  14 +-
 .../oms2c/Oms2cTransProductController.java    |  16 +-
 .../erp/web/oms2c/Oms2cWaybillController.java |  22 +-
 emis-oms2c/emis-oms2c.iml                     | 213 ++++++++++++++++++
 pom.xml                                       |   1 +
 23 files changed, 319 insertions(+), 137 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 .idea/libraries/Maven__com_xdadan_emis_biz_1_0_2.xml
 delete mode 100644 .idea/libraries/Maven__com_xdadan_emis_common_1_0_4.xml
 delete mode 100644 .idea/libraries/Maven__com_xdadan_emis_system_1_0_4.xml
 create mode 100644 emis-oms2c/emis-oms2c.iml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..db239f5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/emis-oms2c-web/target/
+/emis-oms2c/target/
+
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 90a3424..730cbe9 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,15 +2,18 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="emis-oms2c-web" />
+        <module name="emis-oms2c" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
       <module name="emis" target="1.8" />
+      <module name="emis-oms2c" target="1.8" />
       <module name="emis-oms2c-web" target="8" />
     </bytecodeTargetLevel>
   </component>
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index aa28e66..2803771 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,5 +2,7 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/emis-oms2c-web/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/emis-oms2c/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/emis-oms2c/src/main/resources" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_xdadan_emis_biz_1_0_2.xml b/.idea/libraries/Maven__com_xdadan_emis_biz_1_0_2.xml
deleted file mode 100644
index 8172db3..0000000
--- a/.idea/libraries/Maven__com_xdadan_emis_biz_1_0_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.xdadan:emis-biz:1.0.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-biz/1.0.2/emis-biz-1.0.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-biz/1.0.2/emis-biz-1.0.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-biz/1.0.2/emis-biz-1.0.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_xdadan_emis_common_1_0_4.xml b/.idea/libraries/Maven__com_xdadan_emis_common_1_0_4.xml
deleted file mode 100644
index e89cdd9..0000000
--- a/.idea/libraries/Maven__com_xdadan_emis_common_1_0_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.xdadan:emis-common:1.0.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-common/1.0.4/emis-common-1.0.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-common/1.0.4/emis-common-1.0.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-common/1.0.4/emis-common-1.0.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_xdadan_emis_system_1_0_4.xml b/.idea/libraries/Maven__com_xdadan_emis_system_1_0_4.xml
deleted file mode 100644
index e627ca2..0000000
--- a/.idea/libraries/Maven__com_xdadan_emis_system_1_0_4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.xdadan:emis-system:1.0.4">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-system/1.0.4/emis-system-1.0.4.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-system/1.0.4/emis-system-1.0.4-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/xdadan/emis-system/1.0.4/emis-system-1.0.4-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index ece09f4..18a5103 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/emis.iml" filepath="$PROJECT_DIR$/emis.iml" />
+      <module fileurl="file://$PROJECT_DIR$/emis-oms2c/emis-oms2c.iml" filepath="$PROJECT_DIR$/emis-oms2c/emis-oms2c.iml" />
       <module fileurl="file://$PROJECT_DIR$/emis-oms2c-web/emis-oms2c-web.iml" filepath="$PROJECT_DIR$/emis-oms2c-web/emis-oms2c-web.iml" />
     </modules>
   </component>
diff --git a/emis-oms2c-web/emis-oms2c-web.iml b/emis-oms2c-web/emis-oms2c-web.iml
index 061ecb0..c27fb5a 100644
--- a/emis-oms2c-web/emis-oms2c-web.iml
+++ b/emis-oms2c-web/emis-oms2c-web.iml
@@ -21,7 +21,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: com.xdadan:emis-oms-framework:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: com.xdadan:emis-oms-system:1.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.xdadan:emis-oms-common:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.5.10" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.10" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.10" level="project" />
@@ -78,8 +77,8 @@
     <orderEntry type="library" name="Maven: com.github.oshi:oshi-core:6.1.2" level="project" />
     <orderEntry type="library" name="Maven: net.java.dev.jna:jna:5.10.0" level="project" />
     <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:5.10.0" level="project" />
-    <orderEntry type="library" name="Maven: com.xdadan:emis-biz:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: com.xdadan:emis-common:1.0.4" level="project" />
+    <orderEntry type="module" module-name="emis-oms2c" />
+    <orderEntry type="library" name="Maven: com.xdadan:emis-oms-common:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.16" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.5.10" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.5.5" level="project" />
@@ -242,7 +241,6 @@
     <orderEntry type="library" name="Maven: com.github.ulisesbocchio:jasypt-spring-boot-starter:2.1.2" level="project" />
     <orderEntry type="library" name="Maven: com.github.ulisesbocchio:jasypt-spring-boot:2.1.2" level="project" />
     <orderEntry type="library" name="Maven: org.jasypt:jasypt:1.9.3" level="project" />
-    <orderEntry type="library" name="Maven: com.xdadan:emis-system:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.28" level="project" />
     <orderEntry type="library" name="Maven: com.googlecode.aviator:aviator:5.2.4" level="project" />
     <orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.6" level="project" />
diff --git a/emis-oms2c-web/pom.xml b/emis-oms2c-web/pom.xml
index 46b7872..b8d50a5 100644
--- a/emis-oms2c-web/pom.xml
+++ b/emis-oms2c-web/pom.xml
@@ -33,7 +33,7 @@
 
         <dependency>
             <groupId>com.xdadan</groupId>
-            <artifactId>emis-biz</artifactId>
+            <artifactId>emis-oms2c</artifactId>
             <version>1.0.2</version>
             <scope>compile</scope>
         </dependency>
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCommonController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCommonController.java
index 939b745..77c1743 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCommonController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCommonController.java
@@ -13,15 +13,15 @@ package com.xdadan.erp.web.oms2c;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.xdadan.erp.common.annotation.Log;
-import com.xdadan.erp.common.core.controller.BaseController;
-import com.xdadan.erp.common.core.domain.AjaxResult;
-import com.xdadan.erp.common.core.page.TableDataInfo;
-import com.xdadan.erp.common.core.redis.RedissonService;
-import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.DateUtils;
-import com.xdadan.erp.common.utils.SecurityUtils;
-import com.xdadan.erp.common.utils.poi.ExcelUtil;
+import com.xdadan.erp.oms.common.annotation.Log;
+import com.xdadan.erp.oms.common.core.controller.BaseController;
+import com.xdadan.erp.oms.common.core.domain.AjaxResult;
+import com.xdadan.erp.oms.common.core.page.TableDataInfo;
+import com.xdadan.erp.oms.common.core.redis.RedissonService;
+import com.xdadan.erp.oms.common.enums.BusinessType;
+import com.xdadan.erp.oms.common.utils.DateUtils;
+import com.xdadan.erp.oms.common.utils.SecurityUtils;
+import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 import com.xdadan.erp.emis.domain.EmisBrand;
 import com.xdadan.erp.emis.domain.EmisPrintTpl;
 import com.xdadan.erp.emis.domain.EmisWaybill;
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCommonToolsController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCommonToolsController.java
index d1900e8..c618094 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCommonToolsController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCommonToolsController.java
@@ -11,10 +11,10 @@
 
 package com.xdadan.erp.web.oms2c;
 
-import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
-import com.xdadan.erp.common.core.controller.BaseController;
-import com.xdadan.erp.common.core.domain.AjaxResult;
-import com.xdadan.erp.common.core.page.TableDataInfo;
+import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.oms.common.core.controller.BaseController;
+import com.xdadan.erp.oms.common.core.domain.AjaxResult;
+import com.xdadan.erp.oms.common.core.page.TableDataInfo;
 import com.xdadan.erp.emis.domain.EmisSite;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.vo.AddressParseResult;
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCountryController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCountryController.java
index 74a08d5..826bcb9 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCountryController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCountryController.java
@@ -14,7 +14,7 @@ package com.xdadan.erp.web.oms2c;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.emis.domain.EmisSite;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,13 +29,13 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.xdadan.erp.common.annotation.Log;
-import com.xdadan.erp.common.core.controller.BaseController;
-import com.xdadan.erp.common.core.domain.AjaxResult;
-import com.xdadan.erp.common.core.page.TableDataInfo;
-import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.StringUtils;
-import com.xdadan.erp.common.utils.poi.ExcelUtil;
+import com.xdadan.erp.oms.common.annotation.Log;
+import com.xdadan.erp.oms.common.core.controller.BaseController;
+import com.xdadan.erp.oms.common.core.domain.AjaxResult;
+import com.xdadan.erp.oms.common.core.page.TableDataInfo;
+import com.xdadan.erp.oms.common.enums.BusinessType;
+import com.xdadan.erp.oms.common.utils.StringUtils;
+import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisCountry;
 import com.xdadan.erp.emis.service.IEmisCountryService;
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerAccountController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerAccountController.java
index 7d935dd..e4b136d 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerAccountController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerAccountController.java
@@ -17,13 +17,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import com.xdadan.erp.common.annotation.Log;
-import com.xdadan.erp.common.core.controller.BaseController;
-import com.xdadan.erp.common.core.domain.AjaxResult;
-import com.xdadan.erp.common.core.page.TableDataInfo;
-import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.StringUtils;
-import com.xdadan.erp.common.utils.poi.ExcelUtil;
+import com.xdadan.erp.oms.common.annotation.Log;
+import com.xdadan.erp.oms.common.core.controller.BaseController;
+import com.xdadan.erp.oms.common.core.domain.AjaxResult;
+import com.xdadan.erp.oms.common.core.page.TableDataInfo;
+import com.xdadan.erp.oms.common.enums.BusinessType;
+import com.xdadan.erp.oms.common.utils.StringUtils;
+import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisCustomerAccount;
 import com.xdadan.erp.emis.service.IEmisCustomerAccountService;
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerAddressController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerAddressController.java
index ee2c966..1ca0745 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerAddressController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerAddressController.java
@@ -14,19 +14,19 @@ package com.xdadan.erp.web.oms2c;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
-import com.xdadan.erp.common.core.domain.entity.SysUser;
+import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.oms.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import com.xdadan.erp.common.annotation.Log;
-import com.xdadan.erp.common.core.controller.BaseController;
-import com.xdadan.erp.common.core.domain.AjaxResult;
-import com.xdadan.erp.common.core.page.TableDataInfo;
-import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.poi.ExcelUtil;
+import com.xdadan.erp.oms.common.annotation.Log;
+import com.xdadan.erp.oms.common.core.controller.BaseController;
+import com.xdadan.erp.oms.common.core.domain.AjaxResult;
+import com.xdadan.erp.oms.common.core.page.TableDataInfo;
+import com.xdadan.erp.oms.common.enums.BusinessType;
+import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisCustomerAddress;
 import com.xdadan.erp.emis.service.IEmisCustomerAddressService;
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerSettleBillController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerSettleBillController.java
index 6dd85a3..fc73622 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerSettleBillController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerSettleBillController.java
@@ -24,13 +24,13 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.xdadan.erp.common.annotation.Log;
-import com.xdadan.erp.common.core.controller.BaseController;
-import com.xdadan.erp.common.core.domain.AjaxResult;
-import com.xdadan.erp.common.core.page.TableDataInfo;
-import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.StringUtils;
-import com.xdadan.erp.common.utils.poi.ExcelUtil;
+import com.xdadan.erp.oms.common.annotation.Log;
+import com.xdadan.erp.oms.common.core.controller.BaseController;
+import com.xdadan.erp.oms.common.core.domain.AjaxResult;
+import com.xdadan.erp.oms.common.core.page.TableDataInfo;
+import com.xdadan.erp.oms.common.enums.BusinessType;
+import com.xdadan.erp.oms.common.utils.StringUtils;
+import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisCustomerSettleBill;
 import com.xdadan.erp.emis.service.IEmisCustomerSettleBillService;
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerUserController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerUserController.java
index 43b02fe..49b65e8 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerUserController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cCustomerUserController.java
@@ -14,7 +14,7 @@ package com.xdadan.erp.web.oms2c;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.emis.domain.EmisDestination;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.service.EmisBaseService;
@@ -30,13 +30,13 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.xdadan.erp.common.annotation.Log;
-import com.xdadan.erp.common.core.controller.BaseController;
-import com.xdadan.erp.common.core.domain.AjaxResult;
-import com.xdadan.erp.common.core.page.TableDataInfo;
-import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.StringUtils;
-import com.xdadan.erp.common.utils.poi.ExcelUtil;
+import com.xdadan.erp.oms.common.annotation.Log;
+import com.xdadan.erp.oms.common.core.controller.BaseController;
+import com.xdadan.erp.oms.common.core.domain.AjaxResult;
+import com.xdadan.erp.oms.common.core.page.TableDataInfo;
+import com.xdadan.erp.oms.common.enums.BusinessType;
+import com.xdadan.erp.oms.common.utils.StringUtils;
+import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisCustomerUser;
 import com.xdadan.erp.emis.service.IEmisCustomerUserService;
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cGoodsController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cGoodsController.java
index bd75c83..5e98f7b 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cGoodsController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cGoodsController.java
@@ -14,7 +14,7 @@ package com.xdadan.erp.web.oms2c;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.emis.domain.EmisTransProduct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -27,13 +27,13 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.xdadan.erp.common.annotation.Log;
-import com.xdadan.erp.common.core.controller.BaseController;
-import com.xdadan.erp.common.core.domain.AjaxResult;
-import com.xdadan.erp.common.core.page.TableDataInfo;
-import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.StringUtils;
-import com.xdadan.erp.common.utils.poi.ExcelUtil;
+import com.xdadan.erp.oms.common.annotation.Log;
+import com.xdadan.erp.oms.common.core.controller.BaseController;
+import com.xdadan.erp.oms.common.core.domain.AjaxResult;
+import com.xdadan.erp.oms.common.core.page.TableDataInfo;
+import com.xdadan.erp.oms.common.enums.BusinessType;
+import com.xdadan.erp.oms.common.utils.StringUtils;
+import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisGoods;
 import com.xdadan.erp.emis.service.IEmisGoodsService;
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cRegionController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cRegionController.java
index e3bb1d7..b48dff0 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cRegionController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cRegionController.java
@@ -14,7 +14,7 @@ package com.xdadan.erp.web.oms2c;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.emis.domain.EmisCountry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -27,13 +27,13 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.xdadan.erp.common.annotation.Log;
-import com.xdadan.erp.common.core.controller.BaseController;
-import com.xdadan.erp.common.core.domain.AjaxResult;
-import com.xdadan.erp.common.core.page.TableDataInfo;
-import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.StringUtils;
-import com.xdadan.erp.common.utils.poi.ExcelUtil;
+import com.xdadan.erp.oms.common.annotation.Log;
+import com.xdadan.erp.oms.common.core.controller.BaseController;
+import com.xdadan.erp.oms.common.core.domain.AjaxResult;
+import com.xdadan.erp.oms.common.core.page.TableDataInfo;
+import com.xdadan.erp.oms.common.enums.BusinessType;
+import com.xdadan.erp.oms.common.utils.StringUtils;
+import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisRegion;
 import com.xdadan.erp.emis.service.IEmisRegionService;
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cTransLineController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cTransLineController.java
index 3bcb104..2af48cf 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cTransLineController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cTransLineController.java
@@ -14,7 +14,7 @@ package com.xdadan.erp.web.oms2c;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.emis.domain.EmisCountry;
 import com.xdadan.erp.emis.domain.EmisSite;
 import com.xdadan.erp.emis.service.EmisBaseService;
@@ -30,12 +30,12 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.xdadan.erp.common.annotation.Log;
-import com.xdadan.erp.common.core.controller.BaseController;
-import com.xdadan.erp.common.core.domain.AjaxResult;
-import com.xdadan.erp.common.core.page.TableDataInfo;
-import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.poi.ExcelUtil;
+import com.xdadan.erp.oms.common.annotation.Log;
+import com.xdadan.erp.oms.common.core.controller.BaseController;
+import com.xdadan.erp.oms.common.core.domain.AjaxResult;
+import com.xdadan.erp.oms.common.core.page.TableDataInfo;
+import com.xdadan.erp.oms.common.enums.BusinessType;
+import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisTransLine;
 import com.xdadan.erp.emis.service.IEmisTransLineService;
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cTransProductController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cTransProductController.java
index a7a0767..0be7215 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cTransProductController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cTransProductController.java
@@ -14,7 +14,7 @@ package com.xdadan.erp.web.oms2c;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.emis.domain.EmisBrand;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -27,13 +27,13 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.xdadan.erp.common.annotation.Log;
-import com.xdadan.erp.common.core.controller.BaseController;
-import com.xdadan.erp.common.core.domain.AjaxResult;
-import com.xdadan.erp.common.core.page.TableDataInfo;
-import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.StringUtils;
-import com.xdadan.erp.common.utils.poi.ExcelUtil;
+import com.xdadan.erp.oms.common.annotation.Log;
+import com.xdadan.erp.oms.common.core.controller.BaseController;
+import com.xdadan.erp.oms.common.core.domain.AjaxResult;
+import com.xdadan.erp.oms.common.core.page.TableDataInfo;
+import com.xdadan.erp.oms.common.enums.BusinessType;
+import com.xdadan.erp.oms.common.utils.StringUtils;
+import com.xdadan.erp.oms.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisTransProduct;
 import com.xdadan.erp.emis.service.IEmisTransProductService;
diff --git a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cWaybillController.java b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cWaybillController.java
index 3d89b58..69a41a8 100644
--- a/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cWaybillController.java
+++ b/emis-oms2c-web/src/main/java/com/xdadan/erp/web/oms2c/Oms2cWaybillController.java
@@ -22,12 +22,12 @@ import cn.hutool.core.io.FileUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
-import com.xdadan.erp.common.config.PayConfig;
-import com.xdadan.erp.common.core.domain.entity.SysUser;
-import com.xdadan.erp.common.utils.DateUtils;
-import com.xdadan.erp.common.utils.file.FileUtils;
-import com.xdadan.erp.common.utils.idgen.UUID;
+import com.xdadan.erp.oms.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.oms.common.config.PayConfig;
+import com.xdadan.erp.oms.common.core.domain.entity.SysUser;
+import com.xdadan.erp.oms.common.utils.DateUtils;
+import com.xdadan.erp.oms.common.utils.file.FileUtils;
+import com.xdadan.erp.oms.common.utils.idgen.UUID;
 import com.xdadan.erp.emis.domain.EmisBrand;
 import com.xdadan.erp.emis.domain.EmisCountry;
 import com.xdadan.erp.emis.domain.EmisTmsScanRecord;
@@ -50,11 +50,11 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import com.xdadan.erp.common.annotation.Log;
-import com.xdadan.erp.common.core.controller.BaseController;
-import com.xdadan.erp.common.core.domain.AjaxResult;
-import com.xdadan.erp.common.core.page.TableDataInfo;
-import com.xdadan.erp.common.enums.BusinessType;
+import com.xdadan.erp.oms.common.annotation.Log;
+import com.xdadan.erp.oms.common.core.controller.BaseController;
+import com.xdadan.erp.oms.common.core.domain.AjaxResult;
+import com.xdadan.erp.oms.common.core.page.TableDataInfo;
+import com.xdadan.erp.oms.common.enums.BusinessType;
 
 import com.xdadan.erp.emis.domain.EmisWaybill;
 
diff --git a/emis-oms2c/emis-oms2c.iml b/emis-oms2c/emis-oms2c.iml
new file mode 100644
index 0000000..cd2e8ca
--- /dev/null
+++ b/emis-oms2c/emis-oms2c.iml
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.xdadan:emis-oms-common:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.16" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.16" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.16" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.16" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.16" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.16" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.16" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.5.10" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.10" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.1" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.16" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.5.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.5.5" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.9" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.5.10" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.58" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.2.Final" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.12.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.12.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.12.6" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.79" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:SparseBitSet:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.28" level="project" />
+    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.5.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.16" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.16" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:3.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
+    <orderEntry type="library" name="Maven: org.redisson:redisson:3.10.0" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.74.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.74.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.74.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.74.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.74.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.74.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.74.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.74.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-tcnative-classes:2.0.48.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.cache:cache-api:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.15" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex.rxjava2:rxjava:2.2.21" level="project" />
+    <orderEntry type="library" name="Maven: de.ruedigermoeller:fst:2.56" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.5.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.6" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.22" level="project" />
+    <orderEntry type="library" name="Maven: org.jodd:jodd-bean:3.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.jodd:jodd-core:3.7.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.9.0" level="project" />
+    <orderEntry type="library" name="Maven: eu.bitwalker:UserAgentUtils:1.21" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
+    <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.13.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun.oss:aliyun-sdk-oss:3.10.2" level="project" />
+    <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:3.4.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ram:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-sts:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ecs:4.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-kms:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
+    <orderEntry type="library" name="Maven: io.minio:minio:8.4.5" level="project" />
+    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:30.1.1-jre" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.5.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" />
+    <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.8.4" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-starter:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.classgraph:classgraph:4.8.83" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webflux:3.0.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-oas:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-core:1.5.22" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-boot-starter:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-data-rest:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.22" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.5.10" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.16" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-lang:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-cache:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-hash:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.8.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.zxing:javase:3.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.beust:jcommander:1.48" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jai-imageio:jai-imageio-core:1.3.1" level="project" />
+    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-s3:1.12.215" level="project" />
+    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-kms:1.12.215" level="project" />
+    <orderEntry type="library" name="Maven: com.amazonaws:aws-java-sdk-core:1.12.215" level="project" />
+    <orderEntry type="library" name="Maven: software.amazon.ion:ion-java:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.6" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.8.1" level="project" />
+    <orderEntry type="library" name="Maven: com.amazonaws:jmespath-java:1.12.215" level="project" />
+    <orderEntry type="library" name="Maven: com.github.ulisesbocchio:jasypt-spring-boot-starter:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.ulisesbocchio:jasypt-spring-boot:2.1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.jasypt:jasypt:1.9.3" level="project" />
+    <orderEntry type="library" name="Maven: com.xdadan:emis-oms-system:1.0.4" level="project" />
+    <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.28" level="project" />
+    <orderEntry type="library" name="Maven: com.googlecode.aviator:aviator:5.2.4" level="project" />
+    <orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.6" level="project" />
+    <orderEntry type="library" name="Maven: com.itextpdf:itext-asian:5.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.itextpdf.tool:xmlworker:5.5.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.pdfbox:pdfbox:2.0.9" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.pdfbox:fontbox:2.0.9" level="project" />
+    <orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.11" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1f81721..3bcc133 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
 
     <modules>
 
+        <module>emis-oms2c</module>
         <module>emis-oms2c-web</module>
 
     </modules>