Merge remote-tracking branch 'origin/develop' into develop

pengcheng
2 parents da8473e1 57897606
Showing 48 changed files with 3376 additions and 1037 deletions
.idea/encodings.xml
.idea/workspace.xml
pom.xml
src/main/java/com/huaheng/common/annotation/Excels.java
src/main/java/com/huaheng/common/config/Global.java
src/main/java/com/huaheng/common/exception/BusinessException.java
src/main/java/com/huaheng/common/utils/DateUtils.java
src/main/java/com/huaheng/common/utils/YamlUtil.java
src/main/java/com/huaheng/common/utils/file/FileUtils.java
src/main/java/com/huaheng/common/utils/poi/ExcelUtil.java
src/main/java/com/huaheng/common/utils/reflect/ReflectUtils.java
src/main/java/com/huaheng/framework/aspectj/lang/annotation/Excel.java
src/main/java/com/huaheng/pc/common/CommonController.java
src/main/java/com/huaheng/pc/config/receiptType/controller/receiptTypeController.java
src/main/java/com/huaheng/pc/receipt/receiptType/domain/ReceiptType.java → src/main/java/com/huaheng/pc/config/receiptType/domain/ReceiptType.java
src/main/java/com/huaheng/pc/receipt/receiptType/mapper/ReceiptTypeMapper.java → src/main/java/com/huaheng/pc/config/receiptType/mapper/ReceiptTypeMapper.java
src/main/java/com/huaheng/pc/receipt/receiptType/service/ReceiptTypeService.java → src/main/java/com/huaheng/pc/config/receiptType/service/ReceiptTypeService.java
src/main/java/com/huaheng/pc/config/receiptType/service/ReceiptTypeServiceImpl.java
src/main/java/com/huaheng/pc/general/carrier/controller/CarrierController.java
src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
+  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources/application.yml" charset="UTF-8" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>
 \ No newline at end of file
@@ -2,15 +2,21 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/receiptType/controller/receiptTypeController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/general/BomDetailMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptType/add.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptType/edit.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptType/receiptType.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/static/img/qr_code.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/login.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptType/domain/ReceiptType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/receiptType/domain/ReceiptType.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptType/mapper/ReceiptTypeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/receiptType/mapper/ReceiptTypeMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptType/service/ReceiptTypeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/receiptType/service/ReceiptTypeService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptType/service/ReceiptTypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/receiptType/service/ReceiptTypeServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/receipt/ReceiptTypeMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ReceiptTypeMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/tool/import/import.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/tool/import/import.html" afterDir="false" />
     </list>
-    <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -28,36 +34,32 @@
     <option name="HIDDEN_KINDS">
       <set />
     </option>
-    <expand />
+    <expand>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
+      </path>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
+        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
+      </path>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
+        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
+        <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
+      </path>
+    </expand>
     <select />
   </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pom.xml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="248">
-              <caret line="16" column="40" selection-start-line="16" selection-start-column="40" selection-end-line="16" selection-end-column="40" />
-            </state>
-          </provider>
-          <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="289">
-              <caret line="40" column="24" selection-start-line="40" selection-start-column="24" selection-end-line="40" selection-end-column="24" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
+        <option value="FxmlFile" />
+        <option value="Interface" />
         <option value="Class" />
+        <option value="HTML File" />
       </list>
     </option>
   </component>
@@ -69,21 +71,6 @@
       </map>
     </option>
   </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html" />
-        <option value="$PROJECT_DIR$/src/main/resources/application-druid.properties" />
-        <option value="$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java" />
-        <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/templates/index.html" />
-        <option value="$PROJECT_DIR$/src/main/resources/templates/login.html" />
-      </list>
-    </option>
-  </component>
   <component name="IgnoredFileRootStore">
     <option name="generatedRoots">
       <set>
@@ -91,201 +78,14 @@
       </set>
     </option>
   </component>
-  <component name="MavenImportPreferences">
-    <option name="importingSettings">
-      <MavenImportingSettings>
-        <option name="importAutomatically" value="true" />
-      </MavenImportingSettings>
-    </option>
-  </component>
-  <component name="MavenProjectNavigator">
-    <treeState>
-      <expand>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-        </path>
-        <path>
-          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
-          <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
-          <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
-        </path>
-      </expand>
-      <select />
-    </treeState>
-  </component>
-  <component name="MavenRunner">
-    <option name="skipTests" value="true" />
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-10" />
-    <option name="y" value="-10" />
-    <option name="width" value="1940" />
-    <option name="height" value="1100" />
-  </component>
   <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="2" id="Add" />
   </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
-              <item name="pc" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
-              <item name="pc" type="462c0819:PsiDirectoryNode" />
-              <item name="inventory" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
-              <item name="pc" type="462c0819:PsiDirectoryNode" />
-              <item name="inventory" type="462c0819:PsiDirectoryNode" />
-              <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
-              <item name="pc" type="462c0819:PsiDirectoryNode" />
-              <item name="inventory" type="462c0819:PsiDirectoryNode" />
-              <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
-              <item name="pc" type="462c0819:PsiDirectoryNode" />
-              <item name="inventory" type="462c0819:PsiDirectoryNode" />
-              <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="static" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com.huaheng.test" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="PackagesPane" />
-    </panes>
-  </component>
   <component name="PropertiesComponent">
     <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
     <property name="DatabaseDriversLRU" value="mysql" />
+    <property name="DefaultHtmlFileTemplate" value="HTML File" />
     <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
     <property name="RequestMappingsPanelOrder0" value="0" />
     <property name="RequestMappingsPanelOrder1" value="1" />
@@ -294,22 +94,39 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis/config" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
     <property name="node.js.path.for.package.tslint" value="project" />
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+    <property name="nodejs_package_manager_path" value="npm" />
+    <property name="project.structure.last.edited" value="Project" />
+    <property name="project.structure.proportion" value="0.0" />
+    <property name="project.structure.side.proportion" value="0.0" />
+    <property name="settings.editor.selected.configurable" value="File.Encoding" />
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="E:\code\wms2\src\main\resources\templates\general\carrier" />
       <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
       <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
     </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
+      <recent name="E:\code\wms2\src\main\java\com\huaheng\pc\config" />
+      <recent name="E:\code\wms2\src\main\resources\static\ajax\libs\layui\lay\modules" />
+      <recent name="E:\code\wms2\target\classes\static\file" />
+      <recent name="E:\code\wms2\src\main\resources\static\file" />
+    </key>
   </component>
   <component name="RunDashboard">
+    <option name="configurationTypes">
+      <set>
+        <option value="SpringBootApplicationConfigurationType" />
+      </set>
+    </option>
     <option name="ruleStates">
       <list>
         <RuleState>
@@ -323,10 +140,9 @@
   </component>
   <component name="RunManager">
     <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="wms2" />
+      <module name="huaheng" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-      <option name="ALTERNATIVE_JRE_PATH" value="C:\Program Files\Java\jdk1.8.0_202\jre" />
+      <option name="ALTERNATIVE_JRE_PATH" />
       <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <method v="2">
@@ -345,8 +161,18 @@
   <component name="ServiceViewManager">
     <option name="allServicesViewState">
       <serviceView>
+        <option name="contentProportion" value="0.18875067" />
         <treeState>
-          <expand />
+          <expand>
+            <path>
+              <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
+              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@5ef312b7" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+            </path>
+            <path>
+              <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
+              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@28150ae" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+            </path>
+          </expand>
           <select />
         </treeState>
       </serviceView>
@@ -369,7 +195,22 @@
       <workItem from="1565311988064" duration="7176000" />
       <workItem from="1565328536669" duration="797000" />
       <workItem from="1565345715376" duration="452000" />
-      <workItem from="1565570424829" duration="697000" />
+      <workItem from="1565570424829" duration="11663000" />
+      <workItem from="1565587737758" duration="12961000" />
+      <workItem from="1565657307503" duration="115000" />
+      <workItem from="1565657439247" duration="2447000" />
+      <workItem from="1565662229227" duration="20296000" />
+      <workItem from="1565691345079" duration="6000" />
+      <workItem from="1565743087352" duration="10121000" />
+      <workItem from="1565760941070" duration="6738000" />
+      <workItem from="1565768341327" duration="2970000" />
+      <workItem from="1565771864886" duration="599000" />
+      <workItem from="1565772469694" duration="23000" />
+      <workItem from="1565772518459" duration="4348000" />
+      <workItem from="1565829438280" duration="3502000" />
+      <workItem from="1565832950552" duration="86000" />
+      <workItem from="1565833039573" duration="288000" />
+      <workItem from="1565833342181" duration="13946000" />
     </task>
     <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
       <created>1565226427512</created>
@@ -399,49 +240,72 @@
       <option name="project" value="LOCAL" />
       <updated>1565342188814</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="添加userWarehouse">
+      <created>1565571202923</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1565571202923</updated>
+    </task>
+    <task id="LOCAL-00006" summary="添加containerCapacity">
+      <created>1565578920011</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1565578920011</updated>
+    </task>
+    <task id="LOCAL-00007" summary="添加物料页面">
+      <created>1565593159103</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1565593159103</updated>
+    </task>
+    <task id="LOCAL-00008" summary="添加商品详情">
+      <created>1565598117104</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1565598117104</updated>
+    </task>
+    <task id="LOCAL-00009" summary="添加物料时判断单位是否存在，不存在则添加物料单位">
+      <created>1565659672152</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1565659672152</updated>
+    </task>
+    <task id="LOCAL-00010" summary="添加task实体类">
+      <created>1565665525508</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1565665525508</updated>
+    </task>
+    <task id="LOCAL-00011" summary="添加商品、商品详情页面">
+      <created>1565686619774</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1565686619774</updated>
+    </task>
+    <task id="LOCAL-00012" summary="添加承运商">
+      <created>1565745258070</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1565745258070</updated>
+    </task>
+    <task id="LOCAL-00013" summary="添加物料导入、导出模板，添加Excel导入导出配置文件">
+      <created>1565833218584</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1565833218584</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
-  <component name="ToolWindowManager">
-    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
-    <editor active="true" />
-    <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4967462" visible="true" weight="0.28820375" />
-      <window_info id="Structure" order="1" sideWeight="0.5032538" side_tool="true" weight="0.1673774" />
-      <window_info id="Designer" order="2" />
-      <window_info id="UI Designer" order="3" />
-      <window_info id="Favorites" order="4" side_tool="true" />
-      <window_info id="Capture Tool" order="5" />
-      <window_info id="Web" order="6" side_tool="true" />
-      <window_info id="Image Layers" order="7" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.2407932" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Spring" order="7" />
-      <window_info anchor="bottom" id="Terminal" order="8" />
-      <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
-      <window_info anchor="bottom" id="Java Enterprise" order="10" weight="0.3286119" />
-      <window_info anchor="bottom" id="Database Changes" order="11" />
-      <window_info anchor="bottom" id="Version Control" order="12" weight="0.8427762" />
-      <window_info anchor="bottom" id="Docker" order="13" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Messages" order="14" weight="0.329718" />
-      <window_info anchor="bottom" id="MyBatis Log" order="15" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.22334754" />
-      <window_info anchor="right" id="Palette" order="4" />
-      <window_info anchor="right" id="Capture Analysis" order="5" />
-      <window_info anchor="right" id="Database" order="6" weight="0.32995737" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Theme Preview" order="8" />
-      <window_info anchor="right" id="Bean Validation" order="9" weight="0.32995737" />
-    </layout>
-  </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
@@ -451,20 +315,7 @@
         <entry key="MAIN">
           <value>
             <State>
-              <option name="RECENTLY_FILTERED_USER_GROUPS">
-                <collection />
-              </option>
-              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
-                <collection />
-              </option>
-              <option name="COLUMN_ORDER">
-                <list>
-                  <option value="0" />
-                  <option value="1" />
-                  <option value="2" />
-                  <option value="3" />
-                </list>
-              </option>
+              <option name="COLUMN_ORDER" />
             </State>
           </value>
         </entry>
@@ -490,168 +341,44 @@
     <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
     <MESSAGE value="修改库区service" />
     <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" />
-    <MESSAGE value="配置文件更新修改" />
-    <MESSAGE value="修复页面字典明细报错" />
-    <MESSAGE value="更新json库和druid的jar包" />
-    <option name="LAST_COMMIT_MESSAGE" value="更新json库和druid的jar包" />
+    <MESSAGE value="添加userWarehouse" />
+    <MESSAGE value="添加containerCapacity" />
+    <MESSAGE value="添加物料页面" />
+    <MESSAGE value="添加商品详情" />
+    <MESSAGE value="添加物料时判断单位是否存在，不存在则添加物料单位" />
+    <MESSAGE value="添加task实体类" />
+    <MESSAGE value="添加商品、商品详情页面" />
+    <MESSAGE value="添加承运商" />
+    <MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" />
+    <option name="LAST_COMMIT_MESSAGE" value="添加物料导入、导出模板，添加Excel导入导出配置文件" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url>
-          <line>78</line>
-          <properties />
-          <option name="timeStamp" value="1" />
+          <line>198</line>
+          <option name="timeStamp" value="11" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/poi/ExcelUtil.java</url>
+          <line>302</line>
+          <option name="timeStamp" value="12" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url>
+          <line>187</line>
+          <option name="timeStamp" value="16" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java</url>
+          <line>66</line>
+          <option name="timeStamp" value="24" />
         </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/redis/RedisConfig.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengServletInitializer.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/redis/serviceimpl/RedisServiceImpl.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-272">
-          <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/report/excelReport/service/ExcelReportService.java">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="113">
-          <caret line="147" column="39" selection-start-line="147" selection-start-column="39" selection-end-line="147" selection-end-column="39" />
-          <folding>
-            <element signature="e#3376#3377#0" expanded="true" />
-            <element signature="e#3415#3416#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="372">
-          <caret line="311" column="16" selection-start-line="311" selection-start-column="16" selection-end-line="311" selection-end-column="16" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2980">
-          <caret line="149" column="10" selection-start-line="149" selection-start-column="10" selection-end-line="149" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="1054" column="29" lean-forward="true" selection-start-line="1054" selection-start-column="29" selection-end-line="1054" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/com.huaheng.test/EncryptPassword.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="8" column="70" selection-start-line="8" selection-start-column="70" selection-end-line="8" selection-end-column="70" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="88">
-          <caret line="11" column="3" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/include.html">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/main.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1548" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-526">
-          <caret line="8" column="43" selection-start-line="8" selection-start-column="43" selection-end-line="8" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/favicon.ico">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/user.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/locked.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/progress.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/loading.gif">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/sprite-skin-flat.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/qr_code.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/profile.jpg">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/bg.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/webuploader.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="248">
-          <caret line="16" column="40" selection-start-line="16" selection-start-column="40" selection-end-line="16" selection-end-column="40" />
-        </state>
-      </provider>
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="40" column="24" selection-start-line="40" selection-start-column="24" selection-end-line="40" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
+  <component name="com.intellij.coverage.CoverageDataManagerImpl">
+    <SUITE FILE_PATH="coverage/wmsv2$HuaHengApplication.ic" NAME="HuaHengApplication Coverage Results" MODIFIED="1565752188059" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
   </component>
 </project>
 \ No newline at end of file
@@ -246,7 +246,7 @@
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi-ooxml</artifactId>
-			<version>3.9</version>
+			<version>3.17</version>
 		</dependency>
 		<!--activiti工作流-->
@@ -337,6 +337,12 @@
 			<artifactId>mybatis-plus-annotation</artifactId>
 			<version>3.1.2</version>
 		</dependency>
+
+		<!-- yml解析器 -->
+		<dependency>
+			<groupId>org.yaml</groupId>
+			<artifactId>snakeyaml</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
+package com.huaheng.common.annotation;
+
+import com.huaheng.framework.aspectj.lang.annotation.Excel;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Excel注解集
+ *
+ * @author ruoyi
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Excels
+{
+    Excel[] value();
+}
+package com.huaheng.common.config;
+
+import java.io.FileNotFoundException;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.huaheng.common.utils.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.ruoyi.common.utils.YamlUtil;
+
+/**
+ * 全局配置类
+ *
+ * @author ruoyi
+ */
+public class Global
+{
+    private static final Logger log = LoggerFactory.getLogger(Global.class);
+
+    private static String NAME = "application.yml";
+
+    /**
+     * 当前对象实例
+     */
+    private static Global global;
+
+    /**
+     * 保存全局属性值
+     */
+    private static Map<String, String> map = new HashMap<String, String>();
+
+    private Global()
+    {
+    }
+
+    /**
+     * 静态工厂方法
+     */
+    public static synchronized Global getInstance()
+    {
+        if (global == null)
+        {
+            global = new Global();
+        }
+        return global;
+    }
+
+    /**
+     * 获取配置
+     */
+    public static String getConfig(String key)
+    {
+        String value = map.get(key);
+        if (value == null)
+        {
+            Map<?, ?> yamlMap = null;
+            try
+            {
+                yamlMap = YamlUtil.loadYaml(NAME);
+                value = String.valueOf(YamlUtil.getProperty(yamlMap, key));
+                map.put(key, value != null ? value : StringUtils.EMPTY);
+            }
+            catch (FileNotFoundException e)
+            {
+                log.error("获取全局配置异常 {}", key);
+            }
+        }
+        return value;
+    }
+
+    /**
+     * 获取项目名称
+     */
+    public static String getName()
+    {
+        return StringUtils.nvl(getConfig("huaheng.name"), "RuoYi");
+    }
+
+    /**
+     * 获取项目版本
+     */
+    public static String getVersion()
+    {
+        return StringUtils.nvl(getConfig("huaheng.version"), "4.0.0");
+    }
+
+    /**
+     * 获取版权年份
+     */
+    public static String getCopyrightYear()
+    {
+        return StringUtils.nvl(getConfig("huaheng.copyrightYear"), "2019");
+    }
+
+    /**
+     * 实例演示开关
+     */
+    public static String isDemoEnabled()
+    {
+        return StringUtils.nvl(getConfig("huaheng.demoEnabled"), "true");
+    }
+
+    /**
+     * 获取ip地址开关
+     */
+    public static Boolean isAddressEnabled()
+    {
+        return Boolean.valueOf(getConfig("huaheng.addressEnabled"));
+    }
+
+    /**
+     * 获取文件上传路径
+     */
+    public static String getProfile()
+    {
+        return getConfig("huaheng.profile");
+    }
+
+    /**
+     * 获取头像上传路径
+     */
+    public static String getAvatarPath()
+    {
+        return getProfile() + "/avatar";
+    }
+
+    /**
+     * 获取下载路径
+     */
+    public static String getDownloadPath()
+    {
+        return getProfile() + "/download";
+    }
+
+    /**
+     * 获取上传路径
+     */
+    public static String getUploadPath()
+    {
+        return getProfile() + "/upload";
+    }
+}
+package com.huaheng.common.exception;
+
+/**
+ * 业务异常
+ *
+ * @author huaheng
+ */
+public class BusinessException extends RuntimeException{
+    private static final long serialVersionUID = 1L;
+
+    protected final String message;
+
+    public BusinessException(String message) {
+        this.message = message;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+}
@@ -10,7 +10,7 @@ import org.apache.commons.lang3.time.DateFormatUtils;
  * 
  * @author huaheng
  */
-public class DateUtils
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 {
     public static String YYYY = "yyyy";
@@ -22,6 +22,11 @@ public class DateUtils
     public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+    private static String[] parsePatterns = {
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
+            "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
+            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+
     /**
      * 获取当前Date型日期
      * 
@@ -97,4 +102,23 @@ public class DateUtils
         return DateFormatUtils.format(now, "yyyyMMdd");
     }
+    /**
+     * 日期型字符串转化为日期 格式
+     */
+    public static Date parseDate(Object str)
+    {
+        if (str == null)
+        {
+            return null;
+        }
+        try
+        {
+            return parseDate(str.toString(), parsePatterns);
+        }
+        catch (ParseException e)
+        {
+            return null;
+        }
+    }
+
 }
+package com.ruoyi.common.utils;
+
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.Yaml;
+import com.huaheng.common.utils.StringUtils;
+
+/**
+ * 配置处理工具类
+ *
+ * @author yml
+ */
+public class YamlUtil
+{
+    public static Map<?, ?> loadYaml(String fileName) throws FileNotFoundException
+    {
+        InputStream in = YamlUtil.class.getClassLoader().getResourceAsStream(fileName);
+        return StringUtils.isNotEmpty(fileName) ? (LinkedHashMap<?, ?>) new Yaml().load(in) : null;
+    }
+
+    public static void dumpYaml(String fileName, Map<?, ?> map) throws IOException
+    {
+        if (StringUtils.isNotEmpty(fileName))
+        {
+            FileWriter fileWriter = new FileWriter(YamlUtil.class.getResource(fileName).getFile());
+            DumperOptions options = new DumperOptions();
+            options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+            Yaml yaml = new Yaml(options);
+            yaml.dump(map, fileWriter);
+        }
+    }
+
+    public static Object getProperty(Map<?, ?> map, Object qualifiedKey)
+    {
+        if (map != null && !map.isEmpty() && qualifiedKey != null)
+        {
+            String input = String.valueOf(qualifiedKey);
+            if (!"".equals(input))
+            {
+                if (input.contains("."))
+                {
+                    int index = input.indexOf(".");
+                    String left = input.substring(0, index);
+                    String right = input.substring(index + 1, input.length());
+                    return getProperty((Map<?, ?>) map.get(left), right);
+                }
+                else if (map.containsKey(input))
+                {
+                    return map.get(input);
+                }
+                else
+                {
+                    return null;
+                }
+            }
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static void setProperty(Map<?, ?> map, Object qualifiedKey, Object value)
+    {
+        if (map != null && !map.isEmpty() && qualifiedKey != null)
+        {
+            String input = String.valueOf(qualifiedKey);
+            if (!input.equals(""))
+            {
+                if (input.contains("."))
+                {
+                    int index = input.indexOf(".");
+                    String left = input.substring(0, index);
+                    String right = input.substring(index + 1, input.length());
+                    setProperty((Map<?, ?>) map.get(left), right, value);
+                }
+                else
+                {
+                    ((Map<Object, Object>) map).put(qualifiedKey, value);
+                }
+            }
+        }
+    }
+}
 \ No newline at end of file
 package com.huaheng.common.utils.file;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
+import javax.servlet.http.HttpServletRequest;
+import java.io.*;
+import java.net.URLEncoder;
 /**
  * 文件处理工具类
@@ -13,11 +11,13 @@ import java.io.OutputStream;
  */
 public class FileUtils
 {
+    public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";
     /**
      * 输出指定文件的byte数组
-     * 
-     * @param filename 文件
+     *
+     * @param filePath 文件路径
+     * @param os 输出流
      * @return
      */
     public static void writeBytes(String filePath, OutputStream os) throws IOException
@@ -88,4 +88,51 @@ public class FileUtils
         return flag;
     }
+    /**
+     * 文件名称验证
+     *
+     * @param filename 文件名称
+     * @return true 正常 false 非法
+     */
+    public static boolean isValidFilename(String filename)
+    {
+        return filename.matches(FILENAME_PATTERN);
+    }
+
+    /**
+     * 下载文件名重新编码
+     *
+     * @param request 请求对象
+     * @param fileName 文件名
+     * @return 编码后的文件名
+     */
+    public static String setFileDownloadHeader(HttpServletRequest request, String fileName)
+            throws UnsupportedEncodingException
+    {
+        final String agent = request.getHeader("USER-AGENT");
+        String filename = fileName;
+        if (agent.contains("MSIE"))
+        {
+            // IE浏览器
+            filename = URLEncoder.encode(filename, "utf-8");
+            filename = filename.replace("+", " ");
+        }
+        else if (agent.contains("Firefox"))
+        {
+            // 火狐浏览器
+            filename = new String(fileName.getBytes(), "ISO8859-1");
+        }
+        else if (agent.contains("Chrome"))
+        {
+            // google浏览器
+            filename = URLEncoder.encode(filename, "utf-8");
+        }
+        else
+        {
+            // 其它浏览器
+            filename = URLEncoder.encode(filename, "utf-8");
+        }
+        return filename;
+    }
+
 }
 package com.huaheng.common.utils.poi;
-import java.io.FileNotFoundException;
+import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.math.BigDecimal;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import org.apache.poi.hssf.usermodel.DVConstraint;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFDataValidation;
-import org.apache.poi.hssf.usermodel.HSSFFont;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.HSSFColor;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import com.huaheng.common.annotation.Excels;
+import com.huaheng.common.config.Global;
+import com.huaheng.common.exception.BusinessException;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.DateUtils;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.reflect.ReflectUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Excel;
+import com.huaheng.framework.aspectj.lang.annotation.Excel.Type;
+import com.huaheng.framework.web.domain.AjaxResult;
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.DataValidation;
+import org.apache.poi.ss.usermodel.DataValidationConstraint;
+import org.apache.poi.ss.usermodel.DataValidationHelper;
+import org.apache.poi.ss.usermodel.DateUtil;
+import org.apache.poi.ss.usermodel.FillPatternType;
+import org.apache.poi.ss.usermodel.Font;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.usermodel.IndexedColors;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFDataValidation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.util.ResourceUtils;
-import com.huaheng.common.utils.StringUtils;
-import com.huaheng.framework.aspectj.lang.annotation.Excel;
-import com.huaheng.framework.shiro.web.session.OnlineWebSessionManager;
-import com.huaheng.framework.web.domain.AjaxResult;
-
-import javax.servlet.http.HttpServletResponse;
 /**
  * Excel相关处理
- * 
- * @author huaheng
+ *
+ * @author ruoyi
  */
 public class ExcelUtil<T>
 {
+    private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
+
+    /**
+     * Excel sheet最大行数，默认65536
+     */
+    public static final int sheetSize = 65536;
+
+    /**
+     * 工作表名称
+     */
+    private String sheetName;
-    private static final Logger log = LoggerFactory.getLogger(OnlineWebSessionManager.class);
+    /**
+     * 导出类型（EXPORT:导出数据；IMPORT：导入模板）
+     */
+    private Type type;
+    /**
+     * 工作薄对象
+     */
+    private Workbook wb;
+
+    /**
+     * 工作表对象
+     */
+    private Sheet sheet;
+
+    /**
+     * 样式列表
+     */
+    private Map<String, CellStyle> styles;
+
+    /**
+     * 导入导出数据列表
+     */
+    private List<T> list;
+
+    /**
+     * 注解列表
+     */
+    private List<Object[]> fields;
+
+    /**
+     * 实体对象
+     */
     public Class<T> clazz;
     public ExcelUtil(Class<T> clazz)
@@ -53,29 +110,80 @@ public class ExcelUtil&lt;T&gt;
         this.clazz = clazz;
     }
-    public ExcelUtil()
+    public void init(List<T> list, String sheetName, Type type)
     {
+        if (list == null)
+        {
+            list = new ArrayList<T>();
+        }
+        this.list = list;
+        this.sheetName = sheetName;
+        this.type = type;
+        createExcelField();
+        createWorkbook();
     }
-    public List<T> importExcel(String sheetName, InputStream input) throws Exception
+
+    /**
+     * 对excel表单默认第一个索引名转换成list
+     *
+     * @param is 输入流
+     * @return 转换后集合
+     */
+    public List<T> importExcel(InputStream is) throws Exception
     {
-        List<T> list = new ArrayList<T>();
+        return importExcel(StringUtils.EMPTY, is);
+    }
-        Workbook workbook = WorkbookFactory.create(input);
-        Sheet sheet = workbook.getSheet(sheetName);
+    /**
+     * 对excel表单指定表格索引名转换成list
+     *
+     * @param sheetName 表格索引名
+     * @param is 输入流
+     * @return 转换后集合
+     */
+    public List<T> importExcel(String sheetName, InputStream is) throws Exception
+    {
+        this.type = Type.IMPORT;
+        this.wb = WorkbookFactory.create(is);
+        List<T> list = new ArrayList<T>();
+        Sheet sheet = null;
         if (StringUtils.isNotEmpty(sheetName))
         {
             // 如果指定sheet名,则取指定sheet中的内容.
-            sheet = workbook.getSheet(sheetName);
+            sheet = wb.getSheet(sheetName);
         }
-        if (sheet == null)
+        else
         {
             // 如果传入的sheet名不存在则默认指向第1个sheet.
-            sheet = workbook.getSheetAt(0);
+            sheet = wb.getSheetAt(0);
         }
+
+        if (sheet == null)
+        {
+            throw new IOException("文件sheet不存在");
+        }
+
         int rows = sheet.getPhysicalNumberOfRows();
         if (rows > 0)
         {
+            // 定义一个map用于存放excel列的序号和field.
+            Map<String, Integer> cellMap = new HashMap<String, Integer>();
+            // 获取表头
+            Row heard = sheet.getRow(0);
+            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
+            {
+                Cell cell = heard.getCell(i);
+                if (StringUtils.isNotNull(cell != null))
+                {
+                    String value = this.getCellValue(heard, i).toString();
+                    cellMap.put(value, i);
+                }
+                else
+                {
+                    cellMap.put(null, i);
+                }
+            }
             // 有数据时才处理 得到类的所有field.
             Field[] allFields = clazz.getDeclaredFields();
             // 定义一个map用于存放列的序号和field.
@@ -83,461 +191,391 @@ public class ExcelUtil&lt;T&gt;
             for (int col = 0; col < allFields.length; col++)
             {
                 Field field = allFields[col];
-                // 将有注解的field存放到map中.
-                if (field.isAnnotationPresent(Excel.class))
+                Excel attr = field.getAnnotation(Excel.class);
+                if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
                 {
                     // 设置类的私有字段属性可访问.
                     field.setAccessible(true);
-                    fieldsMap.put(col, field);
+                    Integer column = cellMap.get(attr.name());
+                    fieldsMap.put(column, field);
                 }
             }
             for (int i = 1; i < rows; i++)
             {
                 // 从第2行开始取数据,默认第一行是表头.
                 Row row = sheet.getRow(i);
-                int cellNum = sheet.getRow(0).getPhysicalNumberOfCells();
                 T entity = null;
-                for (int j = 0; j < cellNum; j++)
+                for (Map.Entry<Integer, Field> entry : fieldsMap.entrySet())
                 {
-                    Cell cell = row.getCell(j);
-                    if (cell == null)
-                    {
-                        continue;
-                    }
-                    else
-                    {
-                        // 先设置Cell的类型，然后就可以把纯数字作为String类型读进来了
-                        row.getCell(j).setCellType(Cell.CELL_TYPE_STRING);
-                        cell = row.getCell(j);
-                    }
-
-                    String c = cell.getStringCellValue();
-                    if (StringUtils.isEmpty(c))
-                    {
-                        continue;
-                    }
+                    Object val = this.getCellValue(row, entry.getKey());
                     // 如果不存在实例则新建.
                     entity = (entity == null ? clazz.newInstance() : entity);
                     // 从map中得到对应列的field.
-                    Field field = fieldsMap.get(j);
+                    Field field = fieldsMap.get(entry.getKey());
                     // 取得类型,并根据对象类型设置值.
                     Class<?> fieldType = field.getType();
                     if (String.class == fieldType)
                     {
-                        field.set(entity, String.valueOf(c));
+                        String s = Convert.toStr(val);
+                        if (StringUtils.endsWith(s, ".0"))
+                        {
+                            val = StringUtils.substringBefore(s, ".0");
+                        }
+                        else
+                        {
+                            val = Convert.toStr(val);
+                        }
                     }
                     else if ((Integer.TYPE == fieldType) || (Integer.class == fieldType))
                     {
-                        field.set(entity, Integer.parseInt(c));
+                        val = Convert.toInt(val);
                     }
-                    else if ((Integer.TYPE == fieldType) || (Integer.class == fieldType))
+                    else if ((Long.TYPE == fieldType) || (Long.class == fieldType))
                     {
-                        field.set(entity, Integer.valueOf(c));
+                        val = Convert.toLong(val);
                     }
-                    else if ((Float.TYPE == fieldType) || (Float.class == fieldType))
+                    else if ((Double.TYPE == fieldType) || (Double.class == fieldType))
                     {
-                        field.set(entity, Float.valueOf(c));
+                        val = Convert.toDouble(val);
                     }
-                    else if ((Short.TYPE == fieldType) || (Short.class == fieldType))
+                    else if ((Float.TYPE == fieldType) || (Float.class == fieldType))
                     {
-                        field.set(entity, Short.valueOf(c));
+                        val = Convert.toFloat(val);
                     }
-                    else if ((Double.TYPE == fieldType) || (Double.class == fieldType))
+                    else if (BigDecimal.class == fieldType)
                     {
-                        field.set(entity, Double.valueOf(c));
+                        val = Convert.toBigDecimal(val);
                     }
-                    else if (Character.TYPE == fieldType)
+                    else if (Date.class == fieldType)
                     {
-                        if ((c != null) && (c.length() > 0))
+                        if (val instanceof String)
+                        {
+                            val = DateUtils.parseDate(val);
+                        }
+                        else if (val instanceof Double)
                         {
-                            field.set(entity, Character.valueOf(c.charAt(0)));
+                            val = DateUtil.getJavaDate((Double) val);
                         }
                     }
-                    else if (java.util.Date.class == fieldType)
+                    if (StringUtils.isNotNull(fieldType))
                     {
-                        if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC)
+                        Excel attr = field.getAnnotation(Excel.class);
+                        String propertyName = field.getName();
+                        if (StringUtils.isNotEmpty(attr.targetAttr()))
                         {
-                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                            cell.setCellValue(sdf.format(cell.getNumericCellValue()));
-                            c = sdf.format(cell.getNumericCellValue());
+                            propertyName = field.getName() + "." + attr.targetAttr();
                         }
-                        else
+                        else if (StringUtils.isNotEmpty(attr.readConverterExp()))
                         {
-                            c = cell.getStringCellValue();
+                            val = reverseByExp(String.valueOf(val), attr.readConverterExp());
                         }
+                        ReflectUtils.invokeSetter(entity, propertyName, val);
                     }
-                    else if (java.math.BigDecimal.class == fieldType)
-                    {
-                        c = cell.getStringCellValue();
-                    }
-                }
-                if (entity != null)
-                {
-                    list.add(entity);
                 }
+                list.add(entity);
             }
         }
-
         return list;
     }
     /**
      * 对list数据源将其里面的数据导入到excel表单
-     * 
+     *
+     * @param list 导出数据集合
      * @param sheetName 工作表的名称
+     * @return 结果
      */
-    public AjaxResult exportExcel2(List<LinkedHashMap<String,Object>> list, String sheetName,HttpServletResponse response)
+    public AjaxResult exportExcel(List<T> list, String sheetName)
     {
-        if(list==null||list.size()==0){
-            return AjaxResult.error("无数据");
-        }
+        this.init(list, sheetName, Type.EXPORT);
+        return exportExcel();
+    }
-        //表头
-        List<String> headers = new ArrayList<>();
-        for (Map.Entry<String, Object> entry : list.get(0).entrySet()) {
-            headers.add(entry.getKey());
-        }
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @param sheetName 工作表的名称
+     * @return 结果
+     */
+    public AjaxResult importTemplateExcel(String sheetName)
+    {
+        this.init(null, sheetName, Type.IMPORT);
+        return exportExcel();
+    }
-        // 产生工作薄对象
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        // excel2003中每个sheet中最多有65536行
-        int sheetSize = 65536;
-        // 取出一共有多少个sheet.
-        double sheetNo = Math.ceil(list.size() / sheetSize);
-        for (int index = 0; index <= sheetNo; index++)
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @return 结果
+     */
+    public AjaxResult exportExcel()
+    {
+        OutputStream out = null;
+        try
         {
-            // 产生工作表对象
-            HSSFSheet sheet = workbook.createSheet();
-            if (sheetNo == 0)
+            // 取出一共有多少个sheet.
+            double sheetNo = Math.ceil(list.size() / sheetSize);
+            for (int index = 0; index <= sheetNo; index++)
             {
-                workbook.setSheetName(index, sheetName);
+                createSheet(sheetNo, index);
+
+                // 产生一行
+                Row row = sheet.createRow(0);
+                int column = 0;
+                // 写入各个字段的列头名称
+                for (Object[] os : fields)
+                {
+                    Excel excel = (Excel) os[1];
+                    this.createCell(excel, row, column++);
+                }
+                if (Type.EXPORT.equals(type))
+                {
+                    fillExcelData(index, row);
+                }
             }
-            else
+            String filename = encodingFilename(sheetName);
+            out = new FileOutputStream(getAbsoluteFile(filename));
+            wb.write(out);
+            return AjaxResult.success(filename);
+        }
+        catch (Exception e)
+        {
+            log.error("导出Excel异常{}", e.getMessage());
+            throw new BusinessException("导出Excel失败，请联系网站管理员！");
+        }
+        finally
+        {
+            if (wb != null)
             {
-                // 设置工作表的名称.
-                workbook.setSheetName(index, sheetName + index);
+                try
+                {
+                    wb.close();
+                }
+                catch (IOException e1)
+                {
+                    e1.printStackTrace();
+                }
             }
-            HSSFRow row;
-            HSSFCell cell; // 产生单元格
-
-            // 产生一行
-            row = sheet.createRow(0);
-            // 写入各个字段的列头名称
-            for (int i = 0; i < headers.size(); i++)
+            if (out != null)
             {
-                // 创建列
-                String attr = headers.get(i);
-                cell = row.createCell(i);
-                // 设置列中写入内容为String类型
-                cell.setCellType(HSSFCell.CELL_TYPE_STRING);
-                HSSFCellStyle cellStyle = workbook.createCellStyle();
-                cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
-                cellStyle.setVerticalAlignment(CellStyle.VERTICAL_CENTER);
-                if (attr.contains("注："))
+                try
                 {
-                    HSSFFont font = workbook.createFont();
-                    font.setColor(HSSFFont.COLOR_RED);
-                    cellStyle.setFont(font);
-                    cellStyle.setFillForegroundColor(HSSFColor.LIGHT_YELLOW.index);
-                    sheet.setColumnWidth(i, 6000);
+                    out.close();
                 }
-                else
+                catch (IOException e1)
                 {
-                    HSSFFont font = workbook.createFont();
-                    // 粗体显示
-                    font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
-                    // 选择需要用到的字体格式
-                    cellStyle.setFont(font);
-                    cellStyle.setFillForegroundColor(HSSFColor.LIGHT_YELLOW.index);
-                    // 设置列宽
-                    sheet.setColumnWidth(i, 3766);
+                    e1.printStackTrace();
                 }
-                cellStyle.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND);
-                cellStyle.setWrapText(true);
-                cell.setCellStyle(cellStyle);
-
-                // 写入列名
-                cell.setCellValue(attr);
-
-                // 如果设置了提示信息则鼠标放上去提示.
-//                if (StringUtils.isNotEmpty(attr.prompt()))
-//                {
-//                    // 这里默认设了2-101列提示.
-//                    setHSSFPrompt(sheet, "", attr.prompt(), 1, 100, i, i);
-//                }
-//                // 如果设置了combo属性则本列只能选择不能输入
-//                if (attr.combo().length > 0)
-//                {
-//                    // 这里默认设了2-101列只能选择不能输入.
-//                    setHSSFValidation(sheet, attr.combo(), 1, 100, i, i);
-//                }
             }
+        }
+    }
-            int startNo = index * sheetSize;
-            int endNo = Math.min(startNo + sheetSize, list.size());
-            // 写入各条记录,每条记录对应excel表中的一行
-            HSSFCellStyle cs = workbook.createCellStyle();
-            cs.setAlignment(HSSFCellStyle.ALIGN_CENTER);
-            cs.setVerticalAlignment(CellStyle.VERTICAL_CENTER);
-            for (int i = startNo; i < endNo; i++)
+    /**
+     * 填充excel数据
+     *
+     * @param index 序号
+     * @param row 单元格行
+     * @param cell 类型单元格
+     */
+    public void fillExcelData(int index, Row row)
+    {
+        int startNo = index * sheetSize;
+        int endNo = Math.min(startNo + sheetSize, list.size());
+        for (int i = startNo; i < endNo; i++)
+        {
+            row = sheet.createRow(i + 1 - startNo);
+            // 得到导出对象.
+            T vo = (T) list.get(i);
+            int column = 0;
+            for (Object[] os : fields)
             {
-                row = sheet.createRow(i + 1 - startNo);
-                // 得到导出对象.
-                LinkedHashMap<String, Object> map = list.get(i);
-                int tempCount = 0;
-                for (Map.Entry<String, Object> entry : map.entrySet()) {
-                    try{
-                        cell = row.createCell(tempCount);
-                        cell.setCellStyle(cs);
-                        try{
-                            if (String.valueOf(entry.getValue()).length() > 10)
-                            {
-                                throw new Exception("长度超过10位就不用转数字了");
-                            }
-                            // 如果可以转成数字则导出为数字类型
-                            BigDecimal bc = new BigDecimal(String.valueOf(entry.getValue()));
-                            cell.setCellType(HSSFCell.CELL_TYPE_NUMERIC);
-                            cell.setCellValue(bc.doubleValue());
-
-                        }catch (Throwable tt){
-                            cell.setCellType(HSSFCell.CELL_TYPE_STRING);
-                            if (entry.getValue() == null)
-                            {
-                                // 如果数据存在就填入,不存在填入空格.
-                                cell.setCellValue("");
-                            }
-                            else
-                            {
-                                // 如果数据存在就填入,不存在填入空格.
-                                cell.setCellValue(entry.getValue() == null ? "" : String.valueOf(entry.getValue()));
-                            }
-                        }
-
-                    }catch (Throwable t){
-                        log.error("导出Excel失败{}", t.getMessage());
-                    }
-                    tempCount++;
-                }
+                Field field = (Field) os[0];
+                Excel excel = (Excel) os[1];
+                // 设置实体类私有属性可访问
+                field.setAccessible(true);
+                this.addCell(excel, row, vo, field, column++);
             }
         }
-        try
+    }
+
+    /**
+     * 创建表格样式
+     *
+     * @param wb 工作薄对象
+     * @return 样式列表
+     */
+    private Map<String, CellStyle> createStyles(Workbook wb)
+    {
+        // 写入各条记录,每条记录对应excel表中的一行
+        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
+        CellStyle style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setBorderRight(BorderStyle.THIN);
+        style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderLeft(BorderStyle.THIN);
+        style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderTop(BorderStyle.THIN);
+        style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderBottom(BorderStyle.THIN);
+        style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        Font dataFont = wb.createFont();
+        dataFont.setFontName("Arial");
+        dataFont.setFontHeightInPoints((short) 10);
+        style.setFont(dataFont);
+        styles.put("data", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        Font headerFont = wb.createFont();
+        headerFont.setFontName("Arial");
+        headerFont.setFontHeightInPoints((short) 10);
+        headerFont.setBold(true);
+        headerFont.setColor(IndexedColors.WHITE.getIndex());
+        style.setFont(headerFont);
+        styles.put("header", style);
+
+        return styles;
+    }
+
+    /**
+     * 创建单元格
+     */
+    public Cell createCell(Excel attr, Row row, int column)
+    {
+        // 创建列
+        Cell cell = row.createCell(column);
+        // 写入列信息
+        cell.setCellValue(attr.name());
+        setDataValidation(attr, row, column);
+        cell.setCellStyle(styles.get("header"));
+        return cell;
+    }
+
+    /**
+     * 设置单元格信息
+     *
+     * @param value 单元格值
+     * @param attr 注解相关
+     * @param cell 单元格信息
+     */
+    public void setCellVo(Object value, Excel attr, Cell cell)
+    {
+        if (Excel.ColumnType.STRING == attr.cellType())
         {
-            response.setContentType("application/vnd.ms-excel");
-            String fileName = encodingFilename(sheetName);
-            response.addHeader("Content-Disposition", "attachment;filename="+ URLEncoder.encode(fileName, "UTF-8"));
-            OutputStream out = response.getOutputStream();
-            workbook.write(out);
-            out.close();
-            return AjaxResult.success(fileName);
+            cell.setCellType(CellType.NUMERIC);
+            cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix());
         }
-        catch (Exception e)
+        else if (Excel.ColumnType.NUMERIC == attr.cellType())
         {
-            log.error("关闭flush失败{}", e.getMessage());
-            return AjaxResult.error("导出Excel失败，请联系网站管理员！");
+            cell.setCellType(CellType.NUMERIC);
+            cell.setCellValue(Integer.parseInt(value + ""));
         }
     }
     /**
-     * 对list数据源将其里面的数据导入到excel表单
-     *
-     * @param sheetName 工作表的名称
+     * 创建表格样式
      */
-    public AjaxResult exportExcel(List<T> list, String sheetName)
+    public void setDataValidation(Excel attr, Row row, int column)
     {
-        // 得到所有定义字段
-        Field[] allFields = clazz.getDeclaredFields();
-        List<Field> fields = new ArrayList<Field>();
-        // 得到所有field并存放到一个list中.
-        for (Field field : allFields)
+        if (attr.name().indexOf("注：") >= 0)
         {
-            if (field.isAnnotationPresent(Excel.class))
-            {
-                fields.add(field);
-            }
+            sheet.setColumnWidth(column, 6000);
         }
-
-        // 产生工作薄对象
-        HSSFWorkbook workbook = new HSSFWorkbook();
-        // excel2003中每个sheet中最多有65536行
-        int sheetSize = 65536;
-        // 取出一共有多少个sheet.
-        double sheetNo = Math.ceil(list.size() / sheetSize);
-        for (int index = 0; index <= sheetNo; index++)
+        else
         {
-            // 产生工作表对象
-            HSSFSheet sheet = workbook.createSheet();
-            if (sheetNo == 0)
-            {
-                workbook.setSheetName(index, sheetName);
-            }
-            else
-            {
-                // 设置工作表的名称.
-                workbook.setSheetName(index, sheetName + index);
-            }
-            HSSFRow row;
-            HSSFCell cell; // 产生单元格
+            // 设置列宽
+            sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
+            row.setHeight((short) (attr.height() * 20));
+        }
+        // 如果设置了提示信息则鼠标放上去提示.
+        if (StringUtils.isNotEmpty(attr.prompt()))
+        {
+            // 这里默认设了2-101列提示.
+            setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column);
+        }
+        // 如果设置了combo属性则本列只能选择不能输入
+        if (attr.combo().length > 0)
+        {
+            // 这里默认设了2-101列只能选择不能输入.
+            setXSSFValidation(sheet, attr.combo(), 1, 100, column, column);
+        }
+    }
-            // 产生一行
-            row = sheet.createRow(0);
-            // 写入各个字段的列头名称
-            for (int i = 0; i < fields.size(); i++)
+    /**
+     * 添加单元格
+     */
+    public Cell addCell(Excel attr, Row row, T vo, Field field, int column)
+    {
+        Cell cell = null;
+        try
+        {
+            // 设置行高
+            row.setHeight((short) (attr.height() * 20));
+            // 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列.
+            if (attr.isExport())
             {
-                Field field = fields.get(i);
-                Excel attr = field.getAnnotation(Excel.class);
-                // 创建列
-                cell = row.createCell(i);
-                // 设置列中写入内容为String类型
-                cell.setCellType(HSSFCell.CELL_TYPE_STRING);
-                HSSFCellStyle cellStyle = workbook.createCellStyle();
-                cellStyle.setAlignment(HSSFCellStyle.ALIGN_CENTER);
-                cellStyle.setVerticalAlignment(CellStyle.VERTICAL_CENTER);
-                if (attr.name().indexOf("注：") >= 0)
+                // 创建cell
+                cell = row.createCell(column);
+                cell.setCellStyle(styles.get("data"));
+
+                // 用于读取对象中的属性
+                Object value = getTargetValue(vo, field, attr);
+                String dateFormat = attr.dateFormat();
+                String readConverterExp = attr.readConverterExp();
+                if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
                 {
-                    HSSFFont font = workbook.createFont();
-                    font.setColor(HSSFFont.COLOR_RED);
-                    cellStyle.setFont(font);
-                    cellStyle.setFillForegroundColor(HSSFColor.LIGHT_YELLOW.index);
-                    sheet.setColumnWidth(i, 6000);
+                    cell.setCellValue(DateUtils.parseDateToStr(dateFormat, (Date) value));
                 }
-                else
-                {
-                    HSSFFont font = workbook.createFont();
-                    // 粗体显示
-                    font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
-                    // 选择需要用到的字体格式
-                    cellStyle.setFont(font);
-                    cellStyle.setFillForegroundColor(HSSFColor.LIGHT_YELLOW.index);
-                    // 设置列宽
-                    sheet.setColumnWidth(i, 3766);
-                }
-                cellStyle.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND);
-                cellStyle.setWrapText(true);
-                cell.setCellStyle(cellStyle);
-
-                // 写入列名
-                cell.setCellValue(attr.name());
-
-                // 如果设置了提示信息则鼠标放上去提示.
-                if (StringUtils.isNotEmpty(attr.prompt()))
+                else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
                 {
-                    // 这里默认设了2-101列提示.
-                    setHSSFPrompt(sheet, "", attr.prompt(), 1, 100, i, i);
+                    cell.setCellValue(convertByExp(String.valueOf(value), readConverterExp));
                 }
-                // 如果设置了combo属性则本列只能选择不能输入
-                if (attr.combo().length > 0)
+                else
                 {
-                    // 这里默认设了2-101列只能选择不能输入.
-                    setHSSFValidation(sheet, attr.combo(), 1, 100, i, i);
-                }
-            }
-
-            int startNo = index * sheetSize;
-            int endNo = Math.min(startNo + sheetSize, list.size());
-            // 写入各条记录,每条记录对应excel表中的一行
-            HSSFCellStyle cs = workbook.createCellStyle();
-            cs.setAlignment(HSSFCellStyle.ALIGN_CENTER);
-            cs.setVerticalAlignment(CellStyle.VERTICAL_CENTER);
-            for (int i = startNo; i < endNo; i++)
-            {
-                row = sheet.createRow(i + 1 - startNo);
-                // 得到导出对象.
-                T vo = (T) list.get(i);
-                for (int j = 0; j < fields.size(); j++)
-                {
-                    // 获得field.
-                    Field field = fields.get(j);
-                    // 设置实体类私有属性可访问
-                    field.setAccessible(true);
-                    Excel attr = field.getAnnotation(Excel.class);
-                    try
-                    {
-                        // 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列.
-                        if (attr.isExport())
-                        {
-                            // 创建cell
-                            cell = row.createCell(j);
-                            cell.setCellStyle(cs);
-                            try
-                            {
-                                if (String.valueOf(field.get(vo)).length() > 10)
-                                {
-                                    throw new Exception("长度超过10位就不用转数字了");
-                                }
-                                // 如果可以转成数字则导出为数字类型
-                                BigDecimal bc = new BigDecimal(String.valueOf(field.get(vo)));
-                                cell.setCellType(HSSFCell.CELL_TYPE_NUMERIC);
-                                cell.setCellValue(bc.doubleValue());
-                            }
-                            catch (Exception e)
-                            {
-                                cell.setCellType(HSSFCell.CELL_TYPE_STRING);
-                                if (vo == null)
-                                {
-                                    // 如果数据存在就填入,不存在填入空格.
-                                    cell.setCellValue("");
-                                }
-                                else
-                                {
-                                    // 如果数据存在就填入,不存在填入空格.
-                                    cell.setCellValue(field.get(vo) == null ? "" : String.valueOf(field.get(vo)));
-                                }
-
-                            }
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        log.error("导出Excel失败{}", e.getMessage());
-                    }
+                    // 设置列类型
+                    setCellVo(value, attr, cell);
                 }
             }
         }
-        try
-        {
-            String filename = encodingFilename(sheetName);
-            OutputStream out = new FileOutputStream(getfile() + filename);
-            workbook.write(out);
-            out.close();
-            return AjaxResult.success(filename);
-        }
         catch (Exception e)
         {
-            log.error("关闭flush失败{}", e.getMessage());
-            return AjaxResult.error("导出Excel失败，请联系网站管理员！");
+            log.error("导出Excel失败{}", e);
         }
+        return cell;
     }
     /**
-     * 设置单元格上提示
-     * 
-     * @param sheet 要设置的sheet.
-     * @param promptTitle 标题
-     * @param promptContent 内容
+     * 设置 POI XSSFSheet 单元格提示
+     *
+     * @param sheet 表单
+     * @param promptTitle 提示标题
+     * @param promptContent 提示内容
      * @param firstRow 开始行
      * @param endRow 结束行
      * @param firstCol 开始列
      * @param endCol 结束列
-     * @return 设置好的sheet.
      */
-    public static HSSFSheet setHSSFPrompt(HSSFSheet sheet, String promptTitle, String promptContent, int firstRow,
-            int endRow, int firstCol, int endCol)
+    public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow,
+                              int firstCol, int endCol)
     {
-        // 构造constraint对象
-        DVConstraint constraint = DVConstraint.createCustomFormulaConstraint("DD1");
-        // 四个参数分别是：起始行、终止行、起始列、终止列
+        DataValidationHelper helper = sheet.getDataValidationHelper();
+        DataValidationConstraint constraint = helper.createCustomConstraint("DD1");
         CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
-        // 数据有效性对象
-        HSSFDataValidation dataValidationView = new HSSFDataValidation(regions, constraint);
-        dataValidationView.createPromptBox(promptTitle, promptContent);
-        sheet.addValidationData(dataValidationView);
-        return sheet;
+        DataValidation dataValidation = helper.createValidation(constraint, regions);
+        dataValidation.createPromptBox(promptTitle, promptContent);
+        dataValidation.setShowPromptBox(true);
+        sheet.addValidationData(dataValidation);
     }
     /**
      * 设置某些列的值只能输入预制的数据,显示下拉框.
-     * 
+     *
      * @param sheet 要设置的sheet.
      * @param textlist 下拉框显示的内容
      * @param firstRow 开始行
@@ -546,17 +584,85 @@ public class ExcelUtil&lt;T&gt;
      * @param endCol 结束列
      * @return 设置好的sheet.
      */
-    public static HSSFSheet setHSSFValidation(HSSFSheet sheet, String[] textlist, int firstRow, int endRow,
-            int firstCol, int endCol)
+    public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol)
     {
+        DataValidationHelper helper = sheet.getDataValidationHelper();
         // 加载下拉列表内容
-        DVConstraint constraint = DVConstraint.createExplicitListConstraint(textlist);
+        DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist);
         // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列
         CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
         // 数据有效性对象
-        HSSFDataValidation dataValidationList = new HSSFDataValidation(regions, constraint);
-        sheet.addValidationData(dataValidationList);
-        return sheet;
+        DataValidation dataValidation = helper.createValidation(constraint, regions);
+        // 处理Excel兼容性问题
+        if (dataValidation instanceof XSSFDataValidation)
+        {
+            dataValidation.setSuppressDropDownArrow(true);
+            dataValidation.setShowErrorBox(true);
+        }
+        else
+        {
+            dataValidation.setSuppressDropDownArrow(false);
+        }
+
+        sheet.addValidationData(dataValidation);
+    }
+
+    /**
+     * 解析导出值 0=男,1=女,2=未知
+     *
+     * @param propertyValue 参数值
+     * @param converterExp 翻译注解
+     * @return 解析后值
+     * @throws Exception
+     */
+    public static String convertByExp(String propertyValue, String converterExp) throws Exception
+    {
+        try
+        {
+            String[] convertSource = converterExp.split(",");
+            for (String item : convertSource)
+            {
+                String[] itemArray = item.split("=");
+                if (itemArray[0].equals(propertyValue))
+                {
+                    return itemArray[1];
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            throw e;
+        }
+        return propertyValue;
+    }
+
+    /**
+     * 反向解析值 男=0,女=1,未知=2
+     *
+     * @param propertyValue 参数值
+     * @param converterExp 翻译注解
+     * @return 解析后值
+     * @throws Exception
+     */
+    public static String reverseByExp(String propertyValue, String converterExp) throws Exception
+    {
+        try
+        {
+            String[] convertSource = converterExp.split(",");
+            for (String item : convertSource)
+            {
+                String[] itemArray = item.split("=");
+                if (itemArray[1].equals(propertyValue))
+                {
+                    return itemArray[0];
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            throw e;
+        }
+        return propertyValue;
     }
     /**
@@ -564,13 +670,205 @@ public class ExcelUtil&lt;T&gt;
      */
     public String encodingFilename(String filename)
     {
-        filename = UUID.randomUUID().toString() + "_" + filename + ".xls";
+        filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
         return filename;
     }
-    public String getfile() throws FileNotFoundException
+    /**
+     * 获取下载路径
+     *
+     * @param filename 文件名称
+     */
+    public String getAbsoluteFile(String filename)
+    {
+        String downloadPath = Global.getDownloadPath() + filename;
+        File desc = new File(downloadPath);
+        if (!desc.getParentFile().exists())
+        {
+            desc.getParentFile().mkdirs();
+        }
+        return downloadPath;
+    }
+
+    /**
+     * 获取bean中的属性值
+     *
+     * @param vo 实体对象
+     * @param field 字段
+     * @param excel 注解
+     * @return 最终的属性值
+     * @throws Exception
+     */
+    private Object getTargetValue(T vo, Field field, Excel excel) throws Exception
+    {
+        Object o = field.get(vo);
+        if (StringUtils.isNotEmpty(excel.targetAttr()))
+        {
+            String target = excel.targetAttr();
+            if (target.indexOf(".") > -1)
+            {
+                String[] targets = target.split("[.]");
+                for (String name : targets)
+                {
+                    o = getValue(o, name);
+                }
+            }
+            else
+            {
+                o = getValue(o, target);
+            }
+        }
+        return o;
+    }
+
+    /**
+     * 以类的属性的get方法方法形式获取值
+     *
+     * @param o
+     * @param name
+     * @return value
+     * @throws Exception
+     */
+    private Object getValue(Object o, String name) throws Exception
     {
-        return ResourceUtils.getURL("classpath:").getPath() + "static/file/";
+        if (StringUtils.isNotEmpty(name))
+        {
+            Class<?> clazz = o.getClass();
+            String methodName = "get" + name.substring(0, 1).toUpperCase() + name.substring(1);
+            Method method = clazz.getMethod(methodName);
+            o = method.invoke(o);
+        }
+        return o;
     }
+    /**
+     * 得到所有定义字段
+     */
+    private void createExcelField()
+    {
+        this.fields = new ArrayList<Object[]>();
+        List<Field> tempFields = new ArrayList<>();
+        tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
+        tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
+        for (Field field : tempFields)
+        {
+            // 单注解
+            if (field.isAnnotationPresent(Excel.class))
+            {
+                putToField(field, field.getAnnotation(Excel.class));
+            }
+
+            // 多注解
+            if (field.isAnnotationPresent(Excels.class))
+            {
+                Excels attrs = field.getAnnotation(Excels.class);
+                Excel[] excels = attrs.value();
+                for (Excel excel : excels)
+                {
+                    putToField(field, excel);
+                }
+            }
+        }
+    }
+
+    /**
+     * 放到字段集合中
+     */
+    private void putToField(Field field, Excel attr)
+    {
+        if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
+        {
+            this.fields.add(new Object[] { field, attr });
+        }
+    }
+
+    /**
+     * 创建一个工作簿
+     */
+    public void createWorkbook()
+    {
+        this.wb = new SXSSFWorkbook(500);
+    }
+
+    /**
+     * 创建工作表
+     *
+     * @param sheetName，指定Sheet名称
+     * @param sheetNo sheet数量
+     * @param index 序号
+     */
+    public void createSheet(double sheetNo, int index)
+    {
+        this.sheet = wb.createSheet();
+        this.styles = createStyles(wb);
+        // 设置工作表的名称.
+        if (sheetNo == 0)
+        {
+            wb.setSheetName(index, sheetName);
+        }
+        else
+        {
+            wb.setSheetName(index, sheetName + index);
+        }
+    }
+
+    /**
+     * 获取单元格值
+     *
+     * @param row 获取的行
+     * @param column 获取单元格列号
+     * @return 单元格值
+     */
+    public Object getCellValue(Row row, int column)
+    {
+        if (row == null)
+        {
+            return row;
+        }
+        Object val = "";
+        try
+        {
+            Cell cell = row.getCell(column);
+            if (cell != null)
+            {
+                if (cell.getCellTypeEnum() == CellType.NUMERIC || cell.getCellTypeEnum() == CellType.FORMULA)
+                {
+                    val = cell.getNumericCellValue();
+                    if (HSSFDateUtil.isCellDateFormatted(cell))
+                    {
+                        val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换
+                    }
+                    else
+                    {
+                        if ((Double) val % 1 > 0)
+                        {
+                            val = new DecimalFormat("0.00").format(val);
+                        }
+                        else
+                        {
+                            val = new DecimalFormat("0").format(val);
+                        }
+                    }
+                }
+                else if (cell.getCellTypeEnum() == CellType.STRING)
+                {
+                    val = cell.getStringCellValue();
+                }
+                else if (cell.getCellTypeEnum() == CellType.BOOLEAN)
+                {
+                    val = cell.getBooleanCellValue();
+                }
+                else if (cell.getCellTypeEnum() == CellType.ERROR)
+                {
+                    val = cell.getErrorCellValue();
+                }
+
+            }
+        }
+        catch (Exception e)
+        {
+            return val;
+        }
+        return val;
+    }
 }
 \ No newline at end of file
+package com.huaheng.common.utils.reflect;
+
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
+import org.apache.poi.ss.usermodel.DateUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.*;
+import java.util.Date;
+
+/**
+ * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
+ *
+ * @author ruoyi
+ */
+public class ReflectUtils {
+
+    private static final String SETTER_PREFIX = "set";
+
+    private static final String GETTER_PREFIX = "get";
+
+    private static final String CGLIB_CLASS_SEPARATOR = "$$";
+
+    private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
+
+    /**
+     * 调用Getter方法.
+     * 支持多级，如：对象名.对象名.方法
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E invokeGetter(Object obj, String propertyName)
+    {
+        Object object = obj;
+        for (String name : StringUtils.split(propertyName, "."))
+        {
+            String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name);
+            object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
+        }
+        return (E) object;
+    }
+
+    /**
+     * 调用Setter方法, 仅匹配方法名。
+     * 支持多级，如：对象名.对象名.方法
+     */
+    public static <E> void invokeSetter(Object obj, String propertyName, E value)
+    {
+        Object object = obj;
+        String[] names = StringUtils.split(propertyName, ".");
+        for (int i = 0; i < names.length; i++)
+        {
+            if (i < names.length - 1)
+            {
+                String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]);
+                object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
+            }
+            else
+            {
+                String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]);
+                invokeMethodByName(object, setterMethodName, new Object[] { value });
+            }
+        }
+    }
+
+    /**
+     * 直接读取对象属性值, 无视private/protected修饰符, 不经过getter函数.
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E getFieldValue(final Object obj, final String fieldName)
+    {
+        Field field = getAccessibleField(obj, fieldName);
+        if (field == null)
+        {
+            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
+            return null;
+        }
+        E result = null;
+        try
+        {
+            result = (E) field.get(obj);
+        }
+        catch (IllegalAccessException e)
+        {
+            logger.error("不可能抛出的异常{}", e.getMessage());
+        }
+        return result;
+    }
+
+    /**
+     * 直接设置对象属性值, 无视private/protected修饰符, 不经过setter函数.
+     */
+    public static <E> void setFieldValue(final Object obj, final String fieldName, final E value)
+    {
+        Field field = getAccessibleField(obj, fieldName);
+        if (field == null)
+        {
+            // throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
+            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
+            return;
+        }
+        try
+        {
+            field.set(obj, value);
+        }
+        catch (IllegalAccessException e)
+        {
+            logger.error("不可能抛出的异常: {}", e.getMessage());
+        }
+    }
+
+    /**
+     * 直接调用对象方法, 无视private/protected修饰符.
+     * 用于一次性调用的情况，否则应使用getAccessibleMethod()函数获得Method后反复调用.
+     * 同时匹配方法名+参数类型，
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E invokeMethod(final Object obj, final String methodName, final Class<?>[] parameterTypes,
+                                     final Object[] args)
+    {
+        if (obj == null || methodName == null)
+        {
+            return null;
+        }
+        Method method = getAccessibleMethod(obj, methodName, parameterTypes);
+        if (method == null)
+        {
+            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 ");
+            return null;
+        }
+        try
+        {
+            return (E) method.invoke(obj, args);
+        }
+        catch (Exception e)
+        {
+            String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
+            throw convertReflectionExceptionToUnchecked(msg, e);
+        }
+    }
+
+    /**
+     * 直接调用对象方法, 无视private/protected修饰符，
+     * 用于一次性调用的情况，否则应使用getAccessibleMethodByName()函数获得Method后反复调用.
+     * 只匹配函数名，如果有多个同名函数调用第一个。
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E invokeMethodByName(final Object obj, final String methodName, final Object[] args)
+    {
+        Method method = getAccessibleMethodByName(obj, methodName, args.length);
+        if (method == null)
+        {
+            // 如果为空不报错，直接返回空。
+            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 ");
+            return null;
+        }
+        try
+        {
+            // 类型转换（将参数数据类型转换为目标方法参数类型）
+            Class<?>[] cs = method.getParameterTypes();
+            for (int i = 0; i < cs.length; i++)
+            {
+                if (args[i] != null && !args[i].getClass().equals(cs[i]))
+                {
+                    if (cs[i] == String.class)
+                    {
+                        args[i] = Convert.toStr(args[i]);
+                        if (StringUtils.endsWith((String) args[i], ".0"))
+                        {
+                            args[i] = StringUtils.substringBefore((String) args[i], ".0");
+                        }
+                    }
+                    else if (cs[i] == Integer.class)
+                    {
+                        args[i] = Convert.toInt(args[i]);
+                    }
+                    else if (cs[i] == Long.class)
+                    {
+                        args[i] = Convert.toLong(args[i]);
+                    }
+                    else if (cs[i] == Double.class)
+                    {
+                        args[i] = Convert.toDouble(args[i]);
+                    }
+                    else if (cs[i] == Float.class)
+                    {
+                        args[i] = Convert.toFloat(args[i]);
+                    }
+                    else if (cs[i] == Date.class)
+                    {
+                        if (args[i] instanceof String)
+                        {
+                            args[i] = DateUtils.parseDate(args[i]);
+                        }
+                        else
+                        {
+                            args[i] = DateUtil.getJavaDate((Double) args[i]);
+                        }
+                    }
+                }
+            }
+            return (E) method.invoke(obj, args);
+        }
+        catch (Exception e)
+        {
+            String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
+            throw convertReflectionExceptionToUnchecked(msg, e);
+        }
+    }
+
+    /**
+     * 循环向上转型, 获取对象的DeclaredField, 并强制设置为可访问.
+     * 如向上转型到Object仍无法找到, 返回null.
+     */
+    public static Field getAccessibleField(final Object obj, final String fieldName)
+    {
+        // 为空不报错。直接返回 null
+        if (obj == null)
+        {
+            return null;
+        }
+        Validate.notBlank(fieldName, "fieldName can't be blank");
+        for (Class<?> superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass())
+        {
+            try
+            {
+                Field field = superClass.getDeclaredField(fieldName);
+                makeAccessible(field);
+                return field;
+            }
+            catch (NoSuchFieldException e)
+            {
+                continue;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问.
+     * 如向上转型到Object仍无法找到, 返回null.
+     * 匹配函数名+参数类型。
+     * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
+     */
+    public static Method getAccessibleMethod(final Object obj, final String methodName,
+                                             final Class<?>... parameterTypes)
+    {
+        // 为空不报错。直接返回 null
+        if (obj == null)
+        {
+            return null;
+        }
+        Validate.notBlank(methodName, "methodName can't be blank");
+        for (Class<?> searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())
+        {
+            try
+            {
+                Method method = searchType.getDeclaredMethod(methodName, parameterTypes);
+                makeAccessible(method);
+                return method;
+            }
+            catch (NoSuchMethodException e)
+            {
+                continue;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问.
+     * 如向上转型到Object仍无法找到, 返回null.
+     * 只匹配函数名。
+     * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
+     */
+    public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum)
+    {
+        // 为空不报错。直接返回 null
+        if (obj == null)
+        {
+            return null;
+        }
+        Validate.notBlank(methodName, "methodName can't be blank");
+        for (Class<?> searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())
+        {
+            Method[] methods = searchType.getDeclaredMethods();
+            for (Method method : methods)
+            {
+                if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum)
+                {
+                    makeAccessible(method);
+                    return method;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 改变private/protected的方法为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
+     */
+    public static void makeAccessible(Method method)
+    {
+        if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers()))
+                && !method.isAccessible())
+        {
+            method.setAccessible(true);
+        }
+    }
+
+    /**
+     * 改变private/protected的成员变量为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
+     */
+    public static void makeAccessible(Field field)
+    {
+        if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers())
+                || Modifier.isFinal(field.getModifiers())) && !field.isAccessible())
+        {
+            field.setAccessible(true);
+        }
+    }
+
+    /**
+     * 通过反射, 获得Class定义中声明的泛型参数的类型, 注意泛型必须定义在父类处
+     * 如无法找到, 返回Object.class.
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Class<T> getClassGenricType(final Class clazz)
+    {
+        return getClassGenricType(clazz, 0);
+    }
+
+    /**
+     * 通过反射, 获得Class定义中声明的父类的泛型参数的类型.
+     * 如无法找到, 返回Object.class.
+     */
+    public static Class getClassGenricType(final Class clazz, final int index)
+    {
+        Type genType = clazz.getGenericSuperclass();
+
+        if (!(genType instanceof ParameterizedType))
+        {
+            logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType");
+            return Object.class;
+        }
+
+        Type[] params = ((ParameterizedType) genType).getActualTypeArguments();
+
+        if (index >= params.length || index < 0)
+        {
+            logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: "
+                    + params.length);
+            return Object.class;
+        }
+        if (!(params[index] instanceof Class))
+        {
+            logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter");
+            return Object.class;
+        }
+
+        return (Class) params[index];
+    }
+
+    public static Class<?> getUserClass(Object instance)
+    {
+        if (instance == null)
+        {
+            throw new RuntimeException("Instance must not be null");
+        }
+        Class clazz = instance.getClass();
+        if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR))
+        {
+            Class<?> superClass = clazz.getSuperclass();
+            if (superClass != null && !Object.class.equals(superClass))
+            {
+                return superClass;
+            }
+        }
+        return clazz;
+
+    }
+
+    /**
+     * 将反射时的checked exception转换为unchecked exception.
+     */
+    public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e)
+    {
+        if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException
+                || e instanceof NoSuchMethodException)
+        {
+            return new IllegalArgumentException(msg, e);
+        }
+        else if (e instanceof InvocationTargetException)
+        {
+            return new RuntimeException(msg, ((InvocationTargetException) e).getTargetException());
+        }
+        return new RuntimeException(msg, e);
+    }
+}
@@ -17,20 +17,98 @@ public @interface Excel
     /**
      * 导出到Excel中的名字.
      */
-    public abstract String name();
+    public String name() default "";
+
+    /**
+     * 日期格式, 如: yyyy-MM-dd
+     */
+    public String dateFormat() default "";
+
+    /**
+     * 读取内容转表达式 (如: 0=男,1=女,2=未知)
+     */
+    public String readConverterExp() default "";
+
+    /**
+     * 导出类型（0数字 1字符串）
+     */
+    public ColumnType cellType() default ColumnType.STRING;
+
+    /**
+     * 导出时在excel中每个列的高度 单位为字符
+     */
+    public double height() default 14;
+
+    /**
+     * 导出时在excel中每个列的宽 单位为字符
+     */
+    public double width() default 16;
+
+    /**
+     * 文字后缀,如% 90 变成90%
+     */
+    public String suffix() default "";
+
+    /**
+     * 当值为空时,字段的默认值
+     */
+    public String defaultValue() default "";
     /**
      * 提示信息
      */
-    public abstract String prompt() default "";
+    public String prompt() default "";
     /**
      * 设置只能选择不能输入的列内容.
      */
-    public abstract String[] combo() default {};
+    public String[] combo() default {};
     /**
      * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
      */
-    public abstract boolean isExport() default true;
+    public boolean isExport() default true;
+
+    /**
+     * 另一个类中的属性名称,支持多级获取,以小数点隔开
+     */
+    public String targetAttr() default "";
+
+    /**
+     * 字段类型（0：导出导入；1：仅导出；2：仅导入）
+     */
+    Type type() default Type.ALL;
+
+    public enum Type
+    {
+        ALL(0), EXPORT(1), IMPORT(2);
+        private final int value;
+
+        Type(int value)
+        {
+            this.value = value;
+        }
+
+        public int value()
+        {
+            return this.value;
+        }
+    }
+
+    public enum ColumnType
+    {
+        NUMERIC(0), STRING(1);
+        private final int value;
+
+        ColumnType(int value)
+        {
+            this.value = value;
+        }
+
+        public int value()
+        {
+            return this.value;
+        }
+    }
+
 }
 \ No newline at end of file
@@ -4,6 +4,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.huaheng.common.config.Global;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -22,12 +24,11 @@ public class CommonController
     private static final Logger log = LoggerFactory.getLogger(CommonController.class);
     @RequestMapping("common/download")
-    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
-    {
-        String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
-        try
-        {
-            String filePath = ResourceUtils.getURL("classpath:").getPath() + "static/file/" + fileName;
+    public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request) {
+
+        try {
+            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+            String filePath = Global.getDownloadPath() + fileName;
             response.setCharacterEncoding("utf-8");
             response.setContentType("multipart/form-data");
+package com.huaheng.pc.config.receiptType.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.config.receiptType.domain.ReceiptType;
+import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
+import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
+import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Controller
+@RequestMapping("/config/receiptType")
+public class receiptTypeController extends BaseController {
+
+    @Resource
+    private ReceiptTypeService receiptTypeService;
+    @Resource
+    private ReceiptHeaderService receiptHeaderService;
+
+    private String prefix = "config/receiptType";
+
+    @RequiresPermissions("config:receiptType:view")
+    @GetMapping()
+    public String receiptDetailHistory() {
+        return prefix + "/receiptType";
+    }
+
+    /**
+     * 查询入库类型
+     */
+    @ApiOperation(value="查看入库类型列表", notes="根据编码、类型、创建时间获取入库类型", httpMethod = "POST")
+    @RequiresPermissions("config:receiptType:list")
+    @Log(title = "入库-入库类型",operating = "入库类型列表", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(@ApiParam(name="receiptType",value="编码、类型") ReceiptType receiptType,
+           @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+           @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
+        LambdaQueryWrapper<ReceiptType> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), ReceiptType::getCreated, createdBegin)
+                .lt(StringUtils.isNotEmpty(createdEnd), ReceiptType::getCreated, createdEnd)
+                .eq(StringUtils.isNotEmpty(receiptType.getCode()), ReceiptType::getCode, receiptType.getCode())
+                .eq(StringUtils.isNotEmpty(receiptType.getReferType()), ReceiptType::getReferType, receiptType.getReferType())
+                .in(ReceiptType::getCompanyCode, ShiroUtils.getCompanyCodeList())
+                .eq(ReceiptType::getWarehouseCode, ShiroUtils.getWarehouseCode());
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            /*使用分页查询*/
+            Page<ReceiptType> page = new Page<>(pageNum, pageSize);
+            IPage<ReceiptType> iPage = receiptTypeService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(iPage.getRecords(), iPage.getTotal());
+        } else {
+            List<ReceiptType> list = receiptTypeService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+    /**
+     * 新增入库类型
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增入库类型
+     */
+    @ApiOperation(value="新增入库类型", notes="新增入库类型", httpMethod = "POST")
+    @RequiresPermissions("config:receiptType:add")
+    @Log(title = "入库-入库类型",operating = "新增入库类型", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(ReceiptType receiptType) {
+        receiptType.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        receiptType.setCreatedBy(ShiroUtils.getLoginName());
+        receiptType.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return toAjax(receiptTypeService.save(receiptType ));
+    }
+
+    /**
+     * 修改入库类型
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+        ReceiptType receiptType = receiptTypeService.getById(id);
+        mmap.put("receiptType", receiptType);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存入库类型
+     */
+    @ApiOperation(value="修改入库类型信息", notes="修改入库类型信息", httpMethod = "POST")
+    @RequiresPermissions("config:receiptType:edit")
+    @Log(title = "入库-入库类型",operating = "修改入库类型", action = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(ReceiptType receiptType) {
+        receiptType.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return toAjax(receiptTypeService.updateById(receiptType));
+    }
+
+    /**
+     * 删除入库
+     */
+    @ApiOperation(value="删除入库信息", notes="单条删除或批量删除入库信息，示例1或1,2,3", httpMethod = "POST")
+    @RequiresPermissions("config:receiptType:remove")
+    @Log(title = "入库-入库管理",operating = "修改入库", action = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        if (StringUtils.isEmpty(ids)) {
+            return AjaxResult.error("id不能为空");
+        }
+        List<Integer> list = new ArrayList<>();
+        for (Integer id : Convert.toIntArray(ids)) {
+            ReceiptType receiptType = receiptTypeService.getById(id);
+            LambdaQueryWrapper<ReceiptHeader> lambda = Wrappers.lambdaQuery();
+            lambda.eq(ReceiptHeader::getReceiptType, receiptType.getCode());
+            List<ReceiptHeader> receiptHeaderList = receiptHeaderService.list(lambda);
+            if (receiptHeaderList.size() == 0){
+                list.add(id);
+            } else {
+               return AjaxResult.error("类型"+receiptType.getCode()+"存在入库单，不能删除");
+            }
+        }
+        return toAjax(receiptTypeService.removeByIds(list));
+    }
+}
-package com.huaheng.pc.receipt.receiptType.domain;
+package com.huaheng.pc.config.receiptType.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,10 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 import java.util.Date;
-@ApiModel(value="com.huaheng.pc.receipt.receiptType.domain.ReceiptType")
+@ApiModel(value="com.huaheng.pc.config.receiptType.domain.ReceiptType")
 @TableName(value = "receipt_type")
 public class ReceiptType implements Serializable {
     /**
@@ -59,7 +60,7 @@ public class ReceiptType implements Serializable {
      */
     @TableField(value = "enable")
     @ApiModelProperty(value="是否启用")
-    private String enable;
+    private Boolean enable;
     /**
      * 创建时间
@@ -314,7 +315,7 @@ public class ReceiptType implements Serializable {
      *
      * @return enable - 是否启用
      */
-    public String getEnable() {
+    public Boolean getEnable() {
         return enable;
     }
@@ -323,7 +324,7 @@ public class ReceiptType implements Serializable {
      *
      * @param enable 是否启用
      */
-    public void setEnable(String enable) {
+    public void setEnable(Boolean enable) {
         this.enable = enable;
     }
-package com.huaheng.pc.receipt.receiptType.mapper;
+package com.huaheng.pc.config.receiptType.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.receipt.receiptType.domain.ReceiptType;
+import com.huaheng.pc.config.receiptType.domain.ReceiptType;
 public interface ReceiptTypeMapper extends BaseMapper<ReceiptType> {
 }
 \ No newline at end of file
-package com.huaheng.pc.receipt.receiptType.service;
+package com.huaheng.pc.config.receiptType.service;
-import com.huaheng.pc.receipt.receiptType.domain.ReceiptType;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huaheng.pc.config.receiptType.domain.ReceiptType;
+
 public interface ReceiptTypeService extends IService<ReceiptType>{
+package com.huaheng.pc.config.receiptType.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.config.receiptType.domain.ReceiptType;
+import com.huaheng.pc.config.receiptType.mapper.ReceiptTypeMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ReceiptTypeServiceImpl extends ServiceImpl<ReceiptTypeMapper, ReceiptType> implements ReceiptTypeService {
+
+}
+package com.huaheng.pc.general.carrier.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.general.carrier.domain.Carrier;
+import com.huaheng.pc.general.carrier.service.CarrierService;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 承运商
+ */
+@Controller
+@RequestMapping("/general/carrier")
+public class CarrierController extends BaseController {
+
+    private String prefix = "general/carrier";
+
+    @Resource
+    private CarrierService carrierService;
+
+    @RequiresPermissions("general:carrier:view")
+    @GetMapping()
+    public String bomHeader() {
+        return prefix + "/carrier";
+    }
+
+    /**
+     * 查询承运商列表
+     */
+    @ApiOperation(value="查看承运商列表", notes="根据承运商编码、名称、创建时间获取承运商信息", httpMethod = "POST")
+    @RequiresPermissions("general:carrier:list")
+    @Log(title = "通用-承运商管理", operating = "查看承运商列表", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(
+            @ApiParam(name="carrier",value="承运商编码、名称") Carrier carrier,
+            @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+            @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
+        LambdaQueryWrapper<Carrier> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), Carrier::getCreated, createdBegin)
+                .lt(StringUtils.isNotEmpty(createdEnd), Carrier::getCreated, createdEnd)
+                .eq(StringUtils.isNotEmpty(carrier.getCode()), Carrier::getCode, carrier.getCode())
+                .eq(StringUtils.isNotEmpty(carrier.getName()), Carrier::getName, carrier.getName())
+                .eq(Carrier::getWarehouseCode, ShiroUtils.getWarehouseCode());
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            /*使用分页查询*/
+            Page<Carrier> page = new Page<>(pageNum, pageSize);
+            IPage<Carrier> iPage = carrierService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(iPage.getRecords(), iPage.getTotal());
+        } else {
+            List<Carrier> list = carrierService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+    /**
+     * 新增承运商
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存承运商
+     */
+    @ApiOperation(value="新增承运商", notes="新增承运商", httpMethod = "POST")
+    @RequiresPermissions("general:carrier:add")
+    @Log(title = "通用-承运商", operating = "新增承运商", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(@ApiParam(name = "containerType", value = "承运商", required = true)
+                                      Carrier carrier)  {
+        carrier.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        carrier.setCreatedBy(ShiroUtils.getLoginName());
+        carrier.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return toAjax(carrierService.save(carrier));
+    }
+
+    /**
+     * 修改承运商
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+        mmap.put("carrier", carrierService.getById(id));
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存承运商
+     */
+    @ApiOperation(value="修改承运商", notes="修改承运商", httpMethod = "POST")
+    @RequiresPermissions("general:carrier:edit")
+    @Log(title = "通用-承运商", operating = "修改承运商", action = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(
+            @ApiParam(name = "carrier", value = "承运商", required = true)Carrier carrier) {
+        carrier.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return toAjax(carrierService.updateById(carrier));
+    }
+
+    /**
+     * 删除承运商
+     */
+    @ApiOperation(value="删除承运商", notes="根据id批量删除承运商，参数示例1,2,3", httpMethod = "POST")
+    @RequiresPermissions("general:carrier:remove")
+    @Log(title = "通用-承运商", operating = "删除承运商", action = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        if (StringUtils.isEmpty(ids)){
+            return AjaxResult.error("id不能为空");
+        }
+        List<Integer> list = new ArrayList<>();
+        for (Integer id : Convert.toIntArray(ids)) {
+            list.add(id);
+        }
+        return toAjax(carrierService.removeByIds(list));
+    }
+}
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.poi.ExcelUtil;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
@@ -28,6 +29,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.util.List;
@@ -179,4 +181,23 @@ public class MaterialController extends BaseController {
         }
     }
+    @PostMapping("/importData")
+    @ResponseBody
+    public AjaxResult importData(MultipartFile file) throws Exception {
+        ExcelUtil<Material> util = new ExcelUtil<>(Material.class);
+        List<Material> materialList = util.importExcel(file.getInputStream());
+        String operName = ShiroUtils.getLoginName();
+        Boolean updateSupport = false;
+        String message = materialService.importMaterial(materialList, updateSupport, operName);
+        return AjaxResult.success(message);
+    }
+
+    @GetMapping("/importTemplate")
+    @ResponseBody
+    public AjaxResult importTemplate() {
+        ExcelUtil<Material> util = new ExcelUtil<>(Material.class);
+        return util.importTemplateExcel("物料");
+    }
+
+
 }
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.huaheng.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
@@ -17,8 +18,9 @@ public class Material implements Serializable {
     /**
      * ID
      */
-     @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     @ApiModelProperty(value="ID")
+    @Excel(name = "ID")
     private Integer id;
     /**
@@ -26,6 +28,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "code")
     @ApiModelProperty(value="物料编码")
+    @Excel(name = "物料编码")
     private String code;
     /**
@@ -33,6 +36,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "companyCode")
     @ApiModelProperty(value="货主编码")
+    @Excel(name = "货主编码")
     private String companyCode;
     /**
@@ -40,6 +44,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "warehouseCode")
     @ApiModelProperty(value="仓库编码")
+    @Excel(name = "仓库编码")
     private String warehouseCode;
     /**
@@ -47,6 +52,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "name")
     @ApiModelProperty(value="名称")
+    @Excel(name = "名称")
     private String name;
     /**
@@ -54,6 +60,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "spec")
     @ApiModelProperty(value="规格")
+    @Excel(name = "规格")
     private String spec;
     /**
@@ -61,6 +68,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "unit")
     @ApiModelProperty(value="单位")
+    @Excel(name = "单位")
     private String unit;
     /**
@@ -68,6 +76,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "type")
     @ApiModelProperty(value="类别")
+    @Excel(name = "类别")
     private String type;
     /**
@@ -75,6 +84,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "abcClass")
     @ApiModelProperty(value="ABC分类")
+    @Excel(name = "ABC分类")
     private String abcClass;
     /**
@@ -82,6 +92,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "daysToExpire")
     @ApiModelProperty(value="保质期（天）")
+    @Excel(name = "保质期（天）")
     private Integer daysToExpire;
     /**
@@ -89,6 +100,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "locatingRule")
     @ApiModelProperty(value="定位规则")
+    @Excel(name = "定位规则")
     private String locatingRule;
     /**
@@ -96,6 +108,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "allocationRule")
     @ApiModelProperty(value="分配规则")
+    @Excel(name = "分配规则")
     private String allocationRule;
     /**
@@ -103,6 +116,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "replenishmentRule")
     @ApiModelProperty(value="补货规则")
+    @Excel(name = "补货规则")
     private String replenishmentRule;
     /**
@@ -110,6 +124,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "emptyLocRule")
     @ApiModelProperty(value="空货位规则")
+    @Excel(name = "空货位规则")
     private String emptyLocRule;
     /**
@@ -117,6 +132,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "receivingFlow")
     @ApiModelProperty(value="入库流程")
+    @Excel(name = "入库流程")
     private String receivingFlow;
     /**
@@ -124,6 +140,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "shippingFlow")
     @ApiModelProperty(value="出库流程")
+    @Excel(name = "出库流程")
     private String shippingFlow;
     /**
@@ -131,6 +148,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "attributeTemplateCode")
     @ApiModelProperty(value="属性模版")
+    @Excel(name = "属性模版")
     private String attributeTemplateCode;
     /**
@@ -138,6 +156,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "trackSerialNum")
     @ApiModelProperty(value="记录序列号")
+    @Excel(name = "记录序列号")
     private Integer trackSerialNum;
     /**
@@ -145,6 +164,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "autoGenSerialNum")
     @ApiModelProperty(value="自动生成序列号")
+    @Excel(name = "自动生成序列号")
     private Integer autoGenSerialNum;
     /**
@@ -152,6 +172,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "autoGenSerialNumFormat")
     @ApiModelProperty(value="自动生成序列号表达式")
+    @Excel(name = "自动生成序列号表达式")
     private String autoGenSerialNumFormat;
     /**
@@ -159,6 +180,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "snTemplateCode")
     @ApiModelProperty(value="序列号模版")
+    @Excel(name = "序列号模版")
     private String snTemplateCode;
     /**
@@ -166,6 +188,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "expiringDays")
     @ApiModelProperty(value="临期预警天数")
+    @Excel(name = "临期预警天数")
     private Integer expiringDays;
     /**
@@ -173,6 +196,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "minShelfLifeDays")
     @ApiModelProperty(value="收货预警天数")
+    @Excel(name = "收货预警天数")
     private Integer minShelfLifeDays;
     /**
@@ -194,6 +218,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "createdBy")
     @ApiModelProperty(value="创建用户")
+
     private String createdBy;
     /**
@@ -215,6 +240,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "version")
     @ApiModelProperty(value="数据版本")
+    @Excel(name = "数据版本")
     private Integer version;
     /**
@@ -222,6 +248,7 @@ public class Material implements Serializable {
      */
     @TableField(value = "userDef1")
     @ApiModelProperty(value="是否AGV区域发货")
+    @Excel(name = "是否AGV区域发货")
     private String userDef1;
     /**
@@ -3,8 +3,15 @@ package com.huaheng.pc.general.material.service;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.general.material.domain.Material;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
 public interface MaterialService extends IService<Material>{
     AjaxResult removeByIds(String ids);
+
+    public String importMaterial(List<Material> materialList, Boolean updateSupport,String operName);
+
+
 }
@@ -2,7 +2,9 @@ package com.huaheng.pc.general.material.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.exception.BusinessException;
 import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
@@ -16,6 +18,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.general.material.mapper.MaterialMapper;
 import com.huaheng.pc.general.material.domain.Material;
 import com.huaheng.pc.general.material.service.MaterialService;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> implements MaterialService{
@@ -46,4 +50,50 @@ public class MaterialServiceImpl extends ServiceImpl&lt;MaterialMapper, Material&gt; i
         }
         return AjaxResult.success("成功删除"+count+"条记录");
     }
+
+    /**
+     * 导入物料数据
+     *
+     * @param materialList        用户数据列表
+     * @param operName        操作用户
+     * @return 结果
+     */
+    @Override
+    public String importMaterial(List<Material> materialList, Boolean isUpdateSupport, String operName) {
+        if (StringUtils.isNull(materialList) || materialList.size() == 0) {
+            throw new  BusinessException("导入数据不能为空！");
+        }
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (Material material : materialList) {
+            try {
+                LambdaQueryWrapper<Material> lambdaQueryWrapper = Wrappers.lambdaQuery();
+                lambdaQueryWrapper.eq(Material::getCode, material.getCode());
+                // 验证是否存在这个用户
+                Material m = this.getOne(lambdaQueryWrapper);
+                if (StringUtils.isNull(m)) {
+                    System.out.println(ShiroUtils.getLoginName());
+                    material.setCreatedBy(ShiroUtils.getUser().getLoginName());
+                    material.setLastUpdatedBy(ShiroUtils.getLoginName());
+                    this.save(material);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、编码 " + material.getCode() + " 导入成功");
+                }
+            } catch (Exception e) {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、编码" + material.getCode() + " 导入失败：";
+                failureMsg.append(msg + e.getMessage());
+                log.error(msg, e);
+            }
+        }
+        if (failureNum > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new BusinessException(failureMsg.toString());
+        } else {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
 }
-package com.huaheng.pc.receipt.receiptType.service;
-
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huaheng.pc.receipt.receiptType.domain.ReceiptType;
-import com.huaheng.pc.receipt.receiptType.mapper.ReceiptTypeMapper;
-import com.huaheng.pc.receipt.receiptType.service.ReceiptTypeService;
-@Service
-public class ReceiptTypeServiceImpl extends ServiceImpl<ReceiptTypeMapper, ReceiptType> implements ReceiptTypeService{
-
-}
@@ -41,7 +41,7 @@ public class ExcelReportController extends BaseController {
     @GetMapping("/getreport")
     @ResponseBody
     public void getReport(@RequestParam Map<String, String> params,HttpServletResponse response){
-        excelReportService.getReport(params, response);
+//        excelReportService.getReport(params, response);
     }
     /**
@@ -67,7 +67,8 @@ public class ExcelReportController extends BaseController {
     @ResponseBody
     public AjaxResult addSave(Excelreport excelreport)
     {
-        return excelReportService.save(excelreport);
+//        return excelReportService.save(excelreport);
+        return AjaxResult.success(1);
     }
     @GetMapping("/edit/{id}")
@@ -21,34 +21,34 @@ public class ExcelReportService {
     @Resource
     private ExcelReportMapper mapper;
-    public void getReport(@RequestParam Map<String, String> params, HttpServletResponse response) {
-        if(!params.containsKey("id")){
-//            return AjaxResult.error("未传递Id");
-            return;
-        }
-        Excelreport excelreport = mapper.selectById(Convert.toInt(params.get("id")));
-        if(excelreport==null){
-//            return AjaxResult.error("报表未配置");
-            return;
-        }
-        List<LinkedHashMap<String, Object>> list = mapper.selectCommon(excelreport.getSql());
-        ExcelUtil excelUtil = new ExcelUtil();
-        excelUtil.exportExcel2(list, excelreport.getName(),response);
-    }
-
-    public AjaxResult save(Excelreport excelreport) {
-        String sql = excelreport.getSql().toLowerCase();
-        if(sql.contains("delete")||sql.contains("update")||sql.contains("drop")){
-            return AjaxResult.error("含有危险sql脚本");
-        }
-        excelreport.setCreated(new Date());
-        excelreport.setCreatedBy(ShiroUtils.getLoginName());
-        excelreport.setWarehouseCode(ShiroUtils.getWarehouseCode());
-        int i = mapper.insert(excelreport);
-        if(i>0){
-            return AjaxResult.success("成功");
-        }else {
-            return AjaxResult.error("新增失败");
-        }
-    }
+//    public void getReport(@RequestParam Map<String, String> params, HttpServletResponse response) {
+//        if(!params.containsKey("id")){
+////            return AjaxResult.error("未传递Id");
+//            return;
+//        }
+//        Excelreport excelreport = mapper.selectById(Convert.toInt(params.get("id")));
+//        if(excelreport==null){
+////            return AjaxResult.error("报表未配置");
+//            return;
+//        }
+//        List<LinkedHashMap<String, Object>> list = mapper.selectCommon(excelreport.getSql());
+//        ExcelUtil excelUtil = new ExcelUtil();
+//        excelUtil.exportExcel2(list, excelreport.getName(),response);
+//    }
+//
+//    public AjaxResult save(Excelreport excelreport) {
+//        String sql = excelreport.getSql().toLowerCase();
+//        if(sql.contains("delete")||sql.contains("update")||sql.contains("drop")){
+//            return AjaxResult.error("含有危险sql脚本");
+//        }
+//        excelreport.setCreated(new Date());
+//        excelreport.setCreatedBy(ShiroUtils.getLoginName());
+//        excelreport.setWarehouseCode(ShiroUtils.getWarehouseCode());
+//        int i = mapper.insert(excelreport);
+//        if(i>0){
+//            return AjaxResult.success("成功");
+//        }else {
+//            return AjaxResult.error("新增失败");
+//        }
+//    }
 }
@@ -223,6 +223,7 @@ public class ShipmentDetail implements Serializable {
     @ApiModelProperty(value="包装分类")
     private String packingClass;
+
     /**
      * 状态
      */
+package com.huaheng.pc.tool.in;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("/tool/import")
+public class importController {
+
+    private String prefix = "tool/import";
+
+    @RequiresPermissions("tool:import:view")
+    @GetMapping()
+    public String in() {
+        return prefix + "/import";
+    }
+}
-#\u6570\u636E\u6E90\u914D\u7F6E
+# 数据源配置
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-#\u4E3B\u5E93
+# 主库
 spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
 #spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/huahengExample?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
 #spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/huaheng?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
@@ -11,12 +11,12 @@ spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/wms_v2?useUnic
 spring.datasource.druid.master.username=softhuaheng
 spring.datasource.druid.master.password=HHrobot123.
-##\u4ECE\u5E93
+# 从库
 #spring.datasource.druid.slave.open = true
 #spring.datasource.druid.slave.url=jdbc:mysql://172.16.29.45:3306/huaheng?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
 #spring.datasource.druid.master.username=softhuaheng
 #spring.datasource.druid.master.password=HHrobot123.
-# \u521D\u59CB\u8FDE\u63A5\u6570
+# 初始连接数
 spring.datasource.druid.initial-size=10
 # \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
 spring.datasource.druid.max-active=100
-#\u9879\u76EE\u76F8\u5173\u914D\u7F6E
-#\u540D\u79F0
-huaheng.name=huaheng
-#\u7248\u672C
-huaheng.version=4.0.0
-#\u7248\u6743\u5E74\u4EFD
-huaheng.copyrightYear=2018
-#\u5934\u50CF\u4E0A\u4F20\u8DEF\u5F84
-huaheng.profile=C:/profile/
-# \u83B7\u53D6ip\u5730\u5740\u5F00\u5173
-huaheng.addressEnabled=false
-
-#\u5F00\u53D1\u73AF\u5883\u914D\u7F6E
-#\u6D4B\u8BD5\u670D\u52A1\u7AEF\u53E3\u3001\u6D4B\u8BD5\u9879\u76EEcontextPath
-server.port=8888
-server.servlet.context-path=/twms/
-#\u793A\u4F8B\u670D\u52A1\u7AEF\u53E3\u3001\u793A\u4F8B\u9879\u76EEcontextPath
-#server.port=8889
-#server.servlet.context-path=/ewms/
-#\u6B63\u5F0F\u670D\u52A1\u7AEF\u53E3\u3001\u6B63\u5F0F\u9879\u76EEcontextPath
-#server.port=8016
-#server.servlet.context-path=/wms/
-# tomcat\u7684URI\u7F16\u7801
-server.tomcat.uri-encoding=UTF-8
-# tomcat\u6700\u5927\u7EBF\u7A0B\u6570\uFF0C\u9ED8\u8BA4\u4E3A200
-server.tomcat.max-threads=800
-# Tomcat\u542F\u52A8\u521D\u59CB\u5316\u7684\u7EBF\u7A0B\u6570\uFF0C\u9ED8\u8BA4\u503C25
-server.tomcat.min-spare-threads=30
-
-#\u65E5\u5FD7\u914D\u7F6E
-logging.level.com.huaheng=DEBUG
-logging.level.org.springframework=WARN
-logging.level.org.spring.springboot.dao=DEBUG
-
-#\u7528\u6237\u914D\u7F6E
-#\u5BC6\u7801\u9519\u8BEF5\u6B21\u9501\u5B9A10\u5206\u949F
-user.password.maxRetryCount=5
-
-#Spring\u914D\u7F6E
-spring.thymeleaf.mode=HTML
-spring.thymeleaf.encoding=utf-8
-# \u7981\u7528\u7F13\u5B58
-spring.thymeleaf.cache=false
-#\u56FD\u9645\u5316\u8D44\u6E90\u6587\u4EF6\u8DEF\u5F84
-spring.messages.basename=i18n/messages
-spring.jackson.time-zone=GMT+8
-spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
-spring.profiles.active=druid
-#\u6587\u4EF6\u4E0A\u4F20
-spring.servlet.multipart.max-file-size=30MB
-spring.servlet.multipart.max-request-size=30MB
-#\u70ED\u90E8\u7F72\u5F00\u5173
-spring.devtools.restart.enabled=true
-#activiti \u81EA\u52A8\u90E8\u7F72\u9A8C\u8BC1\u8BBE\u7F6E
-#spring.activiti.check-process-definitions=false
-
-mybatis-plus.mapper-locations=classpath:mybatis/**/*.xml
-mybatis-plus.type-aliases-package=com.huaheng.pc.**.**.domain
-
-# PageHelper
-pagehelper.helperDialect=mysql
-pagehelper.reasonable=true
-pagehelper.supportMethodsArguments=true
-pagehelper.pparams=count=countSql
-
-# Shiro
-# \u767B\u5F55\u5730\u5740
-shiro.user.loginUrl=/login
-# \u6743\u9650\u8BA4\u8BC1\u5931\u8D25\u5730\u5740
-shiro.user.unauthorizedUrl=/unauth
-# \u9996\u9875\u5730\u5740
-shiro.user.indexUrl=/index
-# \u9A8C\u8BC1\u7801\u5F00\u5173
-shiro.user.captchaEnabled=false
-# \u9A8C\u8BC1\u7801\u7C7B\u578B math \u6570\u7EC4\u8BA1\u7B97 char \u5B57\u7B26
-shiro.user.captchaType=math
-# \u8BBE\u7F6ECookie\u7684\u57DF\u540D \u9ED8\u8BA4\u7A7A\uFF0C\u5373\u5F53\u524D\u8BBF\u95EE\u7684\u57DF\u540D
-shiro.cookie.domain =
-# \u8BBE\u7F6Ecookie\u7684\u6709\u6548\u8BBF\u95EE\u8DEF\u5F84
-shiro.cookie.path=/
-# \u8BBE\u7F6EHttpOnly\u5C5E\u6027
-shiro.cookie.httpOnly=true
-# \u8BBE\u7F6ECookie\u7684\u8FC7\u671F\u65F6\u95F4\uFF0C\u5929\u4E3A\u5355\u4F4D
-shiro.cookie.maxAge=30
-# Session\u8D85\u65F6\u65F6\u95F4\uFF08\u9ED8\u8BA430\u5206\u949F\uFF09
-shiro.session.expireTime=30
-# \u540C\u6B65session\u5230\u6570\u636E\u5E93\u7684\u5468\u671F\uFF08\u9ED8\u8BA41\u5206\u949F\uFF09
-shiro.session.dbSyncPeriod=1
-# \u76F8\u9694\u591A\u4E45\u68C0\u67E5\u4E00\u6B21session\u7684\u6709\u6548\u6027\uFF0C\u9ED8\u8BA4\u5C31\u662F10\u5206\u949F
-shiro.session.validationInterval=10
-
-# \u9632\u6B62XSS\u653B\u51FB
-# \u8FC7\u6EE4\u5F00\u5173
-xss.enabled=true
-# \u6392\u9664\u94FE\u63A5\uFF08\u591A\u4E2A\u7528\u9017\u53F7\u5206\u9694\uFF09
-xss.excludes=/system/notice/*
-# \u5339\u914D\u94FE\u63A5
-xss.urlPatterns=/system/*,/monitor/*,/tool/*
-
-# \u4EE3\u7801\u751F\u6210
-# \u4F5C\u8005
-gen.author=huaheng
-# \u9ED8\u8BA4\u751F\u6210\u5305\u8DEF\u5F84 module \u9700\u6539\u6210\u81EA\u5DF1\u7684\u6A21\u5757\u540D\u79F0 \u5982 system monitor tool
-gen.packageName=com.huaheng.pc.task
-# \u81EA\u52A8\u53BB\u9664\u8868\u524D\u7F00\uFF0C\u9ED8\u8BA4\u662Ftrue
-gen.autoRemovePre=false
-# \u8868\u524D\u7F00(\u7C7B\u540D\u4E0D\u4F1A\u5305\u542B\u8868\u524D\u7F00)
-gen.tablePrefix=sys_
-
-
-
+#\u9879\u76EE\u76F8\u5173\u914D\u7F6E
+#\u540D\u79F0
+huaheng:
+  name: huaheng
+#\u7248\u672C
+  version: 4.0.0
+#\u7248\u6743\u5E74\u4EFD
+  copyrightYear: 2018
+# \u6587\u4EF6\u8DEF\u5F84 \u793A\u4F8B\uFF08 Windows\u914D\u7F6ED:/ruoyi/uploadPath\uFF0CLinux\u914D\u7F6E /home/ruoyi/uploadPath\uFF09
+  profile: D:/ruoyi/uploadPath
+# \u83B7\u53D6ip\u5730\u5740\u5F00\u5173
+  addressEnabled: false
+
+#\u5F00\u53D1\u73AF\u5883\u914D\u7F6E
+#\u6D4B\u8BD5\u670D\u52A1\u7AEF\u53E3\u3001\u6D4B\u8BD5\u9879\u76EEcontextPath
+server:
+  port: 8888
+  servlet:
+    context-path: /twms/
+#\u793A\u4F8B\u670D\u52A1\u7AEF\u53E3\u3001\u793A\u4F8B\u9879\u76EEcontextPath
+#server.port=8889
+#server.servlet.context-path=/ewms/
+#\u6B63\u5F0F\u670D\u52A1\u7AEF\u53E3\u3001\u6B63\u5F0F\u9879\u76EEcontextPath
+#server.port=8016
+#server.servlet.context-path=/wms/
+# tomcat\u7684URI\u7F16\u7801
+  tomcat:
+    uri-encoding: UTF-8
+# tomcat\u6700\u5927\u7EBF\u7A0B\u6570\uFF0C\u9ED8\u8BA4\u4E3A200
+    max-threads: 800
+# Tomcat\u542F\u52A8\u521D\u59CB\u5316\u7684\u7EBF\u7A0B\u6570\uFF0C\u9ED8\u8BA4\u503C25
+    min-spare-threads: 30
+
+#\u65E5\u5FD7\u914D\u7F6E
+logging:
+  level:
+    com.huaheng: debug
+    org.springframework: warn
+    spring.springboot.dao: DEBUG
+
+# \u7528\u6237\u914D\u7F6E
+user:
+  password:
+    # \u5BC6\u7801\u9519\u8BEF{maxRetryCount}\u6B21\u9501\u5B9A10\u5206\u949F
+    maxRetryCount: 5
+
+# Spring\u914D\u7F6E
+spring:
+  # \u6A21\u677F\u5F15\u64CE
+  thymeleaf:
+    mode: HTML
+    encoding: utf-8
+    # \u7981\u7528\u7F13\u5B58
+    cache: false
+#\u56FD\u9645\u5316\u8D44\u6E90\u6587\u4EF6\u8DEF\u5F84
+  messages:
+    basename: i18n/messages
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+  profiles:
+    active: druid
+  # \u6587\u4EF6\u4E0A\u4F20
+  servlet:
+    multipart:
+      # \u5355\u4E2A\u6587\u4EF6\u5927\u5C0F
+      max-file-size:  30MB
+      # \u8BBE\u7F6E\u603B\u4E0A\u4F20\u7684\u6587\u4EF6\u5927\u5C0F
+      max-request-size:  30MB
+  # \u670D\u52A1\u6A21\u5757
+  devtools:
+    restart:
+      # \u70ED\u90E8\u7F72\u5F00\u5173
+      enabled: true
+
+mybatis-plus:
+  mapper-locations: classpath:mybatis/**/*.xml
+  type-aliases-package: com.huaheng.pc.**.**.domain
+
+# PageHelper\u5206\u9875\u63D2\u4EF6
+pagehelper:
+  helperDialect: mysql
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql
+
+# Shiro
+shiro:
+  user:
+    # \u767B\u5F55\u5730\u5740
+    loginUrl: /login
+    # \u6743\u9650\u8BA4\u8BC1\u5931\u8D25\u5730\u5740
+    unauthorizedUrl: /unauth
+    # \u9996\u9875\u5730\u5740
+    indexUrl: /index
+    # \u9A8C\u8BC1\u7801\u5F00\u5173
+    captchaEnabled: false
+    # \u9A8C\u8BC1\u7801\u7C7B\u578B math \u6570\u7EC4\u8BA1\u7B97 char \u5B57\u7B26
+    captchaType: math
+  cookie:
+    # \u8BBE\u7F6ECookie\u7684\u57DF\u540D \u9ED8\u8BA4\u7A7A\uFF0C\u5373\u5F53\u524D\u8BBF\u95EE\u7684\u57DF\u540D
+    domain:
+    # \u8BBE\u7F6Ecookie\u7684\u6709\u6548\u8BBF\u95EE\u8DEF\u5F84
+    path: /
+    # \u8BBE\u7F6EHttpOnly\u5C5E\u6027
+    httpOnly: true
+    # \u8BBE\u7F6ECookie\u7684\u8FC7\u671F\u65F6\u95F4\uFF0C\u5929\u4E3A\u5355\u4F4D
+    maxAge: 30
+  session:
+    # Session\u8D85\u65F6\u65F6\u95F4\uFF08\u9ED8\u8BA430\u5206\u949F\uFF09
+    expireTime: 30
+    # \u540C\u6B65session\u5230\u6570\u636E\u5E93\u7684\u5468\u671F\uFF08\u9ED8\u8BA41\u5206\u949F\uFF09
+    dbSyncPeriod: 1
+    # \u76F8\u9694\u591A\u4E45\u68C0\u67E5\u4E00\u6B21session\u7684\u6709\u6548\u6027\uFF0C\u9ED8\u8BA4\u5C31\u662F10\u5206\u949F
+    validationInterval: 10
+
+# \u9632\u6B62XSS\u653B\u51FB
+xss:
+  # \u8FC7\u6EE4\u5F00\u5173
+  enabled: true
+  # \u6392\u9664\u94FE\u63A5\uFF08\u591A\u4E2A\u7528\u9017\u53F7\u5206\u9694\uFF09
+  excludes: /system/notice/*
+  # \u5339\u914D\u94FE\u63A5
+  urlPatterns: /system/*,/monitor/*,/tool/*
+
+# \u4EE3\u7801\u751F\u6210
+# \u4F5C\u8005
+gen:
+  author: huaheng
+# \u9ED8\u8BA4\u751F\u6210\u5305\u8DEF\u5F84 module \u9700\u6539\u6210\u81EA\u5DF1\u7684\u6A21\u5757\u540D\u79F0 \u5982 system monitor tool
+  packageName: com.huaheng.pc.task
+# \u81EA\u52A8\u53BB\u9664\u8868\u524D\u7F00\uFF0C\u9ED8\u8BA4\u662Ftrue
+  autoRemovePre: false
+# \u8868\u524D\u7F00(\u7C7B\u540D\u4E0D\u4F1A\u5305\u542B\u8868\u524D\u7F00)
+  gen.tablePrefix: sys_
+
+
+
 <?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.huaheng.pc.receipt.receiptType.mapper.ReceiptTypeMapper">
-  <resultMap id="BaseResultMap" type="com.huaheng.pc.receipt.receiptType.domain.ReceiptType">
+<mapper namespace="com.huaheng.pc.config.receiptType.mapper.ReceiptTypeMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.config.receiptType.domain.ReceiptType">
     <!--@mbg.generated-->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
@@ -9,7 +9,7 @@
     <result column="code" jdbcType="VARCHAR" property="code" />
     <result column="referType" jdbcType="VARCHAR" property="referType" />
     <result column="receiptFlow" jdbcType="VARCHAR" property="receiptFlow" />
-    <result column="enable" jdbcType="VARCHAR" property="enable" />
+    <result column="enable" jdbcType="BIT" property="enable" />
     <result column="created" jdbcType="TIMESTAMP" property="created" />
     <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
     <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
+<?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.huaheng.pc.general.bom.mapper.BomDetailMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.general.bom.domain.BomDetail">
+    <!--@mbg.generated-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
+    <result column="bomId" jdbcType="INTEGER" property="bomId" />
+    <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
+    <result column="materialName" jdbcType="VARCHAR" property="materialName" />
+    <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
+    <result column="buildLevel" jdbcType="INTEGER" property="buildLevel" />
+    <result column="buildSequence" jdbcType="INTEGER" property="buildSequence" />
+    <result column="qty" jdbcType="INTEGER" property="qty" />
+    <result column="allocationRule" jdbcType="VARCHAR" property="allocationRule" />
+    <result column="fromLocation" jdbcType="VARCHAR" property="fromLocation" />
+    <result column="enable" jdbcType="BIT" property="enable" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
+    <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
+    <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
+    <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
+    <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
+    <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
+    <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
+    <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
+    <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
+    <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, warehouseCode, companyCode, bomId, materialCode, materialName, materialUnit, 
+    buildLevel, buildSequence, qty, allocationRule, fromLocation, `enable`, created, 
+    createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, 
+    userDef5, userDef6, userDef7, userDef8, processStamp
+  </sql>
+</mapper>
 \ No newline at end of file
+/** layui-v2.4.5 MIT License By https://www.layui.com */
+ ;layui.define("layer",function(e){"use strict";var i=layui.$,t=layui.layer,n=layui.hint(),a=layui.device(),o={config:{},set:function(e){var t=this;return t.config=i.extend({},t.config,e),t},on:function(e,i){return layui.onevent.call(this,r,e,i)}},l=function(){var e=this;return{upload:function(i){e.upload.call(e,i)},config:e.config}},r="upload",u="layui-upload-file",c="layui-upload-form",f="layui-upload-iframe",s="layui-upload-choose",p=function(e){var t=this;t.config=i.extend({},t.config,o.config,e),t.render()};p.prototype.config={accept:"images",exts:"",auto:!0,bindAction:"",url:"",field:"file",method:"post",data:{},drag:!0,size:0,number:0,multiple:!1},p.prototype.render=function(e){var t=this,e=t.config;e.elem=i(e.elem),e.bindAction=i(e.bindAction),t.file(),t.events()},p.prototype.file=function(){var e=this,t=e.config,n=e.elemFile=i(['<input class="'+u+'" type="file" accept="'+t.acceptMime+'" name="'+t.field+'"',t.multiple?" multiple":"",">"].join("")),o=t.elem.next();(o.hasClass(u)||o.hasClass(c))&&o.remove(),a.ie&&a.ie<10&&t.elem.wrap('<div class="layui-upload-wrap"></div>'),e.isFile()?(e.elemFile=t.elem,t.field=t.elem[0].name):t.elem.after(n),a.ie&&a.ie<10&&e.initIE()},p.prototype.initIE=function(){var e=this,t=e.config,n=i('<iframe id="'+f+'" class="'+f+'" name="'+f+'" frameborder="0"></iframe>'),a=i(['<form target="'+f+'" class="'+c+'" method="post" key="set-mine" enctype="multipart/form-data" action="'+t.url+'">',"</form>"].join(""));i("#"+f)[0]||i("body").append(n),t.elem.next().hasClass(c)||(e.elemFile.wrap(a),t.elem.next("."+c).append(function(){var e=[];return layui.each(t.data,function(i,t){t="function"==typeof t?t():t,e.push('<input type="hidden" name="'+i+'" value="'+t+'">')}),e.join("")}()))},p.prototype.msg=function(e){return t.msg(e,{icon:2,shift:6})},p.prototype.isFile=function(){var e=this.config.elem[0];if(e)return"input"===e.tagName.toLocaleLowerCase()&&"file"===e.type},p.prototype.preview=function(e){var i=this;window.FileReader&&layui.each(i.chooseFiles,function(i,t){var n=new FileReader;n.readAsDataURL(t),n.onload=function(){e&&e(i,t,this.result)}})},p.prototype.upload=function(e,t){var n,o=this,l=o.config,r=o.elemFile[0],u=function(){var t=0,n=0,a=e||o.files||o.chooseFiles||r.files,u=function(){l.multiple&&t+n===o.fileLength&&"function"==typeof l.allDone&&l.allDone({total:o.fileLength,successful:t,aborted:n})};layui.each(a,function(e,a){var r=new FormData;r.append(l.field,a),layui.each(l.data,function(e,i){i="function"==typeof i?i():i,r.append(e,i)}),i.ajax({url:l.url,type:"post",data:r,contentType:!1,processData:!1,dataType:"json",headers:l.headers||{},success:function(i){t++,d(e,i),u()},error:function(){n++,o.msg("请求上传接口出现异常"),m(e),u()}})})},c=function(){var e=i("#"+f);o.elemFile.parent().submit(),clearInterval(p.timer),p.timer=setInterval(function(){var i,t=e.contents().find("body");try{i=t.text()}catch(n){o.msg("获取上传后的响应信息出现异常"),clearInterval(p.timer),m()}i&&(clearInterval(p.timer),t.html(""),d(0,i))},30)},d=function(e,i){if(o.elemFile.next("."+s).remove(),r.value="","object"!=typeof i)try{i=JSON.parse(i)}catch(t){return i={},o.msg("请对上传接口返回有效JSON")}"function"==typeof l.done&&l.done(i,e||0,function(e){o.upload(e)})},m=function(e){l.auto&&(r.value=""),"function"==typeof l.error&&l.error(e||0,function(e){o.upload(e)})},h=l.exts,v=function(){var i=[];return layui.each(e||o.chooseFiles,function(e,t){i.push(t.name)}),i}(),g={preview:function(e){o.preview(e)},upload:function(e,i){var t={};t[e]=i,o.upload(t)},pushFile:function(){return o.files=o.files||{},layui.each(o.chooseFiles,function(e,i){o.files[e]=i}),o.files},resetFile:function(e,i,t){var n=new File([i],t);o.files=o.files||{},o.files[e]=n}},y=function(){if("choose"!==t&&!l.auto||(l.choose&&l.choose(g),"choose"!==t))return l.before&&l.before(g),a.ie?a.ie>9?u():c():void u()};if(v=0===v.length?r.value.match(/[^\/\\]+\..+/g)||[]||"":v,0!==v.length){switch(l.accept){case"file":if(h&&!RegExp("\\w\\.("+h+")$","i").test(escape(v)))return o.msg("选择的文件中包含不支持的格式"),r.value="";break;case"video":if(!RegExp("\\w\\.("+(h||"avi|mp4|wma|rmvb|rm|flash|3gp|flv")+")$","i").test(escape(v)))return o.msg("选择的视频中包含不支持的格式"),r.value="";break;case"audio":if(!RegExp("\\w\\.("+(h||"mp3|wav|mid")+")$","i").test(escape(v)))return o.msg("选择的音频中包含不支持的格式"),r.value="";break;default:if(layui.each(v,function(e,i){RegExp("\\w\\.("+(h||"jpg|png|gif|bmp|jpeg$")+")","i").test(escape(i))||(n=!0)}),n)return o.msg("选择的图片中包含不支持的格式"),r.value=""}if(o.fileLength=function(){var i=0,t=e||o.files||o.chooseFiles||r.files;return layui.each(t,function(){i++}),i}(),l.number&&o.fileLength>l.number)return o.msg("同时最多只能上传的数量为："+l.number);if(l.size>0&&!(a.ie&&a.ie<10)){var F;if(layui.each(o.chooseFiles,function(e,i){if(i.size>1024*l.size){var t=l.size/1024;t=t>=1?t.toFixed(2)+"MB":l.size+"KB",r.value="",F=t}}),F)return o.msg("文件不能超过"+F)}y()}},p.prototype.events=function(){var e=this,t=e.config,o=function(i){e.chooseFiles={},layui.each(i,function(i,t){var n=(new Date).getTime();e.chooseFiles[n+"-"+i]=t})},l=function(i,n){var a=e.elemFile,o=i.length>1?i.length+"个文件":(i[0]||{}).name||a[0].value.match(/[^\/\\]+\..+/g)||[]||"";a.next().hasClass(s)&&a.next().remove(),e.upload(null,"choose"),e.isFile()||t.choose||a.after('<span class="layui-inline '+s+'">'+o+"</span>")};t.elem.off("upload.start").on("upload.start",function(){var a=i(this),o=a.attr("lay-data");if(o)try{o=new Function("return "+o)(),e.config=i.extend({},t,o)}catch(l){n.error("Upload element property lay-data configuration item has a syntax error: "+o)}e.config.item=a,e.elemFile[0].click()}),a.ie&&a.ie<10||t.elem.off("upload.over").on("upload.over",function(){var e=i(this);e.attr("lay-over","")}).off("upload.leave").on("upload.leave",function(){var e=i(this);e.removeAttr("lay-over")}).off("upload.drop").on("upload.drop",function(n,a){var r=i(this),u=a.originalEvent.dataTransfer.files||[];r.removeAttr("lay-over"),o(u),t.auto?e.upload(u):l(u)}),e.elemFile.off("upload.change").on("upload.change",function(){var i=this.files||[];o(i),t.auto?e.upload():l(i)}),t.bindAction.off("upload.action").on("upload.action",function(){e.upload()}),t.elem.data("haveEvents")||(e.elemFile.on("change",function(){i(this).trigger("upload.change")}),t.elem.on("click",function(){e.isFile()||i(this).trigger("upload.start")}),t.drag&&t.elem.on("dragover",function(e){e.preventDefault(),i(this).trigger("upload.over")}).on("dragleave",function(e){i(this).trigger("upload.leave")}).on("drop",function(e){e.preventDefault(),i(this).trigger("upload.drop",e)}),t.bindAction.on("click",function(){i(this).trigger("upload.action")}),t.elem.data("haveEvents",!0))},o.render=function(e){var i=new p(e);return l.call(i)},e(r,o)});
 \ No newline at end of file
+ÎïÁÏ	code
@@ -159,7 +159,59 @@
                     }
                 });
                 return actions.join('');
-            }
+            },
+            // 导入数据
+            importExcel: function(formId) {
+                var currentId = $.common.isEmpty(formId) ? 'importTpl' : formId;
+                layer.open({
+                    type: 1,
+                    area: ['400px', '230px'],
+                    fix: false,
+                    //不固定
+                    maxmin: true,
+                    shade: 0.3,
+                    title: '导入' + $.table._option.modalName + '数据',
+                    content: $('#' + currentId).html(),
+                    btn: ['<i class="fa fa-check"></i> 导入', '<i class="fa fa-remove"></i> 取消'],
+                    // 弹层外区域关闭
+                    shadeClose: true,
+                    btn1: function(index, layero){
+                        var file = layero.find('#file').val();
+                        if (file == '' || (!$.common.endWith(file, '.xls') && !$.common.endWith(file, '.xlsx'))){
+                            $.modal.msgWarning("请选择后缀为 “xls”或“xlsx”的文件。");
+                            return false;
+                        }
+                        var index = layer.load(2, {shade: false});
+                        $.modal.disable();
+                        var formData = new FormData();
+                        formData.append("file", $('#file')[0].files[0]);
+                        formData.append("updateSupport", $("input[name='updateSupport']").is(':checked'));
+                        $.ajax({
+                            url: $.table._option.importUrl,
+                            data: formData,
+                            cache: false,
+                            contentType: false,
+                            processData: false,
+                            type: 'POST',
+                            success: function (result) {
+                                if (result.code == web_status.SUCCESS) {
+                                    $.modal.closeAll();
+                                    $.modal.alertSuccess(result.msg);
+                                    $.table.refresh();
+                                } else if (result.code == web_status.WARNING) {
+                                    layer.close(index);
+                                    $.modal.enable();
+                                    $.modal.alertWarning(result.msg)
+                                } else {
+                                    layer.close(index);
+                                    $.modal.enable();
+                                    $.modal.alertError(result.msg);
+                                }
+                            }
+                        });
+                    }
+                });
+            },
         },
         // 表格树封装处理
         treeTable: {
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-receiptType-add">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">编码：</label>
+            <div class="col-sm-8">
+                <input id="code" name="code" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">货主编码：</label>
+            <div class="col-sm-8">
+                <select id="companyCode" name="companyCode" class="form-control" th:with="companyList=${@companyService.selectCompanyByCurrentUserId()}">
+                    <option th:each="company : ${companyList}" th:text="${company['name']}" th:value="${company['code']}"></option>
+                </select>
+            </div>
+        </div>
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="warehouseId" name="warehouseId" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">仓库编码：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="warehouseCode" name="warehouseCode" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <div class="form-group">
+            <label class="col-sm-3 control-label">关联订单类型：</label>
+            <div class="col-sm-8">
+                <input id="referType" name="referType" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">入库流程：</label>
+            <div class="col-sm-8">
+                <input id="receiptFlow" name="receiptFlow" class="form-control" type="text">
+            </div>
+        </div>
+        <!--<div class="form-group">
+            <label class="col-sm-3 control-label">数据版本：</label>
+            <div class="col-sm-8">
+                <input id="version" name="version" class="form-control" type="text">
+            </div>
+        </div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">创建时间：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="created" name="created" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">创建者：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">创建时间：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">更新者：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">是否有效：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
+        <!--<div class="onoffswitch">-->
+        <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
+        <!--<label class="onoffswitch-label" for="enable">-->
+        <!--<span class="onoffswitch-inner"></span>-->
+        <!--<span class="onoffswitch-switch"></span>-->
+        <!--</label>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">是否删除：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <div class="form-group">
+            <label class="col-sm-3 control-label">是否启用：</label>
+            <div class="col-sm-8">
+                <div class="onoffswitch">
+                    <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
+                    <label class="onoffswitch-label" for="enable">
+                        <span class="onoffswitch-inner"></span>
+                        <span class="onoffswitch-switch"></span>
+                    </label>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="form-control-static col-sm-offset-9">
+                <button type="submit" class="btn btn-primary">提交</button>
+                <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
+            </div>
+        </div>
+    </form>
+</div>
+<div th:include="include::footer"></div>
+<script type="text/javascript">
+    var prefix = ctx + "config/receiptType";
+    $("#form-receiptType-add").validate({
+        rules:{
+            code:{
+                required:true,
+            },
+            referType:{
+                required:true,
+            },
+            receiptFlow:{
+                required:true,
+            },
+        },
+        submitHandler: function(form) {
+            // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
+            var tableValue = $.common.getTableValue("#form-receiptType-add");
+            tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val());
+            tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
+            $.operate.save(prefix + "/add", tableValue);
+        }
+    });
+</script>
+</body>
+</html>
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-receiptType-edit" th:object="${receiptType}">
+        <input name="id" type="hidden" th:field="*{id}">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">编码：</label>
+            <div class="col-sm-8">
+                <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">货主编码：</label>
+            <div class="col-sm-8">
+                <select id="companyCode" name="companyCode" class="form-control" th:with="companyList=${@companyService.selectCompanyByCurrentUserId()}"
+                        th:field="*{companyCode}">
+                    <option th:each="company : ${companyList}" th:text="${company['name']}" th:value="${company['code']}"></option>
+                </select>
+            </div>
+        </div>
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">仓库Id：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="warehouseId" name="warehouseId" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">仓库编码：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="warehouseCode" name="warehouseCode" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <div class="form-group">
+            <label class="col-sm-3 control-label">关联订单类型：</label>
+            <div class="col-sm-8">
+                <input id="referType" name="referType" class="form-control" type="text" th:field="*{referType}">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">入库流程：</label>
+            <div class="col-sm-8">
+                <input id="receiptFlow" name="receiptFlow" class="form-control" type="text" th:field="*{receiptFlow}">
+            </div>
+        </div>
+        <!--<div class="form-group">
+            <label class="col-sm-3 control-label">数据版本：</label>
+            <div class="col-sm-8">
+                <input id="version" name="version" class="form-control" type="text">
+            </div>
+        </div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">创建时间：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="created" name="created" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">创建者：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">创建时间：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">更新者：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">是否有效：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--&lt;!&ndash;<input id="enable" name="enable" class="form-control" type="text">&ndash;&gt;-->
+        <!--<div class="onoffswitch">-->
+        <!--<input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">-->
+        <!--<label class="onoffswitch-label" for="enable">-->
+        <!--<span class="onoffswitch-inner"></span>-->
+        <!--<span class="onoffswitch-switch"></span>-->
+        <!--</label>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">是否删除：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="deleted" name="deleted" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段4：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef4" name="userDef4" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段5：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef5" name="userDef5" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <div class="form-group">
+            <label class="col-sm-3 control-label">是否启用：</label>
+            <div class="col-sm-8">
+                <div class="onoffswitch">
+                    <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable" th:field="${enable}">
+                    <label class="onoffswitch-label" for="enable">
+                        <span class="onoffswitch-inner"></span>
+                        <span class="onoffswitch-switch"></span>
+                    </label>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="form-control-static col-sm-offset-9">
+                <button type="submit" class="btn btn-primary">提交</button>
+                <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
+            </div>
+        </div>
+    </form>
+</div>
+<div th:include="include::footer"></div>
+<script type="text/javascript">
+    var prefix = ctx + "config/receiptType";
+    $("#form-locationType-add").validate({
+        rules:{
+            code:{
+                required:true,
+            },
+            referType:{
+                required:true,
+            },
+            receiptFlow:{
+                required:true,
+            },
+        },
+        submitHandler: function(form) {
+            // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
+            var tableValue = $.common.getTableValue("#form-locationType-add");
+            tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val());
+            $.operate.save(prefix + "/add", tableValue);
+        }
+    });
+</script>
+</body>
+</html>
+<!DOCTYPE HTML>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 select-info">
+            <form id="locationType-form">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            编码：<input type="text" name="code"/>
+                        </li>
+                        <li class="time">
+                            <label>创建时间： </label>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+        <div class="btn-group hidden-xs" id="toolbar" role="group">
+            <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:locationType:add">
+                <i class="fa fa-plus"></i> 新增
+            </a>
+            <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:locationType:remove">
+                <i class="fa fa-trash-o"></i> 删除
+            </a>
+        </div>
+
+        <div class="col-sm-12 select-info">
+            <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
+        </div>
+        <div>
+        </div>
+        <div th:include="include :: footer"></div>
+        <script th:inline="javascript">
+            var editFlag = [[${@permission.hasPermi('config:receiptType:edit')}]];
+            var removeFlag = [[${@permission.hasPermi('config:receiptType:remove')}]];
+            var prefix = ctx + "config/receiptType";
+            var datas = [[${@dict.getType('sys_normal_disable')}]];
+            $(function() {
+                var options = {
+                    url: prefix + "/list",
+                    createUrl: prefix + "/add",
+                    updateUrl: prefix + "/edit/{id}",
+                    removeUrl: prefix + "/remove",
+                    modalName: "入库单类型",
+                    search: false,
+                    columns: [{
+                        checkbox: true
+                    },
+                        {
+                            field : 'id',
+                            title : '库位类型Id'
+                        },
+                        {
+                            field : 'code',
+                            title : '类型编码'
+                        },
+                        {
+                            field : 'companyCode',
+                            title : '货主编码'
+                        },
+                        {
+                            field : 'warehouseCode',
+                            title : '仓库编码'
+                        },
+                        {
+                            field : 'referType',
+                            title : '关联订单类型'
+                        },
+                        {
+                            field : 'receiptFlow',
+                            title : '入库流程'
+                        },
+                        {
+                            field : 'created',
+                            title : '创建时间'
+                        },
+                        {
+                            field : 'createdBy',
+                            title : '创建用户'
+                        },
+                        {
+                            field : 'lastUpdated',
+                            title : '更新时间'
+                        },
+                        {
+                            field : 'lastUpdatedBy',
+                            title : '更新用户'
+                        },
+                        {
+                            field : 'enable',
+                            title : '是否有效',
+                            formatter: function(value, row, index) {
+                                return $.table.selectDictLabel(datas, value);
+                            },
+                            align: 'center',
+                        },
+                        {
+                            field : 'version',
+                            title : '数据版本'
+                        },
+                        {
+                            field : 'processStamp',
+                            title : '处理标记',
+                            visible : false
+                        },
+                        {
+                            field : 'userDef1',
+                            title : '自定义字段1' ,
+                            visible:false
+                        },
+                        {
+                            field : 'userDef2',
+                            title : '自定义字段2' ,
+                            visible:false
+                        },
+                        {
+                            field : 'userDef3',
+                            title : '自定义字段3' ,
+                            visible:false
+                        },
+                        {
+                            field : 'userDef4',
+                            title : '自定义字段4' ,
+                            visible:false
+                        },
+                        {
+                            field : 'userDef5',
+                            title : '自定义字段5' ,
+                            visible:false
+                        },
+                        {
+                            title: '操作',
+                            align: 'center',
+                            formatter: function(value, row, index) {
+                                var actions = [];
+                                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')" ><i class="fa fa-edit"></i>编辑</a> ');
+                                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
+                                return actions.join('');
+                            }
+                        }]
+                };
+                $.table.init(options);
+            });
+        </script>
+</body>
+</html>
 \ No newline at end of file
+<!DOCTYPE HTML>
+<html  lang="zh" xmlns:th="http://www.thymeleaf.org">
+<meta charset="utf-8">
+<head th:include="include :: header"></head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-company-add">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">编码：</label>
+            <div class="col-sm-8">
+                <input id="code" name="code" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">名称：</label>
+            <div class="col-sm-8">
+                <input id="name" name="name" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">仓库：</label>
+            <div class="col-sm-8">
+                <label th:each="warehouse:${warehouseList}" class="checkbox-inline i-checks">
+                    <input name="warehouseCode" type="checkbox" th:value="${warehouse.value}" th:text=" ${warehouse.name}" th:disabled="${warehouse.enable == false} ">
+                </label>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">运单获取地址url：</label>
+            <div class="col-sm-8">
+                <input id="waybillServerUrl" name="waybillServerUrl" class="form-control" type="text">
+            </div>
+        </div>
+
+        <!--<div class="form-group">
+            <label class="col-sm-3 control-label">数据版本：</label>
+            <div class="col-sm-8">
+                <input id="version" name="version" class="form-control" type="text">
+            </div>
+        </div>-->
+
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<div class="form-group">	-->
+        <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
+        <!--<div class="col-sm-8">-->
+        <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
+        <!--</div>-->
+        <!--</div>-->
+        <div class="form-group">
+            <div class="form-control-static col-sm-offset-9">
+                <button type="submit" class="btn btn-primary">提交</button>
+                <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
+            </div>
+        </div>
+    </form>
+</div>
+<div th:include="include::footer"></div>
+<script type="text/javascript">
+    var prefix = ctx + "general/company"
+    $("#form-company-add").validate({
+        rules:{
+            code:{
+                required:true
+            },
+            name:{
+                required:true
+            },
+        },
+        submitHandler: function() {
+            var tableValue = $("#form-bomHeader-add").serialize();
+            tableValue = formValueReplace(tableValue, "warehouseCode", $.form.selectCheckeds("warehouseCode"));
+            $.operate.save(prefix + "/add", tableValue);
+        }
+    });
+</script>
+</body>
+</html>