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

# Conflicts: # .idea/compiler.xml # .idea/workspace.xml

Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # .idea/compiler.xml # .idea/workspace.xml
mahuandong
2 parents e783cec3 67d88c1b
Showing 11 changed files with 486 additions and 206 deletions
.idea/compiler.xml
.idea/workspace.xml
src/main/java/com/huaheng/pc/config/containerType/controller/ContainerTypeController.java
src/main/java/com/huaheng/pc/config/locationType/controller/LocationTypeController.java
src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java
src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java
src/main/resources/mybatis/general/CompanyMapper.xml
src/main/resources/templates/config/containerCapacity/containerCapacity.html
src/main/resources/templates/config/containerType/containerType.html
src/main/resources/templates/config/locationType/locationType.html
src/main/resources/templates/system/user/edit.html
@@ -7,11 +7,9 @@
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="huaheng" />
+        <module name="WMSV1" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="WMSV1" target="1.8" />
-    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java" afterDir="false" />
+    <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/framework/config/MybatisPlusConfig.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/domain/Material.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/domain/Material.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/location/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/location/add.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/framework/web/controller/BaseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/framework/web/controller/BaseController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/controller/LocationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/controller/LocationController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/domain/Location.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/domain/Location.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/service/LocationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/service/LocationServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/location/addBatch.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/location/addBatch.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/location/location.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/location/location.html" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -17,13 +24,13 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
+    <option name="SHOW_INTERMEDIATE" value="false" />
     <option name="GROUP_DATA_SOURCES" value="true" />
     <option name="GROUP_SCHEMA" value="true" />
     <option name="GROUP_CONTENTS" value="false" />
     <option name="SORT_POSITIONED" value="false" />
     <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
+    <option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
     <option name="HIDDEN_KINDS">
       <set />
     </option>
@@ -48,15 +55,50 @@
         <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" />
-        <item name="material: table" type="285a2a93:MysqlImplModel$Table" />
+        <item name="location: table" type="285a2a93:MysqlImplModel$Table" />
       </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$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="70">
+              <caret line="124" column="57" selection-start-line="124" selection-start-column="38" selection-end-line="124" selection-end-column="57" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/user/edit.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="171">
+              <caret line="69" column="65" lean-forward="true" selection-start-line="69" selection-start-column="65" selection-end-line="69" selection-end-column="65" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="193">
+              <caret line="87" column="77" selection-start-line="87" selection-start-column="61" selection-end-line="87" selection-end-column="77" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/user/add.html">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+    </leaf>
+  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Interface" />
         <option value="Class" />
       </list>
     </option>
@@ -65,35 +107,174 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="developMain" />
+        <entry key="$PROJECT_DIR$" value="master" />
       </map>
     </option>
-    <option name="RESET_MODE" value="HARD" />
   </component>
   <component name="IgnoredFileRootStore">
     <option name="generatedRoots">
       <set>
-        <option value="C:\Users\Administrator\IdeaProjects\wms2\.idea" />
+        <option value="E:\code\wms2\.idea" />
       </set>
     </option>
   </component>
-  <component name="MavenImportPreferences">
-    <option name="importingSettings">
-      <MavenImportingSettings>
-        <option name="importAutomatically" value="true" />
-      </MavenImportingSettings>
-    </option>
-  </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-9" />
-    <option name="y" value="-9" />
-    <option name="width" value="1938" />
-    <option name="height" value="1048" />
+    <option name="x" value="470" />
+    <option name="width" value="980" />
+    <option name="height" value="1030" />
   </component>
-  <component name="ProjectId" id="1P2xIFeseJehotA5kuRjbIbfKQa" />
+  <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="PackagesPane" />
+      <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="system" 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="system" type="462c0819:PsiDirectoryNode" />
+              <item name="user" 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="system" type="462c0819:PsiDirectoryNode" />
+              <item name="user" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" 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="system" type="462c0819:PsiDirectoryNode" />
+              <item name="user" type="462c0819:PsiDirectoryNode" />
+              <item name="domain" 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="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="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="templates" type="462c0819:PsiDirectoryNode" />
+              <item name="system" 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" />
+              <item name="system" type="462c0819:PsiDirectoryNode" />
+              <item name="user" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
+  </component>
   <component name="PropertiesComponent">
     <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
     <property name="DatabaseDriversLRU" value="mysql" />
@@ -104,34 +285,22 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1565255020864" />
-    <property name="database.console.LAST_STATE" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" />
     <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="project.structure.last.edited" value="Modules" />
-    <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
   </component>
   <component name="RecentsManager">
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.huaheng.pc.config.zoneCapacity.controller" />
-    </key>
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="C:\Users\Administrator\IdeaProjects\wms2\src\main\resources\mybatis\config" />
-      <recent name="C:\Users\Administrator\IdeaProjects\wms2\src\main\java\com\huaheng\pc\config" />
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
+      <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
     </key>
   </component>
   <component name="RunDashboard">
-    <option name="configurationTypes">
-      <set>
-        <option value="SpringBootApplicationConfigurationType" />
-      </set>
-    </option>
     <option name="ruleStates">
       <list>
         <RuleState>
@@ -144,11 +313,9 @@
     </option>
   </component>
   <component name="RunManager">
-    <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" activateToolWindowBeforeRun="false" singleton="false" nameIsGenerated="true">
-      <module name="huaheng" />
+    <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="WMSV1" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
-      <option name="DEBUG_MODE" value="true" />
-      <option name="HIDE_BANNER" value="true" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
@@ -156,14 +323,10 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" activateToolWindowBeforeRun="false">
-      <module name="huaheng" />
+    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+      <module name="WMSV1" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
-      <option name="DEBUG_MODE" value="true" />
-      <option name="HIDE_BANNER" value="true" />
       <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
-      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -172,120 +335,108 @@
   <component name="ServiceViewManager">
     <option name="allServicesViewState">
       <serviceView>
-        <option name="contentProportion" value="0.17955652" />
         <treeState>
-          <expand />
+          <expand>
+            <path>
+              <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
+              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+            </path>
+          </expand>
           <select />
         </treeState>
-        <option name="groupByContributor" value="true" />
       </serviceView>
     </option>
-    <option name="selectedView" value="0" />
-  </component>
-  <component name="StructureViewFactory">
-    <option name="ACTIVE_ACTIONS" value=",SHOW_PROPERTIES,SHOW_ANONYMOUS,SHOW_LAMBDA,SHOW_INTERFACES,VISIBILITY_SORTER" />
   </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="" />
-      <created>1563950700252</created>
+      <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" />
+      <created>1565160110910</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1563950700252</updated>
-      <workItem from="1563950701881" duration="73000" />
-      <workItem from="1565055472980" duration="9734000" />
-      <workItem from="1565078101170" duration="2642000" />
-      <workItem from="1565080771601" duration="951000" />
-      <workItem from="1565082117731" duration="348000" />
-      <workItem from="1565085916295" duration="323000" />
-      <workItem from="1565087331641" duration="170000" />
-      <workItem from="1565138504203" duration="3006000" />
-      <workItem from="1565162212626" duration="6726000" />
-      <workItem from="1565169755725" duration="2857000" />
-      <workItem from="1565242132637" duration="963000" />
-      <workItem from="1565244881255" duration="620000" />
-      <workItem from="1565245587599" duration="32000" />
-      <workItem from="1565245636976" duration="7465000" />
-      <workItem from="1565336358595" duration="3615000" />
-      <workItem from="1565339991037" duration="87000" />
-      <workItem from="1565340093097" duration="3717000" />
+      <updated>1565160110910</updated>
+      <workItem from="1565160112236" duration="11971000" />
+      <workItem from="1565224833241" duration="14642000" />
+      <workItem from="1565242153135" duration="1476000" />
+      <workItem from="1565259513116" duration="148000" />
+      <workItem from="1565311988064" duration="7176000" />
+      <workItem from="1565328536669" duration="797000" />
     </task>
-    <task id="LOCAL-00001" summary="用户查询修改">
-      <created>1565058322310</created>
+    <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
+      <created>1565226427512</created>
       <option name="number" value="00001" />
       <option name="presentableId" value="LOCAL-00001" />
       <option name="project" value="LOCAL" />
-      <updated>1565058322310</updated>
+      <updated>1565226427512</updated>
     </task>
-    <task id="LOCAL-00002" summary="库区设置编辑">
-      <created>1565075790786</created>
+    <task id="LOCAL-00002" summary="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面">
+      <created>1565256884822</created>
       <option name="number" value="00002" />
       <option name="presentableId" value="LOCAL-00002" />
       <option name="project" value="LOCAL" />
-      <updated>1565075790786</updated>
+      <updated>1565256884822</updated>
     </task>
-    <task id="LOCAL-00003" summary="库区设置编辑">
-      <created>1565075857018</created>
+    <task id="LOCAL-00003" summary="修改库区service">
+      <created>1565259481656</created>
       <option name="number" value="00003" />
       <option name="presentableId" value="LOCAL-00003" />
       <option name="project" value="LOCAL" />
-      <updated>1565075857018</updated>
+      <updated>1565259481656</updated>
     </task>
-    <task id="LOCAL-00004" summary="库区设置编辑">
-      <created>1565075883212</created>
+    <task id="LOCAL-00004" summary="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml">
+      <created>1565342188814</created>
       <option name="number" value="00004" />
       <option name="presentableId" value="LOCAL-00004" />
       <option name="project" value="LOCAL" />
-      <updated>1565075883212</updated>
-    </task>
-    <task id="LOCAL-00005" summary="库区设置编辑">
-      <created>1565075915322</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1565075915322</updated>
+      <updated>1565342188814</updated>
     </task>
-    <task id="LOCAL-00006" summary="回退">
-      <created>1565081123490</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1565081123490</updated>
-    </task>
-    <task id="LOCAL-00007" summary="zone修改">
-      <created>1565172969186</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1565172969186</updated>
-    </task>
-    <task id="LOCAL-00008" summary="回退">
-      <created>1565332810976</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1565332810976</updated>
-    </task>
-    <task id="LOCAL-00009" summary="修改表格分页获取总记录数">
-      <created>1565335994460</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1565335994460</updated>
-    </task>
-    <task id="LOCAL-00010" summary="git忽略">
-      <created>1565336618584</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1565336618584</updated>
-    </task>
-    <option name="localTasksCounter" value="11" />
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="893000" />
+  </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" visible="true" weight="0.2533512" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="Designer" order="2" />
+      <window_info id="Image Layers" order="3" />
+      <window_info id="Capture Tool" order="4" />
+      <window_info id="UI Designer" order="5" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.25212464" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <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" weight="0.3286119" />
+      <window_info anchor="bottom" id="Spring" order="7" weight="0.3286119" />
+      <window_info anchor="bottom" id="Terminal" order="8" weight="0.3286119" />
+      <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="11" />
+      <window_info anchor="bottom" id="Java Enterprise" order="12" weight="0.3286119" />
+      <window_info anchor="bottom" id="Database Changes" order="13" weight="0.3286119" />
+      <window_info active="true" anchor="bottom" id="Version Control" order="14" visible="true" weight="0.42351276" />
+      <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.3297587" />
+      <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" />
+      <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" />
+    </layout>
+  </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
@@ -295,16 +446,11 @@
         <entry key="MAIN">
           <value>
             <State>
-              <option name="FILTERS">
-                <map>
-                  <entry key="branch">
-                    <value>
-                      <list>
-                        <option value="origin/develop" />
-                      </list>
-                    </value>
-                  </entry>
-                </map>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
               </option>
               <option name="COLUMN_ORDER" />
             </State>
@@ -316,46 +462,22 @@
       <map>
         <entry key="Branch">
           <value>
-            <list>
-              <RecentGroup>
-                <option name="FILTER_VALUES">
-                  <option value="origin/develop" />
-                </option>
-              </RecentGroup>
-            </list>
+            <list />
+          </value>
+        </entry>
+        <entry key="User">
+          <value>
+            <list />
           </value>
         </entry>
       </map>
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="用户查询修改" />
-    <MESSAGE value="库区设置编辑" />
-    <MESSAGE value="zone修改" />
-    <MESSAGE value="回退" />
-    <MESSAGE value="修改表格分页获取总记录数" />
-    <MESSAGE value="git忽略" />
-    <option name="LAST_COMMIT_MESSAGE" value="git忽略" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java</url>
-          <line>52</line>
-          <option name="timeStamp" value="11" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/locationType/service/LocationTypeServiceImpl.java</url>
-          <line>21</line>
-          <option name="timeStamp" value="14" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
+    <MESSAGE value="添加库位、库位类型增删改查接口" />
+    <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" />
+    <option name="LAST_COMMIT_MESSAGE" value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" />
   </component>
 </project>
 \ No newline at end of file
+package com.huaheng.pc.config.containerType.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.containerType.domain.ContainerType;
+import com.huaheng.pc.config.containerType.service.ContainerTypeService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 容器类型 信息操作处理
+ * 
+ * @author huaheng
+ * @date 2018-08-19
+ */
+@Controller
+@RequestMapping("/config/containerType")
+public class ContainerTypeController extends BaseController
+{
+    private String prefix = "config/containerType";
+	
+	@Autowired
+	private ContainerTypeService containerTypeService;
+	
+	@RequiresPermissions("config:containerType:view")
+	@GetMapping()
+	public String containerType()
+	{
+	    return prefix + "/containerType";
+	}
+	
+	/**
+	 * 查询容器类型列表
+	 */
+	@RequiresPermissions("config:containerType:list")
+	@Log(title = "配置-容器类型设置", operating = "查看容器类型", action = BusinessType.GRANT)
+	@PostMapping("/list")
+	@ResponseBody
+	public TableDataInfo list(ContainerType containerType,String createdBegin, String createdEnd)
+	{
+		LambdaQueryWrapper<ContainerType> lambdaQueryWrapper = Wrappers.lambdaQuery();
+		PageDomain pageDomain = TableSupport.buildPageRequest();
+		Integer pageNum = pageDomain.getPageNum();
+		Integer pageSize = pageDomain.getPageSize();
+
+		lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ContainerType::getCreated, createdBegin)
+				.le(StringUtils.isNotEmpty(createdEnd), ContainerType::getCreated, createdEnd)
+				.eq(ContainerType::getWarehouseCode,ShiroUtils.getWarehouseCode())
+				.eq(StringUtils.isNotEmpty(containerType.getCode()),ContainerType::getCode,containerType.getCode())
+				.like(StringUtils.isNotEmpty(containerType.getName()),ContainerType::getName,containerType.getName());;
+
+		if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+			/**
+			 * 使用分页查询
+			 */
+			Page<ContainerType> page = new Page<>(pageNum, pageSize);
+			IPage<ContainerType> iPage = containerTypeService.page(page, lambdaQueryWrapper);
+			return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+		} else {
+			List<ContainerType> list = containerTypeService.list(lambdaQueryWrapper);
+			return getDataTable(list);
+		}
+	}
+	
+	/**
+	 * 新增容器类型
+	 */
+	@GetMapping("/add")
+	public String add()
+	{
+	    return prefix + "/add";
+	}
+	
+	/**
+	 * 新增保存容器类型
+	 */
+	@RequiresPermissions("config:containerType:add")
+	@Log(title = "配置-容器类型设置", operating = "新增容器类型", action = BusinessType.INSERT)
+	@PostMapping("/add")
+	@ResponseBody
+	public AjaxResult addSave(ContainerType containerType)
+	{
+		containerType.setWarehouseCode(ShiroUtils.getWarehouseCode());
+		containerType.setCreatedBy(ShiroUtils.getLoginName());
+		containerType.setLastUpdatedBy(ShiroUtils.getLoginName());
+		return toAjax(containerTypeService.save(containerType));
+	}
+
+	/**
+	 * 修改容器类型
+	 */
+	@GetMapping("/edit/{id}")
+	public String edit(@PathVariable("id") Integer id, ModelMap mmap)
+	{
+		ContainerType containerType = containerTypeService.getById(id);
+		mmap.put("containerType", containerType);
+	    return prefix + "/edit";
+	}
+	
+	/**
+	 * 修改保存容器类型
+	 */
+	@RequiresPermissions("config:containerType:edit")
+	@Log(title = "配置-容器类型设置", operating = "修改容器类型", action = BusinessType.UPDATE)
+	@PostMapping("/edit")
+	@ResponseBody
+	public AjaxResult editSave(ContainerType containerType)
+	{
+		containerType.setLastUpdatedBy(ShiroUtils.getLoginName());
+		return toAjax(containerTypeService.saveOrUpdate(containerType));
+	}
+	
+	/**
+	 * 删除容器类型
+	 */
+	@RequiresPermissions("config:containerType:remove")
+	@Log(title = "配置-容器类型设置", operating = "删除容器类型", action = BusinessType.DELETE)
+	@PostMapping( "/remove")
+	@ResponseBody
+	public AjaxResult remove(String ids)
+	{
+		if (StringUtils.isEmpty(ids))
+		    return AjaxResult.error("id不能为空");
+		for (Integer id : Convert.toIntArray(ids))
+		{
+		    containerTypeService.removeById(id);
+		}
+		return AjaxResult.success("删除成功！");
+	}
+	
+}
 package com.huaheng.pc.config.locationType.controller;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -14,16 +15,16 @@ 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.location.domain.Location;
 import com.huaheng.pc.config.locationType.domain.LocationType;
-import com.huaheng.pc.general.location.service.LocationService;
 import com.huaheng.pc.config.locationType.service.LocationTypeService;
+import com.huaheng.pc.general.location.domain.Location;
+import com.huaheng.pc.general.location.service.LocationService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.List;
@@ -33,15 +34,16 @@ public class LocationTypeController extends BaseController {
     private String prefix = "config/locationType";
-    @Resource
+    @Autowired
     private LocationTypeService locationTypeService;
-    @Resource
+    @Autowired
     private LocationService locationService;
     @RequestMapping("config:locationType:view")
-    @GetMapping
-    public String locationType() {
-        return prefix + "/location";
+    @GetMapping()
+    public String locationType()
+    {
+        return prefix + "/locationType";
     }
     /**
@@ -51,13 +53,17 @@ public class LocationTypeController extends BaseController {
     @Log(title = "通用-库位类型管理", operating = "查看库位类型列表", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(LocationType locationType)  {
+    public TableDataInfo list(LocationType locationType,String createdBegin, String createdEnd)  {
         LambdaQueryWrapper<LocationType> lambdaQueryWrapper = Wrappers.lambdaQuery();
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
-        lambdaQueryWrapper.eq(LocationType::getWarehouseCode,ShiroUtils.getWarehouseCode());
+        lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),LocationType::getCreated, createdBegin)
+                            .le(StringUtils.isNotEmpty(createdEnd), LocationType::getCreated, createdEnd)
+                            .eq(LocationType::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                            .eq(StringUtils.isNotEmpty(locationType.getCode()),LocationType::getCode,locationType.getCode())
+                            .like(StringUtils.isNotEmpty(locationType.getName()),LocationType::getName,locationType.getName());
         if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
             /**
@@ -56,6 +56,7 @@ public class ZoneController extends BaseController {
         lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),Zone::getCreated, createdBegin)
                 .le(StringUtils.isNotEmpty(createdEnd), Zone::getCreated, createdEnd)
+                .eq(Zone::getWarehouseCode,ShiroUtils.getWarehouseCode())
                 .eq(StringUtils.isNotEmpty(zone.getCode()), Zone::getCode, zone.getCode())
                 .like(StringUtils.isNotEmpty(zone.getName()), Zone::getName, zone.getName())
                 .orderByAsc(Zone::getId);
@@ -66,7 +67,7 @@ public class ZoneController extends BaseController {
              */
             Page<Zone> page = new Page<>(pageNum, pageSize);
             IPage<Zone> iPage = zoneService.page(page, lambdaQueryWrapper);
-            return getDataTable(iPage.getRecords());
+            return getMpDataTable(iPage.getRecords(),iPage.getTotal());
         } else {
             List<Zone> list = zoneService.list(lambdaQueryWrapper);
             return getDataTable(list);
@@ -63,6 +63,7 @@ public class ZoneCapacityController extends BaseController
 		lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ZoneCapacity::getCreated, createdBegin)
 				.le(StringUtils.isNotEmpty(createdEnd), ZoneCapacity::getCreated, createdEnd)
+				.eq(ZoneCapacity::getWarehouseCode,ShiroUtils.getWarehouseCode())
 				.eq(StringUtils.isNotEmpty(zoneCapacity.getMaterialCode()), ZoneCapacity::getMaterialCode, zoneCapacity.getMaterialCode())
 				.like(StringUtils.isNotEmpty(zoneCapacity.getMaterialName()), ZoneCapacity::getMaterialName, zoneCapacity.getMaterialName())
 				.orderByAsc(ZoneCapacity::getId);
@@ -73,7 +74,7 @@ public class ZoneCapacityController extends BaseController
 			 */
 			Page<ZoneCapacity> page = new Page<>(pageNum, pageSize);
 			IPage<ZoneCapacity> iPage = zoneCapacityService.page(page, lambdaQueryWrapper);
-			return getDataTable(iPage.getRecords());
+			return getMpDataTable(iPage.getRecords(),iPage.getTotal());
 		} else {
 			List<ZoneCapacity> list = zoneCapacityService.list(lambdaQueryWrapper);
 			return getDataTable(list);
@@ -54,7 +54,7 @@
 		INNER JOIN warehouse_company wc ON wc.companyId=c.id AND wc.warehouseCode = #{warehouseCode}
   </select>
   <select id="selectByWarehouseCode" resultType="com.huaheng.pc.general.company.domain.Company">
-        select id from company INNER JOIN warehouse_company ON company.id = warehouse_company.companyId
+        select company.id from company INNER JOIN warehouse_company ON company.id = warehouse_company.companyId
         where company.warehouseCode = #{warehouseCode}
   </select>
@@ -26,9 +26,9 @@
                         <!--</li>-->
                         <li class="time">
                             <label>创建时间： </label>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
                             <span>-</span>
-                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+                            <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>
@@ -10,7 +10,7 @@
 				<div class="select-list">
 					<ul>
 						<li>
-							编码：<input type="text" name="code"/>
+							箱型：<input type="text" name="code"/>
 						</li>
 						<li>
 							名称：<input type="text" name="name"/>
@@ -23,9 +23,9 @@
 						<!--</li>-->
 						<li class="time">
 							<label>创建时间： </label>
-							<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+							<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
 							<span>-</span>
-							<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+							<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>
@@ -73,16 +73,20 @@
 				},
 				{
 					field : 'code', 
-					title : '编码' 
+					title : '箱型'
 				},
 				{
 					field : 'name', 
 					title : '名称' 
 				},
 				{
-					field : 'prefix', 
-					title : '前缀' 
+					field : 'warehouseCode',
+					title : '仓库编码'
 				},
+					{
+						field : 'companyCode',
+						title : '货主编码'
+					},
 				{
 					field : 'emptyWeight', 
 					title : '空箱重量kg'
@@ -23,9 +23,9 @@
 							<!--</li>-->
 							<li class="time">
 								<label>创建时间： </label>
-								<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+								<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
 								<span>-</span>
-								<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+								<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>
@@ -62,7 +62,7 @@
 				<label class="col-sm-3 control-label">货主：</label>
 				<div class="col-sm-8">
 					<label th:each="company:${companys}" class="checkbox-inline i-checks">
-						<input name="company" type="checkbox" th:value="${company.id}" th:text=" ${company.name}" th:checked="${company.flag}" th:disabled="${company.enable == false}">
+						<input name="company" type="checkbox" th:value="${company.id}" th:text=" ${company.name}" th:checked="${company.flag}" >
 					</label>
 				</div>
 			</div>