Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop

xqs
2 parents ae39af12 60b21d86
Showing 147 changed files with 3448 additions and 1501 deletions
.idea/compiler.xml
.idea/workspace.xml
src/main/java/com/huaheng/common/utils/TreeUtils.java
src/main/java/com/huaheng/pc/config/alarmLevel/controller/AlarmLevelController.java
src/main/java/com/huaheng/pc/config/alarmLevel/domain/AlarmLevel.java
src/main/java/com/huaheng/pc/config/alarmLevel/mapper/AlarmLevelMapper.java
src/main/java/com/huaheng/pc/general/warehouseCopany/service/WarehouseCompanyServiceImpl.java → src/main/java/com/huaheng/pc/config/alarmLevel/service/AlarmLevelService.java
src/main/java/com/huaheng/pc/general/bom/controller/BomDetailController.java → src/main/java/com/huaheng/pc/config/bom/controller/BomDetailController.java
src/main/java/com/huaheng/pc/general/bom/controller/BomHeaderController.java → src/main/java/com/huaheng/pc/config/bom/controller/BomHeaderController.java
src/main/java/com/huaheng/pc/general/bom/domain/BomDetail.java → src/main/java/com/huaheng/pc/config/bom/domain/BomDetail.java
src/main/java/com/huaheng/pc/general/bom/domain/BomHeader.java → src/main/java/com/huaheng/pc/config/bom/domain/BomHeader.java
src/main/java/com/huaheng/pc/general/bom/mapper/BomDetailMapper.java → src/main/java/com/huaheng/pc/config/bom/mapper/BomDetailMapper.java
src/main/java/com/huaheng/pc/general/bom/mapper/BomHeaderMapper.java → src/main/java/com/huaheng/pc/config/bom/mapper/BomHeaderMapper.java
src/main/java/com/huaheng/pc/general/bom/service/BomDetailService.java → src/main/java/com/huaheng/pc/config/bom/service/BomDetailService.java
src/main/java/com/huaheng/pc/general/bom/service/BomDetailServiceImpl.java → src/main/java/com/huaheng/pc/config/bom/service/BomDetailServiceImpl.java
src/main/java/com/huaheng/pc/general/bom/service/BomHeaderService.java → src/main/java/com/huaheng/pc/config/bom/service/BomHeaderService.java
src/main/java/com/huaheng/pc/general/bom/service/BomHeaderServiceImpl.java → src/main/java/com/huaheng/pc/config/bom/service/BomHeaderServiceImpl.java
src/main/java/com/huaheng/pc/general/carrier/controller/CarrierController.java → src/main/java/com/huaheng/pc/config/carrier/controller/CarrierController.java
src/main/java/com/huaheng/pc/general/carrier/domain/Carrier.java → src/main/java/com/huaheng/pc/config/carrier/domain/Carrier.java
src/main/java/com/huaheng/pc/general/carrier/mapper/CarrierMapper.java → src/main/java/com/huaheng/pc/config/carrier/mapper/CarrierMapper.java
@@ -6,8 +6,8 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="wms2" />
         <module name="huaheng" />
+        <module name="wms2" />
       </profile>
     </annotationProcessing>
   </component>
 <?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="">
+    <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="代码错误，导包">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/add.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/edit.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" 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/inventory/inventoryDetail/controller/InventoryDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -47,39 +47,39 @@
     <select />
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <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/inventory/inventoryHeader/controller/InventoryHeaderController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="51">
-              <caret line="72" selection-start-line="72" selection-end-line="72" />
+            <state relative-caret-position="167">
+              <caret line="40" column="38" selection-start-line="40" selection-start-column="38" selection-end-line="40" selection-end-column="38" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#1660#1661#0" expanded="true" />
+                <element signature="e#1704#1705#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="234">
-              <caret line="78" column="44" selection-start-line="78" selection-start-column="44" selection-end-line="78" selection-end-column="44" />
+            <state relative-caret-position="304">
+              <caret line="44" column="35" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="35" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="328">
-              <caret line="92" column="18" lean-forward="true" selection-start-line="92" selection-start-column="18" selection-end-line="92" selection-end-column="18" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="252">
-              <caret line="99" column="33" selection-start-line="99" selection-start-column="33" selection-end-line="99" selection-end-column="33" />
+            <state relative-caret-position="91">
+              <caret line="167" column="33" lean-forward="true" selection-start-line="167" selection-start-column="33" selection-end-line="167" selection-end-column="33" />
+              <folding>
+                <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -130,6 +130,9 @@
         <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" />
+        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/task.html" />
+        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" />
       </list>
     </option>
   </component>
@@ -140,11 +143,17 @@
       </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="1P5Ngjh73HToCarlEZkqMxrL7pm" />
   <component name="ProjectLevelVcsManager">
@@ -167,20 +176,18 @@
             <path>
               <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
               <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="sql" 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" />
@@ -188,7 +195,6 @@
               <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" />
@@ -197,7 +203,6 @@
               <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" />
@@ -207,7 +212,6 @@
               <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" />
@@ -218,7 +222,6 @@
               <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" />
@@ -229,8 +232,7 @@
               <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" />
+              <item name="config" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -241,9 +243,8 @@
               <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" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="config" type="462c0819:PsiDirectoryNode" />
+              <item name="container" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -254,34 +255,9 @@
               <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" />
-              <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="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" />
-              <item name="service" 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" />
+              <item name="config" type="462c0819:PsiDirectoryNode" />
+              <item name="container" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -292,9 +268,7 @@
               <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" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="task" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -305,9 +279,8 @@
               <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" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
+              <item name="task" type="462c0819:PsiDirectoryNode" />
+              <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -318,8 +291,8 @@
               <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" />
+              <item name="task" type="462c0819:PsiDirectoryNode" />
+              <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
               <item name="mapper" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -331,8 +304,8 @@
               <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" />
+              <item name="task" type="462c0819:PsiDirectoryNode" />
+              <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
               <item name="service" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -340,11 +313,7 @@
               <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="resources" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -352,6 +321,7 @@
               <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" />
@@ -360,6 +330,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="templates" type="462c0819:PsiDirectoryNode" />
+              <item name="config" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -368,7 +339,8 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="templates" type="462c0819:PsiDirectoryNode" />
-              <item name="inventory" type="462c0819:PsiDirectoryNode" />
+              <item name="config" type="462c0819:PsiDirectoryNode" />
+              <item name="container" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -377,8 +349,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="templates" type="462c0819:PsiDirectoryNode" />
-              <item name="inventory" type="462c0819:PsiDirectoryNode" />
-              <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
+              <item name="task" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -387,8 +358,8 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="templates" type="462c0819:PsiDirectoryNode" />
-              <item name="inventory" type="462c0819:PsiDirectoryNode" />
-              <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
+              <item name="task" type="462c0819:PsiDirectoryNode" />
+              <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -408,6 +379,7 @@
     <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="1566439451795" />
     <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" />
@@ -422,17 +394,17 @@
     <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
   </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="F:\wms2\src\main\resources\templates\task\taskHeader" />
       <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>
+    <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>
   </component>
   <component name="RunDashboard">
@@ -451,9 +423,23 @@
         </RuleState>
       </list>
     </option>
-    <option name="contentProportion" value="0.052489176" />
+    <option name="contentProportion" value="0.012987013" />
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Spring Boot.HuaHengApplication (1)">
+    <configuration name="HuaHengApplication (1)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
+      <module name="huaheng" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.huaheng.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="wms2" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
@@ -473,6 +459,11 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Spring Boot.HuaHengApplication (1)" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="ServiceViewManager">
     <option name="allServicesViewState">
@@ -526,6 +517,7 @@
       <workItem from="1565936336169" duration="3845000" />
       <workItem from="1565941296716" duration="6217000" />
       <workItem from="1566175534262" duration="11146000" />
+      <workItem from="1566433893313" duration="5165000" />
     </task>
     <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
       <created>1565226427512</created>
@@ -628,6 +620,9 @@
     <option name="localTasksCounter" value="15" />
     <servers />
   </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="16960000" />
+  </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
       <is-autoscroll-to-source value="true" />
@@ -641,14 +636,17 @@
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.31434315" />
+      <window_info id="Image Layers" />
+      <window_info id="Capture Tool" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.24128686" />
       <window_info id="Structure" order="1" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
       <window_info id="Web" order="2" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
       <window_info id="Designer" order="3" />
       <window_info id="UI Designer" order="4" />
       <window_info id="Favorites" order="5" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
+      <window_info anchor="bottom" id="Terminal" />
       <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
       <window_info anchor="bottom" id="Run" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
@@ -656,13 +654,15 @@
       <window_info anchor="bottom" id="TODO" order="6" weight="0.3275488" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="8" weight="0.43342775" />
-      <window_info anchor="bottom" id="Run Dashboard" order="9" visible="true" weight="0.12747875" />
+      <window_info active="true" anchor="bottom" id="Run Dashboard" order="9" sideWeight="0.91219836" visible="true" weight="0.34702548" />
       <window_info anchor="bottom" id="Spring" order="10" weight="0.3286119" />
       <window_info anchor="bottom" id="Database Changes" order="11" weight="0.3275488" />
-      <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
+      <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.087801605" side_tool="true" weight="0.3569405" />
       <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.3275488" />
       <window_info anchor="bottom" id="Messages" order="14" weight="0.3186969" />
       <window_info anchor="bottom" id="MyBatis Log" order="15" />
+      <window_info anchor="right" id="Capture Analysis" />
+      <window_info anchor="right" id="Theme Preview" />
       <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" />
@@ -767,13 +767,6 @@
     </watches-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="100">
-          <caret line="8" column="91" lean-forward="true" selection-start-line="8" selection-start-column="91" selection-end-line="8" selection-end-column="91" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="100">
@@ -781,13 +774,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="100">
-          <caret line="7" column="66" selection-start-line="7" selection-start-column="66" selection-end-line="7" selection-end-column="66" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="100">
@@ -826,15 +812,8 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="127" column="62" lean-forward="true" selection-start-line="127" selection-start-column="62" selection-end-line="127" selection-end-column="62" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" />
     <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="892">
           <caret line="354" column="67" selection-start-line="354" selection-start-column="67" selection-end-line="354" selection-end-column="67" />
@@ -876,13 +855,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/LinkedHashMap.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-376">
-          <caret line="163" column="24" lean-forward="true" selection-start-line="163" selection-start-column="24" selection-end-line="163" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/LinkedHashMap.java" />
     <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1.jar!/org/apache/ibatis/builder/xml/mybatis-3-mapper.dtd">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="124">
@@ -925,13 +898,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="78" column="44" selection-start-line="78" selection-start-column="44" selection-end-line="78" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/report/excelReport/mapper/ExcelReportMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="100">
@@ -960,5 +926,168 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/bom/service/BomDetailServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="95">
+          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/BomHeaderMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="177">
+          <caret line="37" column="25" lean-forward="true" selection-start-line="37" selection-start-column="25" selection-end-line="37" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/bom/controller/BomHeaderController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="50" column="31" lean-forward="true" selection-start-line="50" selection-start-column="31" selection-end-line="50" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/bom/service/BomHeaderServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="95">
+          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        </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="232">
+          <caret line="26" column="42" selection-start-line="26" selection-start-column="42" selection-end-line="26" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="38">
+          <caret line="2" column="23" selection-start-line="2" selection-start-column="23" selection-end-line="2" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="36" column="22" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="209">
+          <caret line="14" column="22" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="494">
+          <caret line="107" column="47" lean-forward="true" selection-start-line="107" selection-start-column="47" selection-end-line="107" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="76">
+          <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/resources/mybatis/task/TaskHeaderMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="48">
+          <caret line="3" column="30" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="76">
+          <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-114">
+          <caret line="38" selection-start-line="38" selection-end-line="41" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="226">
+          <caret line="92" column="12" selection-start-line="92" selection-start-column="12" selection-end-line="92" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/task/task.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1853">
+          <caret line="141" column="36" selection-start-line="141" selection-start-column="32" selection-end-line="141" selection-end-column="36" />
+          <folding>
+            <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="57">
+          <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/warehouse/controller/WareHouseController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="38">
+          <caret line="61" column="49" selection-start-line="61" selection-start-column="40" selection-end-line="61" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/container.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="323">
+          <caret line="20" column="53" selection-start-line="20" selection-start-column="49" selection-end-line="20" selection-end-column="53" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="304">
+          <caret line="44" column="35" selection-start-line="44" selection-start-column="26" selection-end-line="44" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="167">
+          <caret line="40" column="38" selection-start-line="40" selection-start-column="38" selection-end-line="40" selection-end-column="38" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1660#1661#0" expanded="true" />
+            <element signature="e#1704#1705#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="91">
+          <caret line="167" column="33" lean-forward="true" selection-start-line="167" selection-start-column="33" selection-end-line="167" selection-end-column="33" />
+          <folding>
+            <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
 \ No newline at end of file
@@ -27,8 +27,7 @@ public class TreeUtils
         {
             Menu t = (Menu) iterator.next();
             // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
-            if (t.getParentId() == parentId)
-            {
+            if (t.getParentId() == parentId) {
                 recursionFn(list, t);
                 returnList.add(t);
             }
+package com.huaheng.pc.config.alarmLevel.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.alarmLevel.domain.AlarmLevel;
+import com.huaheng.pc.config.alarmLevel.service.AlarmLevelService;
+import com.huaheng.pc.config.sendMail.domain.SendMail;
+import com.huaheng.pc.config.sendMail.service.SendMailService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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;
+
+@Api(tags = "预警等级")
+@Controller
+@RequestMapping("/config/alarmLevel")
+public class AlarmLevelController extends BaseController {
+
+    @Resource
+    private AlarmLevelService alarmLevelService;
+    @Resource
+    private SendMailService sendMailService;
+
+    private String prefix = "config/alarmLevel";
+
+    @RequiresPermissions("config:containerCapacity:view")
+    @GetMapping()
+    public String containerCapacity()
+    {
+        return prefix + "/containerCapacity";
+    }
+
+    /**
+     * 查询容器容量列表
+     */
+    @RequiresPermissions("config:alarmLevel:list")
+    @Log(title = "配置-预警等级", operating = "查看预警等级列表", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(String createdBegin, String createdEnd) {
+        LambdaQueryWrapper<AlarmLevel> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+
+        lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), AlarmLevel::getCreated, createdBegin)
+                .le(StringUtils.isNotEmpty(createdEnd), AlarmLevel::getCreated, createdEnd)
+                .in(AlarmLevel::getCompanyCode, ShiroUtils.getCompanyCodeList())
+                .eq(AlarmLevel::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .orderByAsc(AlarmLevel::getId);
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            /**
+             * 使用分页查询
+             */
+            Page<AlarmLevel> page = new Page<>(pageNum, pageSize);
+            IPage<AlarmLevel> iPage = alarmLevelService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+        } else {
+            List<AlarmLevel> list = alarmLevelService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+    /**
+     * 新增预警等级 
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存预警等级
+     */
+    @ApiOperation(value="新增预警等级 ", notes="新增预警等级 ", httpMethod = "POST")
+    @RequiresPermissions("config:alarmLevel:add")
+    @Log(title = "配置-预警等级 ",operating = "新增预警等级 ", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(AlarmLevel alarmLevel) {
+        alarmLevel.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        LambdaQueryWrapper<AlarmLevel> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(AlarmLevel::getLevel, alarmLevel.getLevel())
+            .eq(AlarmLevel::getCompanyCode, alarmLevel.getCompanyCode())
+            .eq(AlarmLevel::getWarehouseCode, alarmLevel.getWarehouseCode());
+        AlarmLevel alarmLevel1 = alarmLevelService.getOne(lambdaQueryWrapper);
+        if (alarmLevel != null){
+            return AjaxResult.error("该记录已存在");
+        }
+        alarmLevel.setCreatedBy(ShiroUtils.getLoginName());
+        alarmLevel.setLastUpdateBy(ShiroUtils.getLoginName());
+        return toAjax(alarmLevelService.save(alarmLevel));
+    }
+
+    /**
+     * 修改预警等级 
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+        AlarmLevel alarmLevel = alarmLevelService.getById(id);
+        mmap.put("alarmLevel", alarmLevel);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存预警等级 
+     */
+    @ApiOperation(value="修改预警等级信息", notes="修改预警等级信息", httpMethod = "POST")
+    @RequiresPermissions("config:warehouse:edit")
+    @Log(title = "配置-预警等级 ",operating = "修改预警等级 ", action = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(AlarmLevel alarmLevel) {
+        alarmLevel.setLastUpdateBy(ShiroUtils.getLoginName());
+        return toAjax(alarmLevelService.updateById(alarmLevel));
+    }
+
+    /**
+     * 删除预警等级 
+     */
+    @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)) {
+            LambdaQueryWrapper<SendMail> lambda = Wrappers.lambdaQuery();
+            lambda.eq(SendMail::getWarningLevel, alarmLevelService.getById(id).getLevel());
+            List<SendMail> sendMails = sendMailService.list(lambda);
+            if (sendMails != null) {
+                return AjaxResult.error("该类型正在被使用");
+            }
+            list.add(id);
+        }
+        return toAjax(alarmLevelService.removeByIds(list));
+    }
+}
+package com.huaheng.pc.config.alarmLevel.domain;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@ApiModel(value="com.huaheng.pc.config.alarmLevel.domain.AlarmLevel")
+@Data
+@TableName(value = "alarm_level")
+public class AlarmLevel implements Serializable {
+    /**
+     * 主键、自增字段
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="主键、自增字段")
+    private Integer id;
+
+    /**
+     * 仓库编码
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库编码")
+    private String warehouseCode;
+
+    /**
+     * 货主编码
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value="货主编码")
+    private String companyCode;
+
+    /**
+     * 预警类型
+     */
+    @TableField(value = "type")
+    @ApiModelProperty(value="预警类型")
+    private Integer type;
+
+    /**
+     * 等级
+     */
+    @TableField(value = "level")
+    @ApiModelProperty(value="等级")
+    private Integer level;
+
+    /**
+     * 时间阈值
+     */
+    @TableField(value = "timeThreshold")
+    @ApiModelProperty(value="时间阈值")
+    private Integer timeThreshold;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value="创建用户")
+    private String createdBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "lastUpdate")
+    @ApiModelProperty(value="更新时间")
+    private Date lastUpdate;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "lastUpdateBy")
+    @ApiModelProperty(value="更新用户")
+    private String lastUpdateBy;
+
+    /**
+     * 是否有效
+     */
+    @TableField(value = "enable")
+    @ApiModelProperty(value="是否有效")
+    private Boolean enable;
+
+    /**
+     * 自定义字段
+     */
+    @TableField(value = "userDef1")
+    @ApiModelProperty(value="自定义字段")
+    private String userDef1;
+
+    private static final long serialVersionUID = 1L;
+}
 \ No newline at end of file
+package com.huaheng.pc.config.alarmLevel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.config.alarmLevel.domain.AlarmLevel;
+
+public interface AlarmLevelMapper extends BaseMapper<AlarmLevel> {
+}
 \ No newline at end of file
-package com.huaheng.pc.general.warehouseCopany.service;
+package com.huaheng.pc.config.alarmLevel.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.general.warehouseCopany.mapper.WarehouseCompanyMapper;
-import com.huaheng.pc.general.warehouseCopany.domain.WarehouseCompany;
-import com.huaheng.pc.general.warehouseCopany.service.WarehouseCompanyService;
+import com.huaheng.pc.config.alarmLevel.domain.AlarmLevel;
+import com.huaheng.pc.config.alarmLevel.mapper.AlarmLevelMapper;
 @Service
-public class WarehouseCompanyServiceImpl extends ServiceImpl<WarehouseCompanyMapper, WarehouseCompany> implements WarehouseCompanyService{
+public class AlarmLevelService extends ServiceImpl<AlarmLevelMapper, AlarmLevel> {
  
 }
-package com.huaheng.pc.general.bom.controller;
+package com.huaheng.pc.config.bom.controller;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,10 +14,10 @@ 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.bom.domain.BomDetail;
-import com.huaheng.pc.general.bom.service.BomDetailService;
-import com.huaheng.pc.general.material.domain.Material;
-import com.huaheng.pc.general.material.service.MaterialService;
+import com.huaheng.pc.config.bom.domain.BomDetail;
+import com.huaheng.pc.config.bom.service.BomDetailService;
+import com.huaheng.pc.config.material.domain.Material;
+import com.huaheng.pc.config.material.service.MaterialService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -30,17 +30,17 @@ import java.util.ArrayList;
 import java.util.List;
  
 @Controller
-@RequestMapping("/general/bomDetail")
+@RequestMapping("/config/bomDetail")
 public class BomDetailController extends BaseController {
  
-    private String prefix = "general/bomDetail";
+    private String prefix = "config/bomDetail";
  
     @Resource
     private BomDetailService bomDetailService;
     @Resource
     private MaterialService materialService;
  
-    @RequiresPermissions("general:bomHeader:view")
+    @RequiresPermissions("config:bomHeader:view")
     @Log(title = "管理-推送详情列表", operating = "推送详情列表", action = BusinessType.GRANT)
     @GetMapping("/list/{id}")
     public String list(@PathVariable("id")Integer id, ModelMap mmap) {
@@ -52,7 +52,7 @@ public class BomDetailController extends BaseController {
      * 查询商品详情
      */
     @ApiOperation(value="查看商品列表", notes="根据商品id获取商品详情信息", httpMethod = "POST")
-    @RequiresPermissions("general:bomHeader:list")
+    @RequiresPermissions("config:bomHeader:list")
     @Log(title = "通用-商品管理", operating = "查看商品列表", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
@@ -85,7 +85,7 @@ public class BomDetailController extends BaseController {
      * 新增保存商品
      */
     @ApiOperation(value="新增商品详情", notes="新增商品详情", httpMethod = "POST")
-    @RequiresPermissions("general:bomDetail:add")
+    @RequiresPermissions("config:bomDetail:add")
     @Log(title = "通用-商品", operating = "新增商品", action = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -121,7 +121,7 @@ public class BomDetailController extends BaseController {
      * 修改保存商品详情
      */
     @ApiOperation(value="修改商品详情", notes="修改商品详情", httpMethod = "POST")
-    @RequiresPermissions("general:BomDetail:edit")
+    @RequiresPermissions("config:BomDetail:edit")
     @Log(title = "通用-商品详情", operating = "修改商品详情", action = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -134,7 +134,7 @@ public class BomDetailController extends BaseController {
      * 删除商品详情
      */
     @ApiOperation(value="删除商品详情", notes="根据id批量删除商品详情，参数示例1,2,3", httpMethod = "POST")
-    @RequiresPermissions("general:BomDetail:remove")
+    @RequiresPermissions("config:BomDetail:remove")
     @Log(title = "通用-商品", operating = "删除商品", action = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
-package com.huaheng.pc.general.bom.controller;
+package com.huaheng.pc.config.bom.controller;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,12 +14,12 @@ 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.bom.domain.BomDetail;
-import com.huaheng.pc.general.bom.domain.BomHeader;
-import com.huaheng.pc.general.bom.service.BomDetailService;
-import com.huaheng.pc.general.bom.service.BomHeaderService;
-import com.huaheng.pc.general.material.domain.Material;
-import com.huaheng.pc.general.material.service.MaterialService;
+import com.huaheng.pc.config.bom.domain.BomDetail;
+import com.huaheng.pc.config.bom.domain.BomHeader;
+import com.huaheng.pc.config.bom.service.BomDetailService;
+import com.huaheng.pc.config.bom.service.BomHeaderService;
+import com.huaheng.pc.config.material.domain.Material;
+import com.huaheng.pc.config.material.service.MaterialService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -32,10 +32,10 @@ import java.util.ArrayList;
 import java.util.List;
  
 @Controller
-@RequestMapping("/general/bomHeader")
+@RequestMapping("/config/bomHeader")
 public class BomHeaderController extends BaseController {
  
-    private String prefix = "general/bomHeader";
+    private String prefix = "config/bomHeader";
  
     @Resource
     private BomHeaderService bomHeaderService;
@@ -46,7 +46,7 @@ public class BomHeaderController extends BaseController {
     @Resource
     private MaterialService materialService;
  
-    @RequiresPermissions("general:bomHeader:view")
+    @RequiresPermissions("config:bomHeader:view")
     @GetMapping()
     public String bomHeader() {
         System.out.println("商品管理");
@@ -57,7 +57,7 @@ public class BomHeaderController extends BaseController {
      * 查询商品列表
      */
     @ApiOperation(value="查看商品列表", notes="根据物料编码、物料名称、货主编码、创建时间获取商品信息", httpMethod = "POST")
-    @RequiresPermissions("general:bomHeader:list")
+    @RequiresPermissions("config:bomHeader:list")
     @Log(title = "通用-商品管理", operating = "查看商品列表", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
@@ -98,7 +98,7 @@ public class BomHeaderController extends BaseController {
      * 新增保存商品
      */
     @ApiOperation(value="新增商品", notes="新增商品", httpMethod = "POST")
-    @RequiresPermissions("general:bomHeader:add")
+    @RequiresPermissions("config:bomHeader:add")
     @Log(title = "通用-商品", operating = "新增商品", action = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -136,7 +136,7 @@ public class BomHeaderController extends BaseController {
      * 修改保存商品
      */
     @ApiOperation(value="修改商品", notes="修改商品", httpMethod = "POST")
-    @RequiresPermissions("general:bomHeader:edit")
+    @RequiresPermissions("config:bomHeader:edit")
     @Log(title = "通用-商品", operating = "修改商品", action = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -149,7 +149,7 @@ public class BomHeaderController extends BaseController {
      * 删除容器
      */
     @ApiOperation(value="删除商品", notes="根据id批量删除商品，参数示例1,2,3", httpMethod = "POST")
-    @RequiresPermissions("general:bomHeader:remove")
+    @RequiresPermissions("config:bomHeader:remove")
     @Log(title = "通用-商品", operating = "删除商品", action = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
-package com.huaheng.pc.general.bom.domain;
+package com.huaheng.pc.config.bom.domain;
  
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -10,7 +10,7 @@ import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
  
-@ApiModel(value="com.huaheng.pc.general.bom.domain.BomDetail")
+@ApiModel(value="com.huaheng.pc.config.bom.domain.BomDetail")
 @Data
 @TableName(value = "bom_detail")
 public class BomDetail implements Serializable {
-package com.huaheng.pc.general.bom.domain;
+package com.huaheng.pc.config.bom.domain;
  
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -10,7 +10,7 @@ import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
  
-@ApiModel(value="com.huaheng.pc.general.bom.domain.BomHeader")
+@ApiModel(value="com.huaheng.pc.config.bom.domain.BomHeader")
 @Data
 @TableName(value = "bom_header")
 public class BomHeader implements Serializable {
-package com.huaheng.pc.general.bom.mapper;
+package com.huaheng.pc.config.bom.mapper;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.general.bom.domain.BomDetail;
+import com.huaheng.pc.config.bom.domain.BomDetail;
  
 public interface BomDetailMapper extends BaseMapper<BomDetail> {
 }
 \ No newline at end of file
-package com.huaheng.pc.general.bom.mapper;
+package com.huaheng.pc.config.bom.mapper;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.general.bom.domain.BomHeader;
+import com.huaheng.pc.config.bom.domain.BomHeader;
  
 public interface BomHeaderMapper extends BaseMapper<BomHeader> {
 }
 \ No newline at end of file
-package com.huaheng.pc.general.bom.service;
+package com.huaheng.pc.config.bom.service;
  
-import com.huaheng.pc.general.bom.domain.BomDetail;
+import com.huaheng.pc.config.bom.domain.BomDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 public interface BomDetailService extends IService<BomDetail>{
  
-package com.huaheng.pc.general.bom.service;
+package com.huaheng.pc.config.bom.service;
  
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huaheng.pc.general.bom.domain.BomDetail;
-import com.huaheng.pc.general.bom.mapper.BomDetailMapper;
+import com.huaheng.pc.config.bom.domain.BomDetail;
+import com.huaheng.pc.config.bom.mapper.BomDetailMapper;
  
 @Service
 public class BomDetailServiceImpl extends ServiceImpl<BomDetailMapper, BomDetail> implements BomDetailService{
-package com.huaheng.pc.general.bom.service;
+package com.huaheng.pc.config.bom.service;
  
-import com.huaheng.pc.general.bom.domain.BomHeader;
+import com.huaheng.pc.config.bom.domain.BomHeader;
 import com.baomidou.mybatisplus.extension.service.IService;
 public interface BomHeaderService extends IService<BomHeader>{
  
-package com.huaheng.pc.general.bom.service;
+package com.huaheng.pc.config.bom.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.general.bom.domain.BomHeader;
-import com.huaheng.pc.general.bom.mapper.BomHeaderMapper;
-import com.huaheng.pc.general.bom.service.BomHeaderService;
+import com.huaheng.pc.config.bom.domain.BomHeader;
+import com.huaheng.pc.config.bom.mapper.BomHeaderMapper;
+
 @Service
 public class BomHeaderServiceImpl extends ServiceImpl<BomHeaderMapper, BomHeader> implements BomHeaderService{
  
-package com.huaheng.pc.general.carrier.controller;
+package com.huaheng.pc.config.carrier.controller;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,8 +14,8 @@ 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 com.huaheng.pc.config.carrier.domain.Carrier;
+import com.huaheng.pc.config.carrier.service.CarrierService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -31,15 +31,15 @@ import java.util.List;
  * 承运商
  */
 @Controller
-@RequestMapping("/general/carrier")
+@RequestMapping("/config/carrier")
 public class CarrierController extends BaseController {
  
-    private String prefix = "general/carrier";
+    private String prefix = "config/carrier";
  
     @Resource
     private CarrierService carrierService;
  
-    @RequiresPermissions("general:carrier:view")
+    @RequiresPermissions("config:carrier:view")
     @GetMapping()
     public String bomHeader() {
         return prefix + "/carrier";
@@ -49,7 +49,7 @@ public class CarrierController extends BaseController {
      * 查询承运商列表
      */
     @ApiOperation(value="查看承运商列表", notes="根据承运商编码、名称、创建时间获取承运商信息", httpMethod = "POST")
-    @RequiresPermissions("general:carrier:list")
+    @RequiresPermissions("config:carrier:list")
     @Log(title = "通用-承运商管理", operating = "查看承运商列表", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
@@ -90,7 +90,7 @@ public class CarrierController extends BaseController {
      * 新增保存承运商
      */
     @ApiOperation(value="新增承运商", notes="新增承运商", httpMethod = "POST")
-    @RequiresPermissions("general:carrier:add")
+    @RequiresPermissions("config:carrier:add")
     @Log(title = "通用-承运商", operating = "新增承运商", action = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -115,7 +115,7 @@ public class CarrierController extends BaseController {
      * 修改保存承运商
      */
     @ApiOperation(value="修改承运商", notes="修改承运商", httpMethod = "POST")
-    @RequiresPermissions("general:carrier:edit")
+    @RequiresPermissions("config:carrier:edit")
     @Log(title = "通用-承运商", operating = "修改承运商", action = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -129,7 +129,7 @@ public class CarrierController extends BaseController {
      * 删除承运商
      */
     @ApiOperation(value="删除承运商", notes="根据id批量删除承运商，参数示例1,2,3", httpMethod = "POST")
-    @RequiresPermissions("general:carrier:remove")
+    @RequiresPermissions("config:carrier:remove")
     @Log(title = "通用-承运商", operating = "删除承运商", action = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
-package com.huaheng.pc.general.carrier.domain;
+package com.huaheng.pc.config.carrier.domain;
  
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -13,7 +13,7 @@ import lombok.Data;
 /**
  * 承运商
  */
-@ApiModel(value="com.huaheng.pc.general.carrier.domain.Carrier")
+@ApiModel(value="com.huaheng.pc.config.carrier.domain.Carrier")
 @Data
 @TableName(value = "carrier")
 public class Carrier implements Serializable {
-package com.huaheng.pc.general.carrier.mapper;
+package com.huaheng.pc.config.carrier.mapper;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.general.carrier.domain.Carrier;
+import com.huaheng.pc.config.carrier.domain.Carrier;
  
 public interface CarrierMapper extends BaseMapper<Carrier> {
 }
 \ No newline at end of file
-package com.huaheng.pc.general.carrier.service;
+package com.huaheng.pc.config.carrier.service;
  
-import com.huaheng.pc.general.carrier.domain.Carrier;
+import com.huaheng.pc.config.carrier.domain.Carrier;
 import com.baomidou.mybatisplus.extension.service.IService;
 public interface CarrierService extends IService<Carrier>{
  
-package com.huaheng.pc.general.carrier.service;
+package com.huaheng.pc.config.carrier.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.general.carrier.mapper.CarrierMapper;
-import com.huaheng.pc.general.carrier.domain.Carrier;
-import com.huaheng.pc.general.carrier.service.CarrierService;
+import com.huaheng.pc.config.carrier.mapper.CarrierMapper;
+import com.huaheng.pc.config.carrier.domain.Carrier;
+
 @Service
 public class CarrierServiceImpl extends ServiceImpl<CarrierMapper, Carrier> implements CarrierService{
  
-package com.huaheng.pc.general.company.controller;
+package com.huaheng.pc.config.company.controller;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,10 +14,10 @@ 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.company.domain.Company;
-import com.huaheng.pc.general.company.service.CompanyService;
-import com.huaheng.pc.general.warehouse.domain.Warehouse;
-import com.huaheng.pc.general.warehouse.service.WarehouseService;
+import com.huaheng.pc.config.company.domain.Company;
+import com.huaheng.pc.config.company.service.CompanyService;
+import com.huaheng.pc.config.warehouse.domain.Warehouse;
+import com.huaheng.pc.config.warehouse.service.WarehouseService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,21 +25,20 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
  
 import javax.annotation.Resource;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
  
 @Controller
-@RequestMapping("/general/company")
+@RequestMapping("/config/company")
 public class CompanyController extends BaseController {
     @Resource
     private CompanyService companyService;
     @Resource
     private WarehouseService warehouseService;
  
-    private String prefix = "general/company";
+    private String prefix = "config/company";
  
-    @RequiresPermissions("general:company:view")
+    @RequiresPermissions("config:company:view")
     @GetMapping()
     public String company() {
         return prefix + "/company";
@@ -48,7 +47,7 @@ public class CompanyController extends BaseController {
     /**
      * 查询货主列表
      */
-    @RequiresPermissions("general:company:list")
+    @RequiresPermissions("config:company:list")
     @Log(title = "通用-货主管理", operating = "查看货主列表", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
@@ -58,7 +57,7 @@ public class CompanyController extends BaseController {
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
  
-        lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin),Company::getCreated, createdBegin)
+        lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), Company::getCreated, createdBegin)
                 .lt(StringUtils.isNotEmpty(createdEnd), Company::getCreated, createdEnd)
                 .eq(StringUtils.isNotEmpty(company.getCode()), Company::getCode, company.getCode())
                 .eq(StringUtils.isNotEmpty(company.getName()), Company::getName, company.getName())
@@ -95,7 +94,7 @@ public class CompanyController extends BaseController {
     /**
      * 新增保存货主
      */
-    @RequiresPermissions("general:company:add")
+    @RequiresPermissions("config:company:add")
     @Log(title = "通用-货主管理", operating = "新增货主", action = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -119,7 +118,7 @@ public class CompanyController extends BaseController {
     /**
      * 修改保存货主
      */
-    @RequiresPermissions("general:company:edit")
+    @RequiresPermissions("config:company:edit")
     @Log(title = "通用-货主管理", operating = "修改货主", action = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -131,7 +130,7 @@ public class CompanyController extends BaseController {
     /**
      * 删除货主
      */
-    @RequiresPermissions("general:company:remove")
+    @RequiresPermissions("config:company:remove")
     @Log(title = "通用-货主管理", operating ="删除货主", action = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
-package com.huaheng.pc.general.company.domain;
+package com.huaheng.pc.config.company.domain;
  
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-package com.huaheng.pc.general.company.mapper;
-import java.util.Date;
+package com.huaheng.pc.config.company.mapper;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.general.company.domain.Company;
+import com.huaheng.pc.config.company.domain.Company;
 import org.apache.ibatis.annotations.Param;
  
 import java.util.List;
-package com.huaheng.pc.general.company.service;
+package com.huaheng.pc.config.company.service;
  
-import com.huaheng.framework.web.domain.AjaxResult;
-import com.huaheng.pc.general.company.domain.Company;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.company.domain.Company;
  
 import java.util.List;
 import java.util.Map;
-package com.huaheng.pc.general.company.service;
+package com.huaheng.pc.config.company.service;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
-import com.huaheng.pc.config.containerType.domain.ContainerType;
-import com.huaheng.pc.general.warehouseCopany.domain.WarehouseCompany;
-import com.huaheng.pc.general.warehouseCopany.service.WarehouseCompanyService;
+import com.huaheng.pc.config.company.domain.Company;
+import com.huaheng.pc.config.company.mapper.CompanyMapper;
+import com.huaheng.pc.config.warehouseCompany.domain.WarehouseCompany;
+import com.huaheng.pc.config.warehouseCompany.service.WarehouseCompanyService;
 import com.huaheng.pc.system.user.domain.UserCompany;
 import com.huaheng.pc.system.user.mapper.UserCompanyMapper;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
  
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huaheng.pc.general.company.mapper.CompanyMapper;
-import com.huaheng.pc.general.company.domain.Company;
-import com.huaheng.pc.general.company.service.CompanyService;
 @Service("companyService")
-public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService{
+public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService {
  
     @Resource
     private CompanyMapper companyMapper;
@@ -104,7 +103,7 @@ public class CompanyServiceImpl extends ServiceImpl&lt;CompanyMapper, Company&gt; impl
  
     public List<Map<String, Object>> getCode(){
         LambdaQueryWrapper<Company> lambda = Wrappers.lambdaQuery();
-        lambda.select(Company::getCode,Company::getId,Company::getName)
+        lambda.select(Company::getCode, Company::getId, Company::getName)
                 .eq(Company::getWarehouseCode, ShiroUtils.getWarehouseCode());
         return this.listMaps(lambda);
     }
-package com.huaheng.pc.general.container.controller;
+package com.huaheng.pc.config.container.controller;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,9 +15,8 @@ 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.container.domain.Container;
-import com.huaheng.pc.general.container.service.ContainerService;
-import com.huaheng.pc.general.material.domain.Material;
+import com.huaheng.pc.config.container.domain.Container;
+import com.huaheng.pc.config.container.service.ContainerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -32,15 +31,15 @@ import java.util.List;
  
 @Api(tags={"容器操作类"})
 @Controller
-@RequestMapping("/general/container")
+@RequestMapping("/config/container")
 public class ContainerController extends BaseController {
  
-    private String prefix = "general/container";
+    private String prefix = "config/container";
  
     @Resource
     private ContainerService containerService;
  
-    @RequiresPermissions("general:container:view")
+    @RequiresPermissions("config:container:view")
     @GetMapping()
     public String container() {
         return prefix + "/container";
@@ -52,7 +51,7 @@ public class ContainerController extends BaseController {
     @ApiOperation(value="查看容器列表",
             notes="根据容器编号、库位编码、容器状态、容器类型、创建时间获取库位的详细信息",
             httpMethod = "POST")
-    @RequiresPermissions("general:location:list")
+    @RequiresPermissions("config:container:list")
     @Log(title = "通用-库位管理", operating = "查看库位列表", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
@@ -98,7 +97,7 @@ public class ContainerController extends BaseController {
      * 新增保存容器
      */
     @ApiOperation(value="新增容器", notes="根据容器类型、数量批量新增容器", httpMethod = "POST")
-    @RequiresPermissions("general:container:add")
+    @RequiresPermissions("config:container:add")
     @Log(title = "通用-容器", operating = "新增容器", action = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -124,7 +123,7 @@ public class ContainerController extends BaseController {
 	 * 修改保存容器
 	 */
     @ApiOperation(value="修改容器", notes="修改容器", httpMethod = "POST")
-	@RequiresPermissions("general:container:edit")
+	@RequiresPermissions("config:container:edit")
 	@Log(title = "通用-容器", operating = "修改容器", action = BusinessType.UPDATE)
 	@PostMapping("/edit")
 	@ResponseBody
@@ -137,7 +136,7 @@ public class ContainerController extends BaseController {
      * 删除容器
      */
     @ApiOperation(value="删除容器", notes="根据id批量删除容器，参数示例1,2,3", httpMethod = "POST")
-    @RequiresPermissions("general:container:remove")
+    @RequiresPermissions("config:container:remove")
     @Log(title = "通用-容器", operating = "删除容器", action = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
-package com.huaheng.pc.general.container.domain;
+package com.huaheng.pc.config.container.domain;
  
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -13,7 +13,7 @@ import java.io.Serializable;
 import java.util.Date;
  
 @Data
-@ApiModel(value="com.huaheng.pc.general.container.domain.Container")
+@ApiModel(value="com.huaheng.pc.config.container.domain.Container")
 @TableName(value = "container")
 public class Container implements Serializable {
     /**
-package com.huaheng.pc.general.container.domain;
+package com.huaheng.pc.config.container.domain;
  
 public enum  ContainerStatus {
     empty,
-package com.huaheng.pc.general.container.mapper;
+package com.huaheng.pc.config.container.mapper;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.general.container.domain.Container;
+import com.huaheng.pc.config.container.domain.Container;
  
 public interface ContainerMapper extends BaseMapper<Container> {
  
-package com.huaheng.pc.general.container.service;
+package com.huaheng.pc.config.container.service;
  
 import com.huaheng.framework.web.domain.AjaxResult;
-import com.huaheng.pc.general.container.domain.Container;
+import com.huaheng.pc.config.container.domain.Container;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huaheng.pc.general.material.domain.Material;
  
 import java.util.List;
  
-package com.huaheng.pc.general.container.service;
+package com.huaheng.pc.config.container.service;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -7,20 +7,17 @@ import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
-import com.huaheng.pc.config.containerType.domain.ContainerType;
 import com.huaheng.pc.config.containerType.service.ContainerTypeService;
-import com.huaheng.pc.general.container.domain.ContainerStatus;
-import com.huaheng.pc.general.material.domain.Material;
-import org.apache.commons.collections.functors.ConstantFactory;
+import com.huaheng.pc.config.container.domain.ContainerStatus;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huaheng.pc.general.container.domain.Container;
-import com.huaheng.pc.general.container.mapper.ContainerMapper;
-import com.huaheng.pc.general.container.service.ContainerService;
+import com.huaheng.pc.config.container.domain.Container;
+import com.huaheng.pc.config.container.mapper.ContainerMapper;
+
 @Service
 public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container> implements ContainerService{
  
@@ -16,8 +16,7 @@ import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.config.containerCapacity.domain.ContainerCapacity;
 import com.huaheng.pc.config.containerCapacity.service.ContainerCapacityService;
-import com.huaheng.pc.general.material.domain.Material;
-import com.huaheng.pc.general.material.service.MaterialService;
+import com.huaheng.pc.config.material.service.MaterialService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -7,8 +7,8 @@ import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.config.containerType.domain.ContainerType;
 import com.huaheng.pc.config.containerType.service.ContainerTypeService;
-import com.huaheng.pc.general.material.domain.Material;
-import com.huaheng.pc.general.material.service.MaterialService;
+import com.huaheng.pc.config.material.domain.Material;
+import com.huaheng.pc.config.material.service.MaterialService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-package com.huaheng.pc.general.customer.controller;
+package com.huaheng.pc.config.customer.controller;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,8 +14,8 @@ 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.customer.domain.Customer;
-import com.huaheng.pc.general.customer.service.CustomerService;
+import com.huaheng.pc.config.customer.domain.Customer;
+import com.huaheng.pc.config.customer.service.CustomerServiceImpl;
 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
 import io.swagger.annotations.Api;
@@ -32,17 +32,17 @@ import java.util.Map;
  
 @Api(tags={"客户操作类"})
 @Controller
-@RequestMapping("/general/customer")
+@RequestMapping("/config/customer")
 public class CustomerController extends BaseController {
  
-    private String prefix = "general/customer";
+    private String prefix = "config/customer";
  
     @Resource
-    private CustomerService customerService;
+    private CustomerServiceImpl customerService;
     @Resource
     private ShipmentHeaderService shipmentHeaderService;
  
-    @RequiresPermissions("general:customer:view")
+    @RequiresPermissions("config:customer:view")
     @GetMapping()
     public String customer(){
         return prefix + "/customer";
@@ -52,11 +52,11 @@ public class CustomerController extends BaseController {
      * 查询客户列表
      */
     @ApiOperation(value="查看客户列表", notes="根据编码、名称、创建时间获取客户的详细信息", httpMethod = "POST")
-    @RequiresPermissions("general:customer:list")
+    @RequiresPermissions("config:customer:list")
     @Log(title = "通用-客户管理",operating = "查看客户信息", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(@ApiParam(name="customer",value="编码、名称")Customer customer,
+    public TableDataInfo list(@ApiParam(name="customer",value="编码、名称") Customer customer,
                               @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
                               @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd){
         LambdaQueryWrapper<Customer> lambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -94,7 +94,7 @@ public class CustomerController extends BaseController {
      * 新增保存客户
      */
     @ApiOperation(value="新增客户", notes="新增客户", httpMethod = "POST")
-    @RequiresPermissions("general:customer:add")
+    @RequiresPermissions("config:customer:add")
     @Log(title = "通用-客户管理",operating = "新增客户", action = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -120,7 +120,7 @@ public class CustomerController extends BaseController {
      * 修改保存客户
      */
     @ApiOperation(value="修改客户信息", notes="修改客户信息", httpMethod = "POST")
-    @RequiresPermissions("general:customer:edit")
+    @RequiresPermissions("config:customer:edit")
     @Log(title = "通用-客户管理",operating = "修改客户信息", action = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -133,7 +133,7 @@ public class CustomerController extends BaseController {
      * 删除客户
      */
     @ApiOperation(value="删除客户信息", notes="单条删除或批量删除客户信息，示例1或1,2,3", httpMethod = "POST")
-    @RequiresPermissions("general:customer:remove")
+    @RequiresPermissions("config:customer:remove")
     @Log(title = "通用-客户管理",operating = "修改客户", action = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
-package com.huaheng.pc.general.customer.domain;
+package com.huaheng.pc.config.customer.domain;
  
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-package com.huaheng.pc.general.customer.mapper;
+package com.huaheng.pc.config.customer.mapper;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.general.customer.domain.Customer;
+import com.huaheng.pc.config.customer.domain.Customer;
  
 public interface CustomerMapper extends BaseMapper<Customer> {
 }
 \ No newline at end of file
+package com.huaheng.pc.config.customer.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huaheng.pc.config.customer.domain.Customer;
+import com.huaheng.pc.config.customer.mapper.CustomerMapper;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+@Service
+public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements IService<Customer> {
+
+}
-package com.huaheng.pc.general.location.controller;
+package com.huaheng.pc.config.location.controller;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,8 +14,8 @@ 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.general.location.service.LocationService;
+import com.huaheng.pc.config.location.domain.Location;
+import com.huaheng.pc.config.location.service.LocationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -29,15 +29,15 @@ import java.util.List;
  
 @Api(tags={"库位操作类"})
 @Controller
-@RequestMapping("/general/location")
+@RequestMapping("/config/location")
 public class LocationController extends BaseController {
  
-    private String prefix = "general/location";
+    private String prefix = "config/location";
  
     @Resource
     private LocationService locationService;
  
-    @RequiresPermissions("general:location:view")
+    @RequiresPermissions("config:location:view")
     @GetMapping()
     public String location() {
         return prefix + "/location";
@@ -49,7 +49,7 @@ public class LocationController extends BaseController {
     @ApiOperation(value="查看库位列表",
             notes="根据行、列、层、格、库位类型、库区、库位状态、容器编码、库位名称、库位编码、创建时间获取库位的详细信息",
             httpMethod = "POST")
-    @RequiresPermissions("general:location:list")
+    @RequiresPermissions("config:location:list")
     @Log(title = "通用-库位管理", operating = "查看库位列表", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
@@ -99,7 +99,7 @@ public class LocationController extends BaseController {
      * 新增保存库位
      */
     @ApiOperation(value="新增库位", notes="新增单个库位", httpMethod = "POST")
-    @RequiresPermissions("general:location:add")
+    @RequiresPermissions("config:location:add")
     @Log(title = "通用-库位管理", operating = "新增库位", action = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -122,7 +122,7 @@ public class LocationController extends BaseController {
     /**
      * 批量新增保存库位
      */
-    @RequiresPermissions("general:location:add")
+    @RequiresPermissions("config:location:add")
     @ApiOperation(value="新增库位", notes="批量新增库位", httpMethod = "POST")
     @Log(title = "通用-库位管理", operating = "新增库位", action = BusinessType.INSERT)
     @PostMapping("/addBatchSave")
@@ -143,7 +143,7 @@ public class LocationController extends BaseController {
     /**
      * 修改保存库位
      */
-    @RequiresPermissions("general:location:edit")
+    @RequiresPermissions("config:location:edit")
     @ApiOperation(value="修改库位", notes="批量修改库位", httpMethod = "POST")
     @Log(title = "通用-库位管理", operating = "修改库位", action = BusinessType.UPDATE)
     @PostMapping("/edit")
@@ -156,7 +156,7 @@ public class LocationController extends BaseController {
     /**
      * 删除库位
      */
-    @RequiresPermissions("general:location:remove")
+    @RequiresPermissions("config:location:remove")
     @Log(title = "通用-库位管理", operating = "删除库位", action = BusinessType.DELETE)
     @ApiOperation(value="删除库位", notes="批量删除库位", httpMethod = "POST")
     @PostMapping( "/remove")
-package com.huaheng.pc.general.location.domain;
+package com.huaheng.pc.config.location.domain;
  
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-package com.huaheng.pc.general.location.mapper;
+package com.huaheng.pc.config.location.mapper;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.general.location.domain.Location;
+import com.huaheng.pc.config.location.domain.Location;
 import org.apache.ibatis.annotations.Param;
  
 public interface LocationMapper extends BaseMapper<Location> {
-package com.huaheng.pc.general.location.service;
+package com.huaheng.pc.config.location.service;
  
-import com.huaheng.pc.general.location.domain.Location;
+import com.huaheng.pc.config.location.domain.Location;
 import com.baomidou.mybatisplus.extension.service.IService;
 public interface LocationService extends IService<Location>{
  
-package com.huaheng.pc.general.location.service;
+package com.huaheng.pc.config.location.service;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,9 +18,9 @@ import java.util.List;
 import java.util.Map;
  
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huaheng.pc.general.location.domain.Location;
-import com.huaheng.pc.general.location.mapper.LocationMapper;
-import com.huaheng.pc.general.location.service.LocationService;
+import com.huaheng.pc.config.location.domain.Location;
+import com.huaheng.pc.config.location.mapper.LocationMapper;
+
 @Service("LocationService")
 public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> implements LocationService{
  
-package com.huaheng.pc.general.material.controller;
+package com.huaheng.pc.config.material.controller;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,8 +16,8 @@ import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.config.materialUnit.domain.MaterialUnit;
 import com.huaheng.pc.config.materialUnit.service.MaterialUnitService;
-import com.huaheng.pc.general.material.domain.Material;
-import com.huaheng.pc.general.material.service.MaterialService;
+import com.huaheng.pc.config.material.domain.Material;
+import com.huaheng.pc.config.material.service.MaterialService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -33,10 +33,10 @@ import java.util.Map;
  
 @Api(tags={"物料控制类"})
 @Controller
-@RequestMapping("/general/material")
+@RequestMapping("/config/material")
 public class MaterialController extends BaseController {
  
-    private String prefix = "general/material";
+    private String prefix = "config/material";
  
     @Resource
     private MaterialService materialService;
@@ -44,7 +44,7 @@ public class MaterialController extends BaseController {
     @Resource
     private MaterialUnitService materialUnitService;
  
-    @RequiresPermissions("general:material:view")
+    @RequiresPermissions("config:material:view")
     @GetMapping()
     public String material() {
         return prefix + "/material";
@@ -56,7 +56,7 @@ public class MaterialController extends BaseController {
     @ApiOperation(value="查看物料列表",
             notes="根据物料编码、名称、规格、物料类别、创建时间获取物料的详细信息",
             httpMethod = "POST")
-    @RequiresPermissions("general:material:list")
+    @RequiresPermissions("config:material:list")
     @Log(title = "通用-物料管理", operating = "查看物料列表", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
@@ -102,7 +102,7 @@ public class MaterialController extends BaseController {
      * 新增保存物料
      */
     @ApiOperation(value="新增物料", notes="新增物料", httpMethod = "POST")
-    @RequiresPermissions("general:material:add")
+    @RequiresPermissions("config:material:add")
     @Log(title = "通用-物料管理", operating = "新增物料", action = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -153,7 +153,7 @@ public class MaterialController extends BaseController {
      * 修改保存物料
      */
     @ApiOperation(value="修改物料", notes="修改物料", httpMethod = "POST")
-    @RequiresPermissions("general:material:edit")
+    @RequiresPermissions("config:material:edit")
     @Log(title = "通用-物料管理", operating = "修改物料", action = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -165,7 +165,7 @@ public class MaterialController extends BaseController {
     /**
      * 删除物料
      */
-    @RequiresPermissions("general:material:remove")
+    @RequiresPermissions("config:material:remove")
     @Log(title = "通用-物料管理", operating = "删除物料", action = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
-package com.huaheng.pc.general.material.domain;
+package com.huaheng.pc.config.material.domain;
  
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -11,7 +11,7 @@ import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
  
-@ApiModel(value="com.huaheng.pc.general.material.domain.Material")
+@ApiModel(value="com.huaheng.pc.config.material.domain.Material")
 @Data
 @TableName(value = "material")
 public class Material implements Serializable {
-package com.huaheng.pc.general.material.mapper;
+package com.huaheng.pc.config.material.mapper;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.general.material.domain.Material;
+import com.huaheng.pc.config.material.domain.Material;
  
 public interface MaterialMapper extends BaseMapper<Material> {
 }
 \ No newline at end of file
-package com.huaheng.pc.general.material.service;
+package com.huaheng.pc.config.material.service;
  
 import com.huaheng.framework.web.domain.AjaxResult;
-import com.huaheng.pc.general.material.domain.Material;
+import com.huaheng.pc.config.material.domain.Material;
 import com.baomidou.mybatisplus.extension.service.IService;
  
 import java.util.List;
-package com.huaheng.pc.general.material.service;
+package com.huaheng.pc.config.material.service;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -15,10 +15,8 @@ import java.util.List;
 import java.util.Map;
  
 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;
+import com.huaheng.pc.config.material.mapper.MaterialMapper;
+import com.huaheng.pc.config.material.domain.Material;
  
 @Service
 public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> implements MaterialService{
@@ -3,17 +3,13 @@ package com.huaheng.pc.config.materialMultiple.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.common.utils.security.ShiroUtils;
-import com.huaheng.framework.shiro.realm.UserRealm;
-import com.huaheng.pc.general.warehouse.domain.Warehouse;
+import com.huaheng.pc.config.materialMultiple.domain.MaterialMultiple;
+import com.huaheng.pc.config.materialMultiple.mapper.MaterialMultipleMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huaheng.pc.config.materialMultiple.mapper.MaterialMultipleMapper;
-import com.huaheng.pc.config.materialMultiple.domain.MaterialMultiple;
-
-import java.math.BigDecimal;
  
 @Service
 public class MaterialMultipleServiceImpl extends ServiceImpl<MaterialMultipleMapper, MaterialMultiple> implements IService<MaterialMultiple> {
@@ -16,8 +16,8 @@ import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.config.materialUnit.domain.MaterialUnit;
 import com.huaheng.pc.config.materialUnit.service.MaterialUnitService;
-import com.huaheng.pc.general.material.domain.Material;
-import com.huaheng.pc.general.material.service.MaterialService;
+import com.huaheng.pc.config.material.domain.Material;
+import com.huaheng.pc.config.material.service.MaterialService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+package com.huaheng.pc.config.sendMail.domain;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@ApiModel(value="com.huaheng.pc.config.sendMail.domain.SendMail")
+@Data
+@TableName(value = "send_mail")
+public class SendMail implements Serializable {
+    /**
+     * 主键，自增字段
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="主键，自增字段")
+    private Integer id;
+
+    /**
+     * 仓库编码
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库编码")
+    private String warehouseCode;
+
+    /**
+     * 货主编码
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value="货主编码")
+    private String companyCode;
+
+    /**
+     * 类别
+     */
+    @TableField(value = "type")
+    @ApiModelProperty(value="类别")
+    private Integer type;
+
+    /**
+     * 预警id
+     */
+    @TableField(value = "alarmId")
+    @ApiModelProperty(value="预警id")
+    private Integer alarmId;
+
+    /**
+     * 预警级别
+     */
+    @TableField(value = "warningLevel")
+    @ApiModelProperty(value="预警级别")
+    private Integer warningLevel;
+
+    /**
+     * 发送级别
+     */
+    @TableField(value = "sendingLevel")
+    @ApiModelProperty(value="发送级别")
+    private Integer sendingLevel;
+
+    /**
+     * 收件人
+     */
+    @TableField(value = "addressee")
+    @ApiModelProperty(value="收件人")
+    private String addressee;
+
+    /**
+     * 邮箱
+     */
+    @TableField(value = "email")
+    @ApiModelProperty(value="邮箱")
+    private String email;
+
+    /**
+     * 预警时间
+     */
+    @TableField(value = "alarmTime")
+    @ApiModelProperty(value="预警时间")
+    private Date alarmTime;
+
+    /**
+     * 标题
+     */
+    @TableField(value = "title")
+    @ApiModelProperty(value="标题")
+    private String title;
+
+    /**
+     * 正文
+     */
+    @TableField(value = "body")
+    @ApiModelProperty(value="正文")
+    private String body;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value="更新时间")
+    private Date lastUpdated;
+
+    /**
+     * 是否发送
+     */
+    @TableField(value = "enable")
+    @ApiModelProperty(value="是否发送")
+    private Boolean enable;
+
+    /**
+     * 是否处理
+     */
+    @TableField(value = "handle")
+    @ApiModelProperty(value="是否处理")
+    private Boolean handle;
+
+    /**
+     * 是否删除
+     */
+    @TableField(value = "deleted")
+    @ApiModelProperty(value="是否删除")
+    private Boolean deleted;
+
+    private static final long serialVersionUID = 1L;
+}
 \ No newline at end of file
+package com.huaheng.pc.config.sendMail.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.config.sendMail.domain.SendMail;
+
+public interface SendMailMapper extends BaseMapper<SendMail> {
+}
 \ No newline at end of file
-package com.huaheng.pc.general.customer.service;
+package com.huaheng.pc.config.sendMail.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.general.customer.mapper.CustomerMapper;
-import com.huaheng.pc.general.customer.domain.Customer;
-import com.huaheng.pc.general.customer.service.CustomerService;
+import com.huaheng.pc.config.sendMail.domain.SendMail;
+import com.huaheng.pc.config.sendMail.mapper.SendMailMapper;
 @Service
-public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements CustomerService{
+public class SendMailService extends ServiceImpl<SendMailMapper, SendMail> {
  
 }
-package com.huaheng.pc.general.supplier.controller;
+package com.huaheng.pc.config.supplier.controller;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,8 +14,8 @@ 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.supplier.domain.Supplier;
-import com.huaheng.pc.general.supplier.service.SupplierService;
+import com.huaheng.pc.config.supplier.domain.Supplier;
+import com.huaheng.pc.config.supplier.service.SupplierService;
 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
 import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
 import io.swagger.annotations.Api;
@@ -32,17 +32,17 @@ import java.util.Map;
  
 @Api(tags={"供应商操作类"})
 @Controller
-@RequestMapping("/general/supplier")
+@RequestMapping("/config/supplier")
 public class SupplierController extends BaseController {
  
-    private String prefix = "general/supplier";
+    private String prefix = "config/supplier";
  
     @Resource
     private SupplierService supplierService;
     @Resource
     private ReceiptDetailService receiptDetailService;
  
-    @RequiresPermissions("general:supplier:view")
+    @RequiresPermissions("config:supplier:view")
     @GetMapping()
     public String supplier() {
         return prefix + "/supplier";
@@ -52,7 +52,7 @@ public class SupplierController extends BaseController {
      * 查询供应商列表
      */
     @ApiOperation(value="查询供应商列表", notes="根据编码、名称、创建时间获取库位的详细信息", httpMethod = "POST")
-    @RequiresPermissions("general:supplier:list")
+    @RequiresPermissions("config:supplier:list")
     @Log(title = "通用-供应商管理", operating = "查看供应商列表", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
@@ -94,7 +94,7 @@ public class SupplierController extends BaseController {
      * 新增保存供应商
      */
     @ApiOperation(value="新增供应商", notes="新增供应商", httpMethod = "POST")
-    @RequiresPermissions("general:supplier:add")
+    @RequiresPermissions("config:supplier:add")
     @Log(title = "通用-供应商管理", operating = "新增供应商", action = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -120,7 +120,7 @@ public class SupplierController extends BaseController {
      * 修改保存供应商
      */
     @ApiOperation(value="修改供应商", notes="修改供应商", httpMethod = "POST")
-    @RequiresPermissions("general:supplier:edit")
+    @RequiresPermissions("config:supplier:edit")
     @Log(title = "通用-供应商管理", operating = "修改供应商", action = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -134,7 +134,7 @@ public class SupplierController extends BaseController {
      * 删除供应商
      */
     @ApiOperation(value="删除供应商", notes="单条删除或批量删除供应商信息，示例1或1,2,3", httpMethod = "POST")
-    @RequiresPermissions("general:supplier:remove")
+    @RequiresPermissions("config:supplier:remove")
     @Log(title = "通用-供应商管理", operating = "删除供应商", action = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
-package com.huaheng.pc.general.supplier.domain;
+package com.huaheng.pc.config.supplier.domain;
  
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -10,7 +10,7 @@ import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
  
-@ApiModel(value = "com.huaheng.pc.general.supplier.domain.Supplier")
+@ApiModel(value = "com.huaheng.pc.config.supplier.domain.Supplier")
 @Data
 @TableName(value = "supplier")
 public class Supplier implements Serializable {
-package com.huaheng.pc.general.supplier.mapper;
+package com.huaheng.pc.config.supplier.mapper;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.general.supplier.domain.Supplier;
+import com.huaheng.pc.config.supplier.domain.Supplier;
  
 public interface SupplierMapper extends BaseMapper<Supplier> {
 }
 \ No newline at end of file
-package com.huaheng.pc.general.supplier.service;
+package com.huaheng.pc.config.supplier.service;
  
-import com.huaheng.pc.general.supplier.domain.Supplier;
+import com.huaheng.pc.config.supplier.domain.Supplier;
 import com.baomidou.mybatisplus.extension.service.IService;
 public interface SupplierService extends IService<Supplier>{
  
-package com.huaheng.pc.general.supplier.service;
+package com.huaheng.pc.config.supplier.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.general.supplier.mapper.SupplierMapper;
-import com.huaheng.pc.general.supplier.domain.Supplier;
-import com.huaheng.pc.general.supplier.service.SupplierService;
+import com.huaheng.pc.config.supplier.mapper.SupplierMapper;
+import com.huaheng.pc.config.supplier.domain.Supplier;
+
 @Service
 public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> implements SupplierService{
  
-package com.huaheng.pc.general.warehouse.controller;
+package com.huaheng.pc.config.warehouse.controller;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,9 +14,9 @@ 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.company.service.CompanyService;
-import com.huaheng.pc.general.warehouse.service.WarehouseService;
-import com.huaheng.pc.general.warehouse.domain.Warehouse;
+import com.huaheng.pc.config.company.service.CompanyService;
+import com.huaheng.pc.config.warehouse.domain.Warehouse;
+import com.huaheng.pc.config.warehouse.service.WarehouseService;
 import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
 import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
 import com.huaheng.pc.system.dict.service.IDictDataService;
@@ -30,7 +30,7 @@ import javax.annotation.Resource;
 import java.util.List;
  
 @Controller
-@RequestMapping("/general/warehouse")
+@RequestMapping("/config/warehouse")
 public class WareHouseController extends BaseController {
  
     @Resource
@@ -44,9 +44,9 @@ public class WareHouseController extends BaseController {
     @Resource
     private CompanyService companyService;
  
-    private String prefix = "general/warehouse";
+    private String prefix = "config/warehouse";
  
-    @RequiresPermissions("general:warehouse:view")
+    @RequiresPermissions("config:warehouse:view")
     @GetMapping()
     public String warehouse() {
         return prefix + "/warehouse";
@@ -55,7 +55,7 @@ public class WareHouseController extends BaseController {
     /**
      * 查询仓库列表
      */
-    @RequiresPermissions("general:warehouse:list")
+    @RequiresPermissions("config:warehouse:list")
     @Log(title = "通用-仓库管理", operating = "查看仓库列表", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
@@ -64,10 +64,10 @@ public class WareHouseController extends BaseController {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
-        lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin),Warehouse::getCreated, createdBegin)
-                .lt(StringUtils.isNotEmpty(createdEnd),Warehouse::getCreated, createdEnd)
-                .eq(StringUtils.isNotEmpty(warehouse.getCode()),Warehouse::getCode, warehouse.getCode())
-                .eq(StringUtils.isNotEmpty(warehouse.getName()),Warehouse::getName,warehouse.getName())
+        lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), Warehouse::getCreated, createdBegin)
+                .lt(StringUtils.isNotEmpty(createdEnd), Warehouse::getCreated, createdEnd)
+                .eq(StringUtils.isNotEmpty(warehouse.getCode()), Warehouse::getCode, warehouse.getCode())
+                .eq(StringUtils.isNotEmpty(warehouse.getName()), Warehouse::getName,warehouse.getName())
                 .orderByDesc(Warehouse::getCreated)
                 .eq(Warehouse::getDeleted,0);
         /**
@@ -95,7 +95,7 @@ public class WareHouseController extends BaseController {
     /**
      * 新增保存仓库
      */
-    @RequiresPermissions("general:warehouse:add")
+    @RequiresPermissions("config:warehouse:add")
     @Log(title = "通用-仓库管理", operating = "新增仓库", action = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -119,7 +119,7 @@ public class WareHouseController extends BaseController {
     /**
      * 修改保存仓库
      */
-    @RequiresPermissions("general:warehouse:edit")
+    @RequiresPermissions("config:warehouse:edit")
     @Log(title = "通用-仓库管理", operating = "修改仓库", action = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -131,7 +131,7 @@ public class WareHouseController extends BaseController {
     /**
      * 删除仓库
      */
-    @RequiresPermissions("general:warehouse:remove")
+    @RequiresPermissions("config:warehouse:remove")
     @Log(title = "通用-仓库管理", operating = "删除仓库", action = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
-package com.huaheng.pc.general.warehouse.domain;
+package com.huaheng.pc.config.warehouse.domain;
  
 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 lombok.Data;
-import org.springframework.transaction.annotation.Transactional;
  
 import java.io.Serializable;
 import java.util.Date;
-package com.huaheng.pc.general.warehouse.mapper;
+package com.huaheng.pc.config.warehouse.mapper;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.general.warehouse.domain.Warehouse;
-import com.huaheng.pc.system.role.domain.Role;
+import com.huaheng.pc.config.warehouse.domain.Warehouse;
 import com.huaheng.pc.system.user.domain.SysUserWarehouse;
  
 import java.util.List;
-package com.huaheng.pc.general.warehouse.service;
+package com.huaheng.pc.config.warehouse.service;
  
-import com.huaheng.pc.general.warehouse.domain.Warehouse;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huaheng.pc.system.user.domain.SysUserWarehouse;
+import com.huaheng.pc.config.warehouse.domain.Warehouse;
  
 import java.util.List;
 import java.util.Map;
-package com.huaheng.pc.general.warehouse.service;
+package com.huaheng.pc.config.warehouse.service;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.huaheng.common.utils.security.ShiroUtils;
-import com.huaheng.pc.general.warehouseCopany.domain.WarehouseCompany;
-import com.huaheng.pc.general.warehouseCopany.service.WarehouseCompanyService;
-import com.huaheng.pc.system.role.domain.Role;
-import com.huaheng.pc.system.user.domain.SysUserWarehouse;
-import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huaheng.pc.general.warehouse.mapper.WarehouseMapper;
-import com.huaheng.pc.general.warehouse.domain.Warehouse;
+import com.huaheng.pc.config.warehouse.domain.Warehouse;
+import com.huaheng.pc.config.warehouse.mapper.WarehouseMapper;
+import com.huaheng.pc.config.warehouseCompany.domain.WarehouseCompany;
+import com.huaheng.pc.config.warehouseCompany.service.WarehouseCompanyService;
+import org.springframework.stereotype.Service;
  
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
  
 @Service("WarehouseService")
-public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse> implements WarehouseService{
+public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse> implements WarehouseService {
  
     @Resource
     private WarehouseMapper warehouseMapper;
@@ -58,7 +55,7 @@ public class WarehouseServiceImpl extends ServiceImpl&lt;WarehouseMapper, Warehouse
         List<Warehouse> warehouses = warehouseMapper.selectWarehouseAll();
         for (Warehouse warehouse : warehouses)
         {
-            for (Warehouse  userWarehouse: userWarhouses)
+            for (Warehouse userWarehouse: userWarhouses)
             {
                 if (warehouse.getCode().equals(userWarehouse.getCode()))
                 {
-package com.huaheng.pc.general.warehouseCopany.domain;
+package com.huaheng.pc.config.warehouseCompany.domain;
  
 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 java.io.Serializable;
 import lombok.Data;
  
+import java.io.Serializable;
+
 @Data
 @TableName(value = "warehouse_company")
 public class WarehouseCompany implements Serializable {
-package com.huaheng.pc.general.warehouseCopany.mapper;
+package com.huaheng.pc.config.warehouseCompany.mapper;
  
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.general.warehouseCopany.domain.WarehouseCompany;
+import com.huaheng.pc.config.warehouseCompany.domain.WarehouseCompany;
  
 public interface WarehouseCompanyMapper extends BaseMapper<WarehouseCompany> {
 }
 \ No newline at end of file
-package com.huaheng.pc.general.warehouseCopany.service;
+package com.huaheng.pc.config.warehouseCompany.service;
  
-import com.huaheng.pc.general.warehouseCopany.domain.WarehouseCompany;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huaheng.pc.config.warehouseCompany.domain.WarehouseCompany;
+
 public interface WarehouseCompanyService extends IService<WarehouseCompany>{
  
  
+package com.huaheng.pc.config.warehouseCompany.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.config.warehouseCompany.domain.WarehouseCompany;
+import com.huaheng.pc.config.warehouseCompany.mapper.WarehouseCompanyMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+public class WarehouseCompanyServiceImpl extends ServiceImpl<WarehouseCompanyMapper, WarehouseCompany> implements WarehouseCompanyService {
+
+}
@@ -26,15 +26,15 @@ import javax.annotation.Resource;
 import java.util.List;
  
 @Controller
-@RequestMapping("/config/warehouse")
+@RequestMapping("/config/warehouseConfig")
 public class WarehouseConfigController extends BaseController {
  
-    private String prefix = "config/warehouse";
+    private String prefix = "config/warehouseConfig";
  
     @Resource
     private WarehouseConfigService warehouseConfigService;
  
-    @RequiresPermissions("config:warehouse:view")
+    @RequiresPermissions("config:warehouseConfig:view")
     @GetMapping()
     public String receiptDetailHistory() {
         return prefix + "/warehouse";
@@ -44,7 +44,7 @@ public class WarehouseConfigController extends BaseController {
      * 查询仓库配置
      */
     @ApiOperation(value="查看仓库配置", notes="根据编码获取仓库配置", httpMethod = "POST")
-    @RequiresPermissions("config:warehouse:list")
+    @RequiresPermissions("config:warehouseConfig:list")
     @Log(title = "配置-仓库配置",operating = "仓库配置列表", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
@@ -79,7 +79,7 @@ public class WarehouseConfigController extends BaseController {
      * 新增保存仓库配置
      */
     @ApiOperation(value="新增仓库配置", notes="新增仓库配置", httpMethod = "POST")
-    @RequiresPermissions("config:warehouse:add")
+    @RequiresPermissions("config:warehouseConfig:add")
     @Log(title = "配置-仓库配置",operating = "新增仓库配置", action = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -108,7 +108,7 @@ public class WarehouseConfigController extends BaseController {
      * 修改保存仓库配置
      */
     @ApiOperation(value="修改仓库配置信息", notes="修改仓库配置信息", httpMethod = "POST")
-    @RequiresPermissions("config:warehouse:edit")
+    @RequiresPermissions("config:warehouseConfig:edit")
     @Log(title = "配置-仓库配置",operating = "修改仓库配置", action = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -8,8 +8,8 @@ import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.config.zoneCapacity.domain.ZoneCapacity;
 import com.huaheng.pc.config.zoneCapacity.mapper.ZoneCapacityMapper;
-import com.huaheng.pc.general.material.domain.Material;
-import com.huaheng.pc.general.material.service.MaterialService;
+import com.huaheng.pc.config.material.domain.Material;
+import com.huaheng.pc.config.material.service.MaterialService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
  
-package com.huaheng.pc.general.customer.service;
-
-import com.huaheng.pc.general.customer.domain.Customer;
-import com.baomidou.mybatisplus.extension.service.IService;
-public interface CustomerService extends IService<Customer>{
-
-
-}
@@ -13,7 +13,7 @@ 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.material.service.MaterialServiceImpl;
+import com.huaheng.pc.config.material.service.MaterialServiceImpl;
 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
 import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
@@ -13,7 +13,7 @@ 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.material.service.MaterialServiceImpl;
+import com.huaheng.pc.config.material.service.MaterialServiceImpl;
 import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
 import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -39,7 +39,7 @@ public class ShipmentContainerDetail implements Serializable {
      */
     @TableField(value = "inventoryId")
     @ApiModelProperty(value="库存Id")
-    private String inventoryId;
+    private Integer inventoryId;
  
     /**
      * 出库箱头内部号
@@ -499,11 +499,11 @@ public class ShipmentContainerDetail implements Serializable {
         this.locationCode = locationCode;
     }
  
-    public String getInventoryId() {
+    public Integer getInventoryId() {
         return inventoryId;
     }
  
-    public void setInventoryId(String inventoryId) {
+    public void setInventoryId(Integer inventoryId) {
         this.inventoryId = inventoryId;
     }
  
+package com.huaheng.pc.shipment.shipmentContainerHeader.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.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader;
+import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
+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.Arrays;
+import java.util.List;
+
+/**
+ * 出库组盘头 信息操作处理
+ *
+ * @author ricard
+ * @date 2019-08-21
+ */
+@Controller
+@RequestMapping("/shipment/shipmentContainerHeader")
+public class ShipmentContainerHeaderController extends BaseController
+{
+	@Autowired
+	private ShipmentContainerHeaderService shipmentContainerHeaderService;
+
+
+	private String prefix = "shipment/shipmentContainerHeader";
+
+	@RequiresPermissions("shipment:container:view")
+	@GetMapping()
+	public String shipmentContainerHeader()
+	{
+	    return prefix + "/shipmentContainerHeader";
+	}
+
+	/**
+	 * 查询出库组盘头列表
+	 */
+	@RequiresPermissions("shipment:container:list")
+	@Log(title ="出库-出库组盘", operating = "查看出库组头", action = BusinessType.GRANT)
+	@PostMapping("/list")
+	@ResponseBody
+	public TableDataInfo list(ShipmentContainerHeader shipmentContainerHeader,String createdBegin, String createdEnd)
+	{
+		LambdaQueryWrapper<ShipmentContainerHeader> lambdaQueryWrapper= Wrappers.lambdaQuery();
+
+		PageDomain pageDomain = TableSupport.buildPageRequest();
+		Integer pageNum = pageDomain.getPageNum();
+		Integer pageSize = pageDomain.getPageSize();
+
+		lambdaQueryWrapper.eq(ShipmentContainerHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())
+				.ge(StringUtils.isNotEmpty(createdBegin),ShipmentContainerHeader::getCreated, createdBegin)
+				.le(StringUtils.isNotEmpty(createdEnd), ShipmentContainerHeader::getCreated, createdEnd)
+				.eq(StringUtils.isNotEmpty(shipmentContainerHeader.getShipmentCode()), ShipmentContainerHeader::getShipmentCode, shipmentContainerHeader.getShipmentCode())
+				.eq(StringUtils.isNotEmpty(shipmentContainerHeader.getContainerCode()), ShipmentContainerHeader::getContainerCode, shipmentContainerHeader.getContainerCode())
+				.eq(StringUtils.isNotEmpty(shipmentContainerHeader.getLocationCode()), ShipmentContainerHeader::getLocationCode, shipmentContainerHeader.getLocationCode())
+				.eq(StringUtils.isNotEmpty(shipmentContainerHeader.getCreatedBy()), ShipmentContainerHeader::getCreatedBy, shipmentContainerHeader.getCreatedBy())
+				.le(shipmentContainerHeader.getStatus()==null,ShipmentContainerHeader::getStatus,20)
+				.eq(shipmentContainerHeader.getStatus()!=null,ShipmentContainerHeader::getStatus,shipmentContainerHeader.getStatus());
+		if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+			/**
+			 * 使用分页查询
+			 */
+			Page<ShipmentContainerHeader> page = new Page<>(pageNum, pageSize);
+			IPage<ShipmentContainerHeader> iPage = shipmentContainerHeaderService.page(page, lambdaQueryWrapper);
+			return getMpDataTable(iPage.getRecords(),iPage.getTotal());
+		} else {
+			List<ShipmentContainerHeader> list = shipmentContainerHeaderService.list(lambdaQueryWrapper);
+			return getDataTable(list);
+		}
+	}
+
+	/**
+	 * 新增出库组盘头
+	 */
+	@GetMapping("/add")
+	public String add()
+	{
+	    return prefix + "/add";
+	}
+
+	/**
+	 * 新增保存出库组盘头
+	 */
+	@Log(title ="出库-出库组盘", operating = "新增出库组头", action = BusinessType.INSERT)
+	@PostMapping("/add")
+	@ResponseBody
+	public AjaxResult addSave(ShipmentContainerHeader shipmentContainerHeader)
+	{
+        shipmentContainerHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        shipmentContainerHeader.setCreatedBy(ShiroUtils.getLoginName());
+	    return toAjax(shipmentContainerHeaderService.save(shipmentContainerHeader));
+	}
+
+	/**
+	 * 修改出库组盘头
+	 */
+	@GetMapping("/edit/{id}")
+	public String edit(@PathVariable("id") Integer id, ModelMap mmap)
+	{
+		ShipmentContainerHeader shipmentContainerHeader = shipmentContainerHeaderService.getById(id);
+		mmap.put("shipmentContainerHeader", shipmentContainerHeader);
+	    return prefix + "/edit";
+	}
+
+	/**
+	 * 修改保存出库组盘头
+	 */
+	@RequiresPermissions("shipment:container:edit")
+	@Log(title ="出库-出库组盘", operating = "修改出库组头", action = BusinessType.UPDATE)
+	@PostMapping("/edit")
+	@ResponseBody
+	public AjaxResult editSave(ShipmentContainerHeader shipmentContainerHeader)
+	{
+	    return toAjax(shipmentContainerHeaderService.saveOrUpdate(shipmentContainerHeader));
+	}
+
+
+	/**
+	 * 删除出库组盘
+	 */
+	@RequiresPermissions("shipment:container: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> IdList = Arrays.asList(Convert.toIntArray(ids));
+		return shipmentContainerHeaderService.cancelCombination(IdList);
+
+	}
+
+    /**
+     * 生成任务
+     */
+	@RequiresPermissions("shipment:container:add")
+    @Log(title ="出库-任务生成", operating = "批量生成任务", action = BusinessType.UPDATE)
+    @PostMapping( "/createTask")
+    @ResponseBody
+    public AjaxResult createTask(String ids)
+    {
+    	AjaxResult ajaxResult=new AjaxResult();
+        if (StringUtils.isEmpty(ids))
+            return AjaxResult.error("id不能为空");
+        List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
+        for (Integer id : idList) {
+            //获取表头
+            ShipmentContainerHeader shipmentContainerHeader = shipmentContainerHeaderService.getById(id);
+            if(shipmentContainerHeader == null){
+                return AjaxResult.error("出库货箱id：" + id + "未找到,操作中止");
+            }
+            if(shipmentContainerHeader.getStatus() > 9){
+                return AjaxResult.error("出库货箱编码(" + shipmentContainerHeader.getContainerCode() + ")已经生成任务，请不要重复生成，操作中止");
+            }
+        }
+		ajaxResult=shipmentContainerHeaderService.createTask(idList);
+		return ajaxResult;
+    }
+
+}
@@ -98,12 +98,6 @@ public class ShipmentContainerHeader implements Serializable {
     @ApiModelProperty(value="高")
     private BigDecimal height;
  
-    /**
-     * 价值
-     */
-    @TableField(value = "totalValue")
-    @ApiModelProperty(value="价值")
-    private BigDecimal totalValue;
  
     /**
      * 出库单内部号
@@ -154,19 +148,6 @@ public class ShipmentContainerHeader implements Serializable {
     @ApiModelProperty(value="波次号")
     private Integer waveId;
  
-    /**
-     * 货箱计数号
-     */
-    @TableField(value = "countIndex")
-    @ApiModelProperty(value="货箱计数号")
-    private Integer countIndex;
-
-    /**
-     * 货箱计数总数
-     */
-    @TableField(value = "countTotal")
-    @ApiModelProperty(value="货箱计数总数")
-    private Integer countTotal;
  
     /**
      * 任务已创建？
@@ -185,9 +166,9 @@ public class ShipmentContainerHeader implements Serializable {
     /**
      * 周转箱号
      */
-    @TableField(value = "transContCode")
+    @TableField(value = "transContainerCode")
     @ApiModelProperty(value="周转箱号")
-    private String transContCode;
+    private String transContainerCode;
  
     /**
      * 复核工作台
@@ -218,41 +199,6 @@ public class ShipmentContainerHeader implements Serializable {
     private Date oqcEndAt;
  
     /**
-     * 装载号
-     */
-    @TableField(value = "loadId")
-    @ApiModelProperty(value="装载号")
-    private Integer loadId;
-
-    /**
-     * 笼车内部号
-     */
-    @TableField(value = "cageId")
-    @ApiModelProperty(value="笼车内部号")
-    private Integer cageId;
-
-    /**
-     * 笼车号
-     */
-    @TableField(value = "cageCode")
-    @ApiModelProperty(value="笼车号")
-    private String cageCode;
-
-    /**
-     * 移入笼车时间
-     */
-    @TableField(value = "stagedAt")
-    @ApiModelProperty(value="移入笼车时间")
-    private Date stagedAt;
-
-    /**
-     * 移入笼车用户
-     */
-    @TableField(value = "stagedBy")
-    @ApiModelProperty(value="移入笼车用户")
-    private String stagedBy;
-
-    /**
      * 创建时间
      */
     @TableField(value = "created")
@@ -316,17 +262,6 @@ public class ShipmentContainerHeader implements Serializable {
     @ApiModelProperty(value="承运商")
     private String carrierCode;
  
-    @TableField(value = "scaledBy")
-    @ApiModelProperty(value="null")
-    private String scaledBy;
-
-    @TableField(value = "scaledAt")
-    @ApiModelProperty(value="null")
-    private Date scaledAt;
-
-    @TableField(value = "storeCode")
-    @ApiModelProperty(value="null")
-    private String storeCode;
  
     /**
      * 拍照图片id
@@ -381,8 +316,6 @@ public class ShipmentContainerHeader implements Serializable {
  
     public static final String COL_HEIGHT = "height";
  
-    public static final String COL_TOTALVALUE = "totalValue";
-
     public static final String COL_SHIPMENTID = "shipmentId";
  
     public static final String COL_COMPANYCODE = "companyCode";
@@ -397,15 +330,11 @@ public class ShipmentContainerHeader implements Serializable {
  
     public static final String COL_WAVEID = "waveId";
  
-    public static final String COL_COUNTINDEX = "countIndex";
-
-    public static final String COL_COUNTTOTAL = "countTotal";
-
     public static final String COL_TASKCREATED = "taskCreated";
  
     public static final String COL_SHIPMENTCODE = "shipmentCode";
  
-    public static final String COL_TRANSCONTCODE = "transContCode";
+    public static final String COL_TRANSCONTAINERCODE = "transContainerCode";
  
     public static final String COL_OQCBENCH = "oqcBench";
  
@@ -415,16 +344,6 @@ public class ShipmentContainerHeader implements Serializable {
  
     public static final String COL_OQCENDAT = "oqcEndAt";
  
-    public static final String COL_LOADID = "loadId";
-
-    public static final String COL_CAGEID = "cageId";
-
-    public static final String COL_CAGECODE = "cageCode";
-
-    public static final String COL_STAGEDAT = "stagedAt";
-
-    public static final String COL_STAGEDBY = "stagedBy";
-
     public static final String COL_CREATED = "created";
  
     public static final String COL_CREATEDBY = "createdBy";
@@ -443,12 +362,6 @@ public class ShipmentContainerHeader implements Serializable {
  
     public static final String COL_CARRIERCODE = "carrierCode";
  
-    public static final String COL_SCALEDBY = "scaledBy";
-
-    public static final String COL_SCALEDAT = "scaledAt";
-
-    public static final String COL_STORECODE = "storeCode";
-
     public static final String COL_PICURLS = "picUrls";
  
     public static final String COL_PIDIDS = "pidIds";
@@ -653,23 +566,6 @@ public class ShipmentContainerHeader implements Serializable {
         this.height = height;
     }
  
-    /**
-     * 获取价值
-     *
-     * @return totalValue - 价值
-     */
-    public BigDecimal getTotalValue() {
-        return totalValue;
-    }
-
-    /**
-     * 设置价值
-     *
-     * @param totalValue 价值
-     */
-    public void setTotalValue(BigDecimal totalValue) {
-        this.totalValue = totalValue;
-    }
  
     /**
      * 获取出库单内部号
@@ -788,42 +684,6 @@ public class ShipmentContainerHeader implements Serializable {
     }
  
     /**
-     * 获取货箱计数号
-     *
-     * @return countIndex - 货箱计数号
-     */
-    public Integer getCountIndex() {
-        return countIndex;
-    }
-
-    /**
-     * 设置货箱计数号
-     *
-     * @param countIndex 货箱计数号
-     */
-    public void setCountIndex(Integer countIndex) {
-        this.countIndex = countIndex;
-    }
-
-    /**
-     * 获取货箱计数总数
-     *
-     * @return countTotal - 货箱计数总数
-     */
-    public Integer getCountTotal() {
-        return countTotal;
-    }
-
-    /**
-     * 设置货箱计数总数
-     *
-     * @param countTotal 货箱计数总数
-     */
-    public void setCountTotal(Integer countTotal) {
-        this.countTotal = countTotal;
-    }
-
-    /**
      * 获取任务已创建？
      *
      * @return taskCreated - 任务已创建？
@@ -859,22 +719,12 @@ public class ShipmentContainerHeader implements Serializable {
         this.shipmentCode = shipmentCode;
     }
  
-    /**
-     * 获取周转箱号
-     *
-     * @return transContCode - 周转箱号
-     */
-    public String getTransContCode() {
-        return transContCode;
+    public String getTransContainerCode() {
+        return transContainerCode;
     }
  
-    /**
-     * 设置周转箱号
-     *
-     * @param transContCode 周转箱号
-     */
-    public void setTransContCode(String transContCode) {
-        this.transContCode = transContCode;
+    public void setTransContainerCode(String transContainerCode) {
+        this.transContainerCode = transContainerCode;
     }
  
     /**
@@ -949,95 +799,6 @@ public class ShipmentContainerHeader implements Serializable {
         this.oqcEndAt = oqcEndAt;
     }
  
-    /**
-     * 获取装载号
-     *
-     * @return loadId - 装载号
-     */
-    public Integer getLoadId() {
-        return loadId;
-    }
-
-    /**
-     * 设置装载号
-     *
-     * @param loadId 装载号
-     */
-    public void setLoadId(Integer loadId) {
-        this.loadId = loadId;
-    }
-
-    /**
-     * 获取笼车内部号
-     *
-     * @return cageId - 笼车内部号
-     */
-    public Integer getCageId() {
-        return cageId;
-    }
-
-    /**
-     * 设置笼车内部号
-     *
-     * @param cageId 笼车内部号
-     */
-    public void setCageId(Integer cageId) {
-        this.cageId = cageId;
-    }
-
-    /**
-     * 获取笼车号
-     *
-     * @return cageCode - 笼车号
-     */
-    public String getCageCode() {
-        return cageCode;
-    }
-
-    /**
-     * 设置笼车号
-     *
-     * @param cageCode 笼车号
-     */
-    public void setCageCode(String cageCode) {
-        this.cageCode = cageCode;
-    }
-
-    /**
-     * 获取移入笼车时间
-     *
-     * @return stagedAt - 移入笼车时间
-     */
-    public Date getStagedAt() {
-        return stagedAt;
-    }
-
-    /**
-     * 设置移入笼车时间
-     *
-     * @param stagedAt 移入笼车时间
-     */
-    public void setStagedAt(Date stagedAt) {
-        this.stagedAt = stagedAt;
-    }
-
-    /**
-     * 获取移入笼车用户
-     *
-     * @return stagedBy - 移入笼车用户
-     */
-    public String getStagedBy() {
-        return stagedBy;
-    }
-
-    /**
-     * 设置移入笼车用户
-     *
-     * @param stagedBy 移入笼车用户
-     */
-    public void setStagedBy(String stagedBy) {
-        this.stagedBy = stagedBy;
-    }
  
     /**
      * 获取创建时间
@@ -1201,47 +962,6 @@ public class ShipmentContainerHeader implements Serializable {
         this.carrierCode = carrierCode;
     }
  
-    /**
-     * @return scaledBy
-     */
-    public String getScaledBy() {
-        return scaledBy;
-    }
-
-    /**
-     * @param scaledBy
-     */
-    public void setScaledBy(String scaledBy) {
-        this.scaledBy = scaledBy;
-    }
-
-    /**
-     * @return scaledAt
-     */
-    public Date getScaledAt() {
-        return scaledAt;
-    }
-
-    /**
-     * @param scaledAt
-     */
-    public void setScaledAt(Date scaledAt) {
-        this.scaledAt = scaledAt;
-    }
-
-    /**
-     * @return storeCode
-     */
-    public String getStoreCode() {
-        return storeCode;
-    }
-
-    /**
-     * @param storeCode
-     */
-    public void setStoreCode(String storeCode) {
-        this.storeCode = storeCode;
-    }
  
     /**
      * 获取拍照图片id
@@ -23,7 +23,16 @@ public interface ShipmentContainerHeaderService extends IService&lt;ShipmentContain
  
     AjaxResult cancelCombinationDetailInner(List<ShipmentContainerDetail> shipmentContainerDetails) ;
  
+    AjaxResult cancelCombination(List<Integer> shipmentContainerIds) ;
+
+
     AjaxResult autoCombination(String shipmentCode);
  
+    AjaxResult checkForCancelCombination(List<Integer> shipmentContainerIds);
+
+    AjaxResult createTask(List<Integer> idList);
+
+
+
  
 }
@@ -5,10 +5,11 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
-import com.huaheng.pc.general.location.domain.Location;
-import com.huaheng.pc.general.location.service.LocationService;
-import com.huaheng.pc.general.material.domain.Material;
-import com.huaheng.pc.general.material.service.MaterialService;
+import com.huaheng.framework.web.domain.RetCode;
+import com.huaheng.pc.config.location.domain.Location;
+import com.huaheng.pc.config.location.service.LocationService;
+import com.huaheng.pc.config.material.domain.Material;
+import com.huaheng.pc.config.material.service.MaterialService;
 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
 import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail;
@@ -16,9 +17,12 @@ import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainer
 import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentCombinationModel;
 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
 import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
+import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
 import com.huaheng.pc.shipment.shippingCombination.domain.ShippingSearch;
 import com.huaheng.pc.shipment.shippingCombination.service.ShippingCombinationService;
+import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
+import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@@ -30,6 +34,7 @@ import java.util.Map;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader;
 import com.huaheng.pc.shipment.shipmentContainerHeader.mapper.ShipmentContainerHeaderMapper;
+import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
 import org.springframework.transaction.annotation.Transactional;
  
 @Service
@@ -51,6 +56,8 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
     private MaterialService materialService;
     @Autowired
     private ShippingCombinationService shippingCombinationService;
+    @Autowired
+    private TaskHeaderService taskHeaderService;
  
  
     @Override
@@ -293,6 +300,30 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
         return AjaxResult.success("");
     }
  
+    /**
+     * 取消组盘
+     * @param shipmentContainerIds
+     * @return
+     */
+    @Override
+    public AjaxResult cancelCombination(List<Integer> shipmentContainerIds)  {
+
+        AjaxResult result = checkForCancelCombination(shipmentContainerIds);
+        if(result.getCode()!= RetCode.SUCCESS.getValue()){
+            return result;
+        }
+        for(int id : shipmentContainerIds){
+            LambdaQueryWrapper<ShipmentContainerDetail> lambdaQueryWrapper=Wrappers.lambdaQuery();
+            lambdaQueryWrapper.eq(ShipmentContainerDetail::getShippingContainerId,id);
+            List<ShipmentContainerDetail> shipmentContainerDetails = shipmentContainerDetailService.list(lambdaQueryWrapper);
+            result = cancelCombinationDetailInner(shipmentContainerDetails);
+            if(result.hasErr()){
+                return result;
+            }
+        }
+
+        return AjaxResult.success("");
+    }
  
     /**
      *  出库自动组盘
@@ -361,4 +392,35 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
         return AjaxResult.success("");
     }
  
+    /**
+     * 检查是否可以进行取消配盘
+     * @param shipmentContainerIds
+     * @return
+     */
+    @Override
+    public AjaxResult checkForCancelCombination(List<Integer> shipmentContainerIds) {
+        for(int id : shipmentContainerIds){
+            ShipmentContainerHeader shipmentContainerHeader = this.getById(id);
+            if(shipmentContainerHeader.getStatus()>9){
+                return AjaxResult.error("存在已生成任务的记录，请先取消任务再取消组盘");
+            }
+        }
+        return AjaxResult.success("");
+    }
+
+    /* 生成任务 */
+    @Override
+    @Transactional
+    public AjaxResult createTask(List<Integer> idList) {
+        ShipmentTaskCreateModel shipmentTask = new ShipmentTaskCreateModel();
+        for (Integer id : idList)   {
+            shipmentTask.setShipmentContainerHeaderIds(id);
+//            AjaxResult ajaxResult = taskHeaderService.createTaskFromShipmentContainers(shipmentTask);
+//            if(ajaxResult.hasErr()){
+//                return ajaxResult;
+//            }
+        }
+        return AjaxResult.success("全部生成完毕");
+    }
+
 }
@@ -6,8 +6,8 @@ import com.huaheng.common.utils.DataUtils;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
-import com.huaheng.pc.general.material.domain.Material;
-import com.huaheng.pc.general.material.service.MaterialService;
+import com.huaheng.pc.config.material.domain.Material;
+import com.huaheng.pc.config.material.service.MaterialService;
 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +19,6 @@ import java.util.Map;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.shipment.shipmentDetail.mapper.ShipmentDetailMapper;
 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
-import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
 import org.springframework.transaction.annotation.Transactional;
  
 @Service
@@ -8,7 +8,7 @@ import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.controller.BaseController;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.page.TableDataInfo;
-import com.huaheng.pc.general.material.service.MaterialServiceImpl;
+import com.huaheng.pc.config.material.service.MaterialServiceImpl;
 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
 import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService;
@@ -2,6 +2,8 @@ package com.huaheng.pc.system.menu.controller;
  
 import java.util.List;
 import java.util.Map;
+
+import com.huaheng.common.utils.security.ShiroUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -182,4 +184,10 @@ public class MenuController extends BaseController
         mmap.put("menu", menuService.selectMenuById(id));
         return prefix + "/tree";
     }
+
+    @GetMapping("/getMenuByUserId")
+    @ResponseBody
+    public List<Menu> list(){
+        return menuService.selectPCMenusByUserId(ShiroUtils.getUserId());
+    }
 }
 \ No newline at end of file
@@ -314,6 +314,7 @@ public class IndexController extends BaseController
         // 根据用户id取出菜单
         List<Menu> menus = menuService.selectPCMenusByUserId(user.getId());
         mmap.put("menus", menus);
+        System.out.println(menus);
         mmap.put("user", user);
         mmap.put("copyrightYear", huahengConfig.getCopyrightYear());
         return "index";
 package com.huaheng.pc.system.user.controller;
  
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.common.utils.ServletUtils;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.domain.RetCode;
-import com.huaheng.pc.general.company.domain.Company;
-import com.huaheng.pc.general.company.service.CompanyService;
-import com.huaheng.pc.system.user.domain.User;
 import com.huaheng.pc.system.user.service.IUserService;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.UsernamePasswordToken;
-import org.apache.shiro.subject.Subject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import com.huaheng.common.utils.ServletUtils;
-import com.huaheng.common.utils.StringUtils;
-import com.huaheng.framework.web.controller.BaseController;
-import com.huaheng.framework.web.domain.AjaxResult;
  
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
  
 /**
  * 登录验证
@@ -2,49 +2,33 @@ package com.huaheng.pc.system.user.controller;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.huaheng.common.constant.Constants;
-import com.huaheng.common.utils.MessageUtils;
-import com.huaheng.common.utils.SystemLogUtils;
-import com.huaheng.common.utils.security.ShiroUtils;
-import com.huaheng.framework.shiro.web.filter.LogoutFilter;
-import com.huaheng.pc.general.company.domain.Company;
-import com.huaheng.pc.general.company.service.CompanyService;
-import com.huaheng.pc.general.warehouse.domain.Warehouse;
-import com.huaheng.pc.general.warehouse.mapper.WarehouseMapper;
-import com.huaheng.pc.general.warehouse.service.WarehouseService;
-import com.huaheng.pc.system.user.domain.SysUserWarehouse;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.session.SessionException;
-import org.apache.shiro.subject.Subject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.servlet.server.Session;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 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;
 import com.huaheng.framework.web.controller.BaseController;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.pc.config.company.domain.Company;
+import com.huaheng.pc.config.company.service.CompanyService;
+import com.huaheng.pc.config.warehouse.domain.Warehouse;
+import com.huaheng.pc.config.warehouse.mapper.WarehouseMapper;
+import com.huaheng.pc.config.warehouse.service.WarehouseService;
 import com.huaheng.pc.system.role.service.IRoleService;
 import com.huaheng.pc.system.user.domain.User;
 import com.huaheng.pc.system.user.service.IUserService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
  
 import javax.annotation.Resource;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import java.util.List;
 import java.util.Map;
  
-import static javax.security.auth.Subject.getSubject;
-
 /**
  * 用户信息
  * 
@@ -8,11 +8,11 @@ import java.util.stream.Collectors;
  
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huaheng.framework.web.domain.AjaxResult;
-import com.huaheng.pc.general.company.domain.Company;
-import com.huaheng.pc.general.company.mapper.CompanyMapper;
-import com.huaheng.pc.general.company.service.CompanyService;
-import com.huaheng.pc.general.warehouse.service.WarehouseService;
-import com.huaheng.pc.general.warehouse.domain.Warehouse;
+import com.huaheng.pc.config.company.domain.Company;
+import com.huaheng.pc.config.company.mapper.CompanyMapper;
+import com.huaheng.pc.config.company.service.CompanyService;
+import com.huaheng.pc.config.warehouse.domain.Warehouse;
+import com.huaheng.pc.config.warehouse.service.WarehouseService;
 import com.huaheng.pc.system.user.domain.*;
 import com.huaheng.pc.system.user.mapper.SysUserWarehouseMapper;
 import com.huaheng.pc.system.user.mapper.UserCompanyMapper;
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import lombok.Data;
  
@@ -64,6 +65,27 @@ public class TaskDetail implements Serializable {
     private String companyCode;
  
     /**
+     * 单据号
+     */
+    @TableField(value = "billCode")
+    @ApiModelProperty(value="货主")
+    private String billCode;
+
+    /**
+     * 主单Id
+     */
+    @TableField(value = "billId")
+    @ApiModelProperty(value="货主")
+    private Integer billId;
+
+    /**
+     * 子单ID
+     */
+    @TableField(value = "billDetailId")
+    @ApiModelProperty(value="货主")
+    private Integer billDetailId;
+
+    /**
      * 物料
      */
     @TableField(value = "materialCode")
@@ -96,7 +118,7 @@ public class TaskDetail implements Serializable {
      */
     @TableField(value = "qty")
     @ApiModelProperty(value="数量")
-    private Integer qty;
+    private BigDecimal qty;
  
     /**
      * 从货位
@@ -143,9 +165,9 @@ public class TaskDetail implements Serializable {
     /**
      * 状态
      */
-    @TableField(value = "enable")
+    @TableField(value = "status")
     @ApiModelProperty(value="状态")
-    private Integer enable;
+    private Integer status;
  
     /**
      * 参考单号
@@ -412,6 +434,13 @@ public class TaskDetail implements Serializable {
  
     public static final String COL_COMPANYCODE = "companyCode";
  
+    public static final String COL_BILLCODE= "billCode";
+
+    public static final String COL_BILLID= "billId";
+
+    public static final String COL_BILLDETAILID= "billDetailId";
+
+
     public static final String COL_MATERIALCODE = "materialCode";
  
     public static final String COL_MATERIALNAME = "materialName";
@@ -434,7 +463,7 @@ public class TaskDetail implements Serializable {
  
     public static final String COL_ATTRIBUTEID = "attributeId";
  
-    public static final String COL_ENABLE = "enable";
+    public static final String COL_STATUS= "status";
  
     public static final String COL_REFERENCECODE = "referenceCode";
  
+package com.huaheng.pc.task.taskHeader.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.utils.StringUtils;
+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.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.config.material.service.MaterialService;
+import com.huaheng.pc.config.warehouse.domain.Warehouse;
+import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
+import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
+import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@Controller
+@RequestMapping("/task/taskHeader")
+
+
+public class TaskHeaderController extends BaseController {
+
+    private String prefix = "task/taskHeader";
+
+    @RequiresPermissions("task:taskHeader:view")
+    @GetMapping()
+    public String container() {
+        return prefix + "/taskHeader";
+    }
+
+
+    @Resource
+    private TaskHeaderService taskHeaderService;
+
+
+
+    /**
+     * 查询任务列表
+     */
+    @RequiresPermissions("task:taskHeader:list")
+    @Log(title = "任务-上架任务", operating = "查看任务列表", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TaskHeader taskHeader) {
+        LambdaQueryWrapper<TaskHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        /**
+         * 使用分页查询
+         */
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            Page<TaskHeader> page = new Page<>(pageNum, pageSize);
+            IPage<TaskHeader> iPage = taskHeaderService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(iPage.getRecords(), iPage.getTotal());
+        } else {
+            List<TaskHeader> list = taskHeaderService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+
+
+}
+package com.huaheng.pc.task.taskHeader.domain;
+
+/**
+ * 出库任务创建模型类
+ */
+public class ShipmentTaskCreateModel {
+    /**
+     * 需要创建任务的出库货箱列表
+     */
+    private Integer shipmentContainerHeaderIds;
+    /**
+     * 是否优先创建整出任务，1，表示可以创建整出就优先创建整出，不能的话就创建拣选出；2，表示只创建拣选出；
+     */
+    private int taskType;
+
+    /**
+     * 优先级
+     */
+    private short priority;
+
+    private String companyId;
+    private String companyCode;
+
+    public short getPriority() {
+        return priority;
+    }
+
+    public void setPriority(short priority) {
+        this.priority = priority;
+    }
+
+    public Integer getShipmentContainerHeaderIds() {
+        return shipmentContainerHeaderIds;
+    }
+
+    public void setShipmentContainerHeaderIds(Integer shipmentContainerHeaderIds) {
+        this.shipmentContainerHeaderIds = shipmentContainerHeaderIds;
+    }
+
+    public int getTaskType() {
+        return taskType;
+    }
+
+    public void setTaskType(int taskType) {
+        this.taskType = taskType;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+}
@@ -47,7 +47,7 @@ public class TaskHeader implements Serializable {
      */
     @TableField(value = "taskType")
     @ApiModelProperty(value="任务类型")
-    private String taskType;
+    private Integer taskType;
  
     /**
      * 内部类型
@@ -87,9 +87,9 @@ public class TaskHeader implements Serializable {
     /**
      * 状态
      */
-    @TableField(value = "enable")
+    @TableField(value = "status")
     @ApiModelProperty(value="状态")
-    private Integer enable;
+    private Integer status;
  
     /**
      * 波次号
@@ -115,6 +115,13 @@ public class TaskHeader implements Serializable {
     /**
      * 容器号
      */
+    @TableField(value = "locationCode")
+    @ApiModelProperty(value="容器号")
+    private String locationCode;
+
+    /**
+     * 容器号
+     */
     @TableField(value = "containerCode")
     @ApiModelProperty(value="容器号")
     private String containerCode;
@@ -337,7 +344,7 @@ public class TaskHeader implements Serializable {
  
     public static final String COL_CONFIRMEDBY = "confirmedBy";
  
-    public static final String COL_ENABLE = "enable";
+    public static final String COL_STATUS = "status";
  
     public static final String COL_WAVEID = "waveId";
  
@@ -345,6 +352,8 @@ public class TaskHeader implements Serializable {
  
     public static final String COL_PICKINGCARTPOS = "pickingCartPos";
  
+    public static final String COL_LOCATIONCODE = "locationCode";
+
     public static final String COL_CONTAINERCODE = "containerCode";
  
     public static final String COL_STARTPICKDATETIME = "startPickDateTime";
 package com.huaheng.pc.task.taskHeader.service;
  
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.baomidou.mybatisplus.extension.service.IService;
 public interface TaskHeaderService extends IService<TaskHeader>{
  
  
+    AjaxResult createTaskFromShipmentContainers(ShipmentTaskCreateModel shipmentTaskCreateModel) ;
+
 }
 package com.huaheng.pc.task.taskHeader.service;
  
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.location.domain.Location;
+import com.huaheng.pc.config.location.service.LocationService;
+import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
+import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
+import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail;
+import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainerDetailService;
+import com.huaheng.pc.shipment.shipmentContainerHeader.domain.ShipmentContainerHeader;
+import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
+import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
+import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
+import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHeader> implements TaskHeaderService{
  
+    @Autowired
+    private ShipmentContainerHeaderService shipmentContainerHeaderService;
+    @Autowired
+    private ShipmentContainerDetailService shipmentContainerDetailService;
+    @Autowired
+    private LocationService locationService;
+    @Autowired
+    private InventoryDetailService inventoryDetailService;
+    @Autowired
+    private TaskDetailService taskDetailService;
+
+    /**
+     * 生成出库任务
+     * @param shipmentTaskCreateModel
+     * @return
+     */
+    @Override
+    @Transactional
+    public AjaxResult createTaskFromShipmentContainers(ShipmentTaskCreateModel shipmentTaskCreateModel)  {
+        Integer shipmentContainerHeaderId = shipmentTaskCreateModel.getShipmentContainerHeaderIds();
+        //获取表头
+        ShipmentContainerHeader shipmentContainerHeader = shipmentContainerHeaderService.getById(shipmentContainerHeaderId);
+        if(shipmentContainerHeader == null){
+            return AjaxResult.error("出库货箱" + shipmentContainerHeaderId + "未找到,操作中止");
+        }
+        if(shipmentContainerHeader.getStatus() > 9){
+            return AjaxResult.error("出库货箱" + shipmentContainerHeader.getContainerCode() + "已经生成任务，请不要重复生成，操作中止");
+        }
+        //获取所有子货箱
+        LambdaQueryWrapper<ShipmentContainerDetail> lambdaQueryWrapper= Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ShipmentContainerDetail::getShippingContainerId,shipmentContainerHeader.getId());
+        List<ShipmentContainerDetail> shipmentContainerDetails = shipmentContainerDetailService.list(lambdaQueryWrapper);
+        if(shipmentContainerDetails==null||shipmentContainerDetails.size()==0){
+            return AjaxResult.error("货箱" + shipmentContainerHeader.getContainerCode() + "没有子任务，操作中止");
+        }
+        //检测库位
+        LambdaQueryWrapper<Location> locationLambdaQueryWrapper=Wrappers.lambdaQuery();
+        locationLambdaQueryWrapper.eq(Location::getCode,shipmentContainerHeader.getLocationCode())
+                .eq(Location::getWarehouseCode,ShiroUtils.getWarehouseCode())
+                .eq(Location::getDeleted,false);
+        Location location = locationService.getOne(locationLambdaQueryWrapper);
+        if (location == null)   {
+            return AjaxResult.error("库位禁用或不存在！");
+        }
+        //创建任务头
+        TaskHeader task = new TaskHeader();
+        //分拣出库
+        task.setTaskType(400);
+        task.setLocationCode(shipmentContainerHeader.getLocationCode());
+        //判断是否整出任务，钱柜和AGV不能整出
+        if(shipmentContainerHeader.getStatus().intValue() == 300){
+            //表示整出优先
+            //判断当前子货箱所有数量是否等于该托盘对应的所有库存的数量，
+            //这里必须与库存的在库数量对比，后期可能存在一个配盘在执行任务，后一个配盘又在配这个的情况(这个时候不能整出)
+            // 如果相等，则说明这个货箱包含了所有的数量，则可以整出，否则，创建拣选任务；
+            //查询所有库存
+            InventoryDetail inventoryCondition = new InventoryDetail();
+            LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper=Wrappers.lambdaQuery();
+            inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getLocationCode,shipmentContainerHeader.getLocationCode())
+                    .eq(InventoryDetail::getWarehouseCode,ShiroUtils.getWarehouseCode());
+            List<InventoryDetail> inventories = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
+            BigDecimal inventoryTotal=new BigDecimal("0");
+            for(InventoryDetail item : inventories){
+                inventoryTotal = inventoryTotal.add(item.getQty());
+            }
+            BigDecimal containerTotal = new BigDecimal("0");
+            for(ShipmentContainerDetail item: shipmentContainerDetails){
+                containerTotal = containerTotal.add(item.getQty());
+            }
+            if(inventoryTotal.compareTo(containerTotal) == 0){
+                task.setTaskType(300);//整盘出库
+                task.setLocationCode("");
+            }
+        }
+        task.setWarehouseCode(shipmentContainerHeader.getWarehouseCode());
+        task.setCompanyCode(shipmentContainerHeader.getCompanyCode());
+        task.setInternalTaskType("");
+        task.setAssignedUser(ShiroUtils.getLoginName());
+        task.setConfirmedBy(ShiroUtils.getLoginName());
+        task.setStatus(1);
+        task.setContainerCode(shipmentContainerHeader.getContainerCode());
+        task.setCreatedBy(ShiroUtils.getLoginName());
+        task.setCreated(new Date());
+        task.setLastUpdatedBy(ShiroUtils.getLoginName());
+        task.setLastUpdated(null);
+        this.save(task);
+        //遍历子货箱创建子任务
+        for(ShipmentContainerDetail shipmentContainerDetail : shipmentContainerDetails){
+            TaskDetail taskDetail = new TaskDetail();
+            taskDetail.setTaskId(task.getId());
+            taskDetail.setWarehouseCode(task.getWarehouseCode());
+            taskDetail.setCompanyCode(task.getCompanyCode());
+            taskDetail.setTaskType("s");
+            taskDetail.setBillCode(shipmentContainerDetail.getShipmentCode());
+            taskDetail.setBillId(shipmentContainerDetail.getShipmentId());
+            taskDetail.setBillDetailId(shipmentContainerDetail.getShipmentDetailId());
+            taskDetail.setMaterialCode(shipmentContainerDetail.getMaterialCode());
+            taskDetail.setMaterialName(shipmentContainerDetail.getMaterialName());
+            taskDetail.setFromInventoryId(shipmentContainerDetail.getInventoryId());
+            taskDetail.setQty(shipmentContainerDetail.getQty());
+            taskDetail.setContainerCode(task.getContainerCode());
+            taskDetail.setFromLocation(task.getLocationCode());
+            taskDetail.setToLocation(task.getLocationCode());
+            taskDetail.setStatus(1);
+            taskDetail.setTaskType("s");
+            taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
+            taskDetail.setLastUpdated(null);
+            taskDetailService.save(taskDetail);
+        }
+        //更新货位状态
+        ShipmentContainerHeader record = new ShipmentContainerHeader();
+        record.setId(shipmentContainerHeaderId);
+        record.setStatus(10);
+        record.setStatus(task.getTaskType());//实际出库类型
+        shipmentContainerHeaderService.saveOrUpdate(record);
+        return AjaxResult.success(task.getId());
+
+    }
 }
+<?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.config.alarmLevel.mapper.AlarmLevelMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.config.alarmLevel.domain.AlarmLevel">
+    <!--@mbg.generated-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="level" jdbcType="INTEGER" property="level" />
+    <result column="timeThreshold" jdbcType="INTEGER" property="timeThreshold" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="lastUpdate" jdbcType="TIMESTAMP" property="lastUpdate" />
+    <result column="lastUpdateBy" jdbcType="VARCHAR" property="lastUpdateBy" />
+    <result column="enable" jdbcType="BIT" property="enable" />
+    <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, `type`, `level`, timeThreshold, created, createdBy, lastUpdate, lastUpdateBy, 
+    `enable`, userDef1
+  </sql>
+</mapper>
 \ No newline at end of file
 <?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">
+<mapper namespace="com.huaheng.pc.config.bom.mapper.BomDetailMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.config.bom.domain.BomDetail">
     <!--@mbg.generated-->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
 <?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.BomHeaderMapper">
-  <resultMap id="BaseResultMap" type="com.huaheng.pc.general.bom.domain.BomHeader">
+<mapper namespace="com.huaheng.pc.config.bom.mapper.BomHeaderMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.config.bom.domain.BomHeader">
     <!--@mbg.generated-->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
 <?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.carrier.mapper.CarrierMapper">
-  <resultMap id="BaseResultMap" type="com.huaheng.pc.general.carrier.domain.Carrier">
+<mapper namespace="com.huaheng.pc.config.carrier.mapper.CarrierMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.config.carrier.domain.Carrier">
     <!--@mbg.generated-->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="code" jdbcType="VARCHAR" property="code" />
 <?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.company.mapper.CompanyMapper">
-  <resultMap id="BaseResultMap" type="com.huaheng.pc.general.company.domain.Company">
+<mapper namespace="com.huaheng.pc.config.company.mapper.CompanyMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.config.company.domain.Company">
     <!--@mbg.generated-->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="code" jdbcType="VARCHAR" property="code" />
@@ -47,13 +47,13 @@
     processStamp
   </sql>
  
-  <select id="selectCompanyByUserId" resultType="com.huaheng.pc.general.company.domain.Company">
+  <select id="selectCompanyByUserId" resultType="com.huaheng.pc.config.company.domain.Company">
 		SELECT c.id, c.name, c.code
 		FROM sys_user_company suc
 		INNER JOIN company c ON  suc.companyId = c.id AND suc.userId = #{userId}
 		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="selectByWarehouseCode" resultType="com.huaheng.pc.config.company.domain.Company">
         select company.id from company INNER JOIN warehouse_company ON company.id = warehouse_company.companyId
         where company.warehouseCode = #{warehouseCode}
   </select>
 <?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.container.mapper.ContainerMapper">
-  <resultMap id="BaseResultMap" type="com.huaheng.pc.general.container.domain.Container">
+<mapper namespace="com.huaheng.pc.config.container.mapper.ContainerMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.config.container.domain.Container">
     <!--@mbg.generated-->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
 <?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.customer.mapper.CustomerMapper">
-  <resultMap id="BaseResultMap" type="com.huaheng.pc.general.customer.domain.Customer">
+<mapper namespace="com.huaheng.pc.config.customer.mapper.CustomerMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.config.customer.domain.Customer">
     <!--@mbg.generated-->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="code" jdbcType="VARCHAR" property="code" />
 <?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.location.mapper.LocationMapper">
-  <resultMap id="BaseResultMap" type="com.huaheng.pc.general.location.domain.Location">
+<mapper namespace="com.huaheng.pc.config.location.mapper.LocationMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.config.location.domain.Location">
     <!--@mbg.generated-->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="code" jdbcType="VARCHAR" property="code" />
 <?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.material.mapper.MaterialMapper">
-  <resultMap id="BaseResultMap" type="com.huaheng.pc.general.material.domain.Material">
+<mapper namespace="com.huaheng.pc.config.material.mapper.MaterialMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.config.material.domain.Material">
     <!--@mbg.generated-->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="code" jdbcType="VARCHAR" property="code" />