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

pengcheng
2 parents 5960f7a7 a6f995a4
Showing 22 changed files with 2258 additions and 751 deletions
.idea/compiler.xml
.idea/workspace.xml
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CycleCountDetailMapper.java
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailService.java
src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java
src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java
src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderService.java
src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/resources/mybatis/inventory/CycleCountDetailMapper.xml
src/main/resources/mybatis/inventory/CycleCountHeaderMapper.xml
src/main/resources/templates/inventory/cyclecountAdjustDetail/cyclecountAdjustDetail.html
src/main/resources/templates/inventory/cyclecountDetail/add.html
src/main/resources/templates/inventory/cyclecountDetail/cyclecountDetail.html
@@ -6,8 +6,8 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="huaheng" />
         <module name="wms2" />
+        <module name="huaheng" />
       </profile>
     </annotationProcessing>
   </component>
@@ -3,8 +3,10 @@
   <component name="ChangeListManager">
     <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
       <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/inventoryTransaction/controller/InventoryTransactionController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -40,43 +42,57 @@
         <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
         <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
       </path>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
+        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
+        <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
+        <item name="location: table" type="285a2a93:MysqlImplModel$Table" />
+      </path>
     </expand>
     <select />
   </component>
   <component name="FileEditorManager">
     <leaf>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="322">
-              <caret line="60" column="20" lean-forward="true" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="35" />
+            <state relative-caret-position="409">
+              <caret line="103" column="57" lean-forward="true" selection-start-line="103" selection-start-column="57" selection-end-line="103" selection-end-column="57" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html">
+        <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="-108">
-              <caret line="36" lean-forward="true" selection-start-line="36" selection-end-line="36" />
+            <state relative-caret-position="152">
+              <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
+        <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="425">
-              <caret line="87" column="26" lean-forward="true" selection-start-line="87" selection-start-column="26" selection-end-line="87" selection-end-column="26" />
+            <state relative-caret-position="-173">
+              <caret line="161" column="34" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java">
+        <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="454">
-              <caret line="83" selection-start-line="83" selection-end-line="83" />
+            <state relative-caret-position="-513">
+              <folding>
+                <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -86,18 +102,10 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="FxmlFile" />
-        <option value="Interface" />
-        <option value="HTML File" />
         <option value="Class" />
       </list>
     </option>
   </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>configuration</find>
-    </findStrings>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
     <option name="RECENT_BRANCH_BY_REPOSITORY">
@@ -105,37 +113,6 @@
         <entry key="$PROJECT_DIR$" value="master" />
       </map>
     </option>
-    <option name="RESET_MODE" value="HARD" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java" />
-        <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" />
-        <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/taskDetail/controller/TaskDetailController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" />
-        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" />
-      </list>
-    </option>
   </component>
   <component name="IgnoredFileRootStore">
     <option name="generatedRoots">
@@ -151,11 +128,21 @@
       </MavenImportingSettings>
     </option>
   </component>
+  <component name="MavenProjectNavigator">
+    <treeState>
+      <expand>
+        <path>
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+          <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+        </path>
+      </expand>
+      <select />
+    </treeState>
+  </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="240" />
-    <option name="y" value="125" />
-    <option name="width" value="1440" />
-    <option name="height" value="775" />
+    <option name="x" value="470" />
+    <option name="width" value="980" />
+    <option name="height" value="1030" />
   </component>
   <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
   <component name="ProjectLevelVcsManager">
@@ -166,7 +153,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -224,89 +210,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="inventory" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
-              <item name="pc" type="462c0819:PsiDirectoryNode" />
-              <item name="inventory" type="462c0819:PsiDirectoryNode" />
-              <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
-              <item name="pc" type="462c0819:PsiDirectoryNode" />
-              <item name="inventory" type="462c0819:PsiDirectoryNode" />
-              <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
-              <item name="pc" type="462c0819:PsiDirectoryNode" />
-              <item name="inventory" type="462c0819:PsiDirectoryNode" />
-              <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
-              <item name="pc" type="462c0819:PsiDirectoryNode" />
-              <item name="inventory" type="462c0819:PsiDirectoryNode" />
-              <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
-              <item name="pc" type="462c0819:PsiDirectoryNode" />
-              <item name="inventory" type="462c0819:PsiDirectoryNode" />
-              <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
-              <item name="domain" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="resources" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wms2" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
-              <item name="templates" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -315,7 +219,6 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="templates" type="462c0819:PsiDirectoryNode" />
-              <item name="inventory" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -324,8 +227,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="inventoryHeader" type="462c0819:PsiDirectoryNode" />
+              <item name="task" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -334,21 +236,20 @@
               <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="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
+              <item name="task" type="462c0819:PsiDirectoryNode" />
+              <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
       <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
     <property name="DatabaseDriversLRU" value="mysql" />
-    <property name="DefaultHtmlFileTemplate" value="HTML File" />
-    <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
     <property name="RequestMappingsPanelOrder0" value="0" />
     <property name="RequestMappingsPanelOrder1" value="1" />
     <property name="RequestMappingsPanelWidth0" value="75" />
@@ -356,43 +257,23 @@
     <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="1566462677598" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis/config" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566803879583" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
     <property name="node.js.path.for.package.tslint" value="project" />
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="project.structure.last.edited" value="Project" />
-    <property name="project.structure.proportion" value="0.0" />
-    <property name="project.structure.side.proportion" value="0.0" />
     <property name="settings.editor.selected.configurable" value="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="CopyClassDialog.RECENTS_KEY">
-      <recent name="com.huaheng.pc.task.taskDetail.controller" />
-    </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" />
-    </key>
   </component>
   <component name="RunDashboard">
-    <option name="configurationTypes">
-      <set>
-        <option value="SpringBootApplicationConfigurationType" />
-      </set>
-    </option>
     <option name="ruleStates">
       <list>
         <RuleState>
@@ -403,14 +284,12 @@
         </RuleState>
       </list>
     </option>
-    <option name="contentProportion" value="0.012987013" />
   </component>
   <component name="RunManager">
     <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-      <module name="wms2" />
+      <module name="huaheng" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
-      <option name="ALTERNATIVE_JRE_PATH" value="C:\Program Files\Java\jdk1.8.0_202\jre" />
+      <option name="ALTERNATIVE_JRE_PATH" />
       <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <method v="2">
@@ -429,12 +308,11 @@
   <component name="ServiceViewManager">
     <option name="allServicesViewState">
       <serviceView>
-        <option name="contentProportion" value="0.18875067" />
         <treeState>
           <expand>
             <path>
               <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
-              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@dbb4d4b" type="7427dc5b:ServiceModel$ServiceGroupNode" />
+              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" />
             </path>
           </expand>
           <select />
@@ -447,7 +325,7 @@
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="" />
+      <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" />
       <created>1565160110910</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
@@ -458,28 +336,7 @@
       <workItem from="1565259513116" duration="148000" />
       <workItem from="1565311988064" duration="7176000" />
       <workItem from="1565328536669" duration="797000" />
-      <workItem from="1565345715376" duration="452000" />
-      <workItem from="1565570424829" duration="11663000" />
-      <workItem from="1565587737758" duration="12961000" />
-      <workItem from="1565657307503" duration="115000" />
-      <workItem from="1565657439247" duration="2447000" />
-      <workItem from="1565662229227" duration="20296000" />
-      <workItem from="1565691345079" duration="6000" />
-      <workItem from="1565743087352" duration="10121000" />
-      <workItem from="1565760941070" duration="6738000" />
-      <workItem from="1565768341327" duration="2970000" />
-      <workItem from="1565771864886" duration="599000" />
-      <workItem from="1565772469694" duration="23000" />
-      <workItem from="1565772518459" duration="4348000" />
-      <workItem from="1565829438280" duration="3502000" />
-      <workItem from="1565832950552" duration="86000" />
-      <workItem from="1565833039573" duration="288000" />
-      <workItem from="1565833342181" duration="13946000" />
-      <workItem from="1565936336169" duration="3845000" />
-      <workItem from="1565941296716" duration="6217000" />
-      <workItem from="1566175534262" duration="11146000" />
-      <workItem from="1566433893313" duration="21834000" />
-      <workItem from="1566463230092" duration="4987000" />
+      <workItem from="1566803530593" duration="266000" />
     </task>
     <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
       <created>1565226427512</created>
@@ -502,144 +359,47 @@
       <option name="project" value="LOCAL" />
       <updated>1565259481656</updated>
     </task>
-    <task id="LOCAL-00004" summary="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml">
-      <created>1565342188814</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1565342188814</updated>
-    </task>
-    <task id="LOCAL-00005" summary="添加userWarehouse">
-      <created>1565571202923</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1565571202923</updated>
-    </task>
-    <task id="LOCAL-00006" summary="添加containerCapacity">
-      <created>1565578920011</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1565578920011</updated>
-    </task>
-    <task id="LOCAL-00007" summary="添加物料页面">
-      <created>1565593159103</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1565593159103</updated>
-    </task>
-    <task id="LOCAL-00008" summary="添加商品详情">
-      <created>1565598117104</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1565598117104</updated>
-    </task>
-    <task id="LOCAL-00009" summary="添加物料时判断单位是否存在，不存在则添加物料单位">
-      <created>1565659672152</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1565659672152</updated>
-    </task>
-    <task id="LOCAL-00010" summary="添加task实体类">
-      <created>1565665525508</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1565665525508</updated>
-    </task>
-    <task id="LOCAL-00011" summary="添加商品、商品详情页面">
-      <created>1565686619774</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1565686619774</updated>
-    </task>
-    <task id="LOCAL-00012" summary="添加承运商">
-      <created>1565745258070</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1565745258070</updated>
-    </task>
-    <task id="LOCAL-00013" summary="添加物料导入、导出模板，添加Excel导入导出配置文件">
-      <created>1565833218584</created>
-      <option name="number" value="00013" />
-      <option name="presentableId" value="LOCAL-00013" />
-      <option name="project" value="LOCAL" />
-      <updated>1565833218584</updated>
-    </task>
-    <task id="LOCAL-00014" summary="添加仓库配置">
-      <created>1566176469173</created>
-      <option name="number" value="00014" />
-      <option name="presentableId" value="LOCAL-00014" />
-      <option name="project" value="LOCAL" />
-      <updated>1566176469173</updated>
-    </task>
-    <task id="LOCAL-00015" summary="上架任务查询">
-      <created>1566439482539</created>
-      <option name="number" value="00015" />
-      <option name="presentableId" value="LOCAL-00015" />
-      <option name="project" value="LOCAL" />
-      <updated>1566439482539</updated>
-    </task>
-    <option name="localTasksCounter" value="16" />
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="38616000" />
-  </component>
-  <component name="TodoView">
-    <todo-panel id="selected-file">
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="all">
-      <are-packages-shown value="true" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
+    <option name="totallyTimeSpent" value="266000" />
   </component>
   <component name="ToolWindowManager">
     <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.2419571" />
-      <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 id="Image Layers" order="6" />
-      <window_info id="Capture Tool" order="7" />
+      <window_info id="Designer" />
+      <window_info id="Image Layers" />
+      <window_info id="Capture Tool" />
+      <window_info id="UI Designer" />
+      <window_info id="Favorites" side_tool="true" />
+      <window_info id="Web" side_tool="true" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info anchor="bottom" id="Spring" />
+      <window_info anchor="bottom" id="Terminal" />
+      <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Event Log" side_tool="true" />
+      <window_info anchor="bottom" id="Java Enterprise" />
+      <window_info anchor="bottom" id="Database Changes" />
+      <window_info anchor="bottom" id="Version Control" />
       <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
+      <window_info anchor="bottom" id="Find" order="1" />
       <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" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <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.04390935" />
-      <window_info anchor="bottom" id="Run Dashboard" order="9" sideWeight="0.91152817" visible="true" weight="0.055240795" />
-      <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" sideWeight="0.08847185" side_tool="true" weight="0.34560907" />
-      <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="bottom" id="Terminal" order="16" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="Maven" weight="0.3297587" />
+      <window_info anchor="right" id="Palette" />
+      <window_info anchor="right" id="Capture Analysis" />
+      <window_info anchor="right" id="Database" />
+      <window_info anchor="right" id="Palette&#9;" />
+      <window_info anchor="right" id="Theme Preview" />
+      <window_info anchor="right" id="Bean Validation" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Maven" order="4" />
-      <window_info anchor="right" id="Bean Validation" order="5" />
-      <window_info anchor="right" id="Database" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Capture Analysis" order="8" />
-      <window_info anchor="right" id="Theme Preview" order="9" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -657,14 +417,7 @@
               <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
                 <collection />
               </option>
-              <option name="COLUMN_ORDER">
-                <list>
-                  <option value="0" />
-                  <option value="1" />
-                  <option value="2" />
-                  <option value="3" />
-                </list>
-              </option>
+              <option name="COLUMN_ORDER" />
             </State>
           </value>
         </entry>
@@ -689,409 +442,39 @@
     <MESSAGE value="添加库位、库位类型增删改查接口" />
     <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
     <MESSAGE value="修改库区service" />
-    <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" />
-    <MESSAGE value="添加userWarehouse" />
-    <MESSAGE value="添加containerCapacity" />
-    <MESSAGE value="添加物料页面" />
-    <MESSAGE value="添加商品详情" />
-    <MESSAGE value="添加物料时判断单位是否存在，不存在则添加物料单位" />
-    <MESSAGE value="添加task实体类" />
-    <MESSAGE value="添加商品、商品详情页面" />
-    <MESSAGE value="添加承运商" />
-    <MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" />
-    <MESSAGE value="添加仓库配置" />
-    <MESSAGE value="代码错误，库存导包" />
-    <MESSAGE value="代码错误，导包" />
-    <MESSAGE value="上架任务查询" />
-    <option name="LAST_COMMIT_MESSAGE" value="上架任务查询" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/poi/ExcelUtil.java</url>
-          <line>302</line>
-          <properties />
-          <option name="timeStamp" value="12" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java</url>
-          <line>66</line>
-          <properties />
-          <option name="timeStamp" value="24" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/controllerAdvice/MyControllerAdvice.java</url>
-          <line>26</line>
-          <properties />
-          <option name="timeStamp" value="25" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-    <watches-manager>
-      <configuration name="SpringBootApplicationConfigurationType">
-        <watch expression="receiptTotal" />
-        <watch expression="this.h" custom="java.lang.reflect.Proxy" />
-        <watch expression="((MybatisMapperProxy)this.h).methodCache" custom="java.lang.reflect.Proxy,com.baomidou.mybatisplus.core.override.MybatisMapperProxy" />
-      </configuration>
-    </watches-manager>
+    <option name="LAST_COMMIT_MESSAGE" value="修改库区service" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.5.RELEASE/spring-web-5.1.5.RELEASE.jar!/org/springframework/web/method/support/InvocableHandlerMethod.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="107" selection-start-line="107" selection-end-line="107" />
-        </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">
-          <caret line="172" column="27" lean-forward="true" selection-start-line="172" selection-start-column="27" selection-end-line="172" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/report/ExcelReportMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="94" column="16" lean-forward="true" selection-start-line="94" selection-start-column="16" selection-end-line="94" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="106" column="22" selection-start-line="106" selection-start-column="22" selection-end-line="106" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-220">
-          <caret line="114" column="7" lean-forward="true" selection-start-line="114" selection-start-column="7" selection-end-line="114" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="580">
-          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="302" column="20" selection-start-line="302" selection-start-column="20" selection-end-line="302" selection-end-column="20" />
-        </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">
-          <caret line="9" column="40" selection-start-line="9" selection-start-column="40" selection-end-line="9" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.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>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java">
+      <provider selected="true" editor-type-id="text-editor" />
     </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" />
-    <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/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">
+    <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="226">
-          <caret line="92" column="12" selection-start-line="92" selection-start-column="12" selection-end-line="92" selection-end-column="12" />
+        <state relative-caret-position="409">
+          <caret line="103" column="57" lean-forward="true" selection-start-line="103" selection-start-column="57" selection-end-line="103" selection-end-column="57" />
         </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="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.5.RELEASE/spring-aop-5.1.5.RELEASE.jar!/org/springframework/aop/framework/CglibAopProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="145">
-          <caret line="472" selection-start-line="472" selection-end-line="472" />
-        </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="965">
-          <caret line="69" column="29" selection-start-line="69" selection-start-column="28" selection-end-line="69" selection-end-column="29" />
-        </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="-332">
-          <caret line="114" column="27" selection-start-line="114" selection-start-column="23" selection-end-line="114" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/bomDetail/bomDetail.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="266">
-          <caret line="32" column="52" lean-forward="true" selection-start-line="32" selection-start-column="11" selection-end-line="32" selection-end-column="52" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/bom/controller/BomDetailController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="304">
-          <caret line="58" column="80" lean-forward="true" selection-start-line="58" selection-start-column="30" selection-end-line="58" selection-end-column="80" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2332">
-          <caret line="108" column="30" lean-forward="true" selection-start-line="108" selection-start-column="30" selection-end-line="108" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/controller/DictDataController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1435">
-          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.dom.d.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="10712" column="13" selection-start-line="10712" selection-start-column="13" selection-end-line="10712" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/mapper/DictTypeMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="29" column="26" selection-start-line="29" selection-start-column="26" selection-end-line="29" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/DictTypeServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="199">
-          <caret line="52" column="41" selection-start-line="52" selection-start-column="41" selection-end-line="52" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/IDictTypeService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="28" column="26" selection-start-line="28" selection-start-column="26" selection-end-line="28" selection-end-column="26" />
-        </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="19">
-          <caret line="141" column="36" selection-start-line="141" selection-start-column="32" selection-end-line="141" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/DictTypeMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="931">
-          <caret line="49" column="43" selection-start-line="49" selection-start-column="43" selection-end-line="49" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1653">
-          <caret line="87" column="31" selection-start-line="87" selection-start-column="23" selection-end-line="87" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/controller/DictTypeController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="144" column="55" selection-start-line="144" selection-start-column="55" selection-end-line="144" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/type/type.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="218" column="15" selection-start-line="218" selection-start-column="12" selection-end-line="218" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.5.RELEASE/spring-core-5.1.5.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="67">
-          <caret line="102" selection-start-line="102" selection-end-line="102" />
+        <state relative-caret-position="152">
+          <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
         </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="248">
-          <caret line="43" column="123" lean-forward="true" selection-start-line="43" selection-start-column="123" selection-end-line="43" selection-end-column="123" />
+        <state relative-caret-position="-513">
           <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/taskDetail/controller/TaskDetailController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-185">
-          <caret line="43" column="48" lean-forward="true" selection-start-line="43" selection-start-column="48" selection-end-line="43" selection-end-column="48" />
-          <folding>
-            <element signature="imports" expanded="true" />
           </folding>
         </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="40">
-          <caret line="55" column="48" lean-forward="true" selection-start-line="55" selection-start-column="48" selection-end-line="55" selection-end-column="48" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </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="178">
-          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="60" column="20" lean-forward="true" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="454">
-          <caret line="83" selection-start-line="83" selection-end-line="83" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-108">
-          <caret line="36" lean-forward="true" selection-start-line="36" selection-end-line="36" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="213">
-          <caret line="119" column="12" selection-start-line="119" selection-start-column="12" selection-end-line="119" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
+    <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="425">
-          <caret line="87" column="26" lean-forward="true" selection-start-line="87" selection-start-column="26" selection-end-line="87" selection-end-column="26" />
+        <state relative-caret-position="-173">
+          <caret line="161" column="34" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" />
         </state>
       </provider>
     </entry>
+package com.huaheng.pc.inventory.cycleCountDetail.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;
+
+@ApiModel(value="com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail")
+@TableName(value = "cycle_count_detail")
+public class CycleCountDetail implements Serializable {
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="ID")
+    private Integer id;
+
+    /**
+     * 盘点内部号
+     */
+    @TableField(value = "countId")
+    @ApiModelProperty(value="盘点内部号")
+    private Integer countId;
+
+    /**
+     * 盘点次数
+     */
+    @TableField(value = "round")
+    @ApiModelProperty(value="盘点次数")
+    private Integer round;
+
+    /**
+     * 任务头表
+     */
+    @TableField(value = "taskHeaderId")
+    @ApiModelProperty(value="任务头表")
+    private Integer taskHeaderId;
+
+    /**
+     * 任务明细
+     */
+    @TableField(value = "taskDetailId")
+    @ApiModelProperty(value="任务明细")
+    private Integer taskDetailId;
+
+    /**
+     * 仓库
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库")
+    private String warehouseCode;
+
+    /**
+     * 库存标识
+     */
+    @TableField(value = "inventoryDetailId")
+    @ApiModelProperty(value="库存标识")
+    private Integer inventoryDetailId;
+
+    /**
+     * 货位
+     */
+    @TableField(value = "locationCode")
+    @ApiModelProperty(value="货位")
+    private String locationCode;
+
+    /**
+     * 容器
+     */
+    @TableField(value = "containerCode")
+    @ApiModelProperty(value="容器")
+    private String containerCode;
+
+    /**
+     * 物料
+     */
+    @TableField(value = "materialCode")
+    @ApiModelProperty(value="物料")
+    private String materialCode;
+
+    /**
+     * 物料名称
+     */
+    @TableField(value = "materialName")
+    @ApiModelProperty(value="物料名称")
+    private String materialName;
+
+    /**
+     * 物料规格
+     */
+    @TableField(value = "materialSpec")
+    @ApiModelProperty(value="物料规格")
+    private String materialSpec;
+
+    /**
+     * 物料单位
+     */
+    @TableField(value = "materialUnit")
+    @ApiModelProperty(value="物料单位")
+    private String materialUnit;
+
+    /**
+     * 货主
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value="货主")
+    private String companyCode;
+
+    /**
+     * 库存状态
+     */
+    @TableField(value = "inventorySts")
+    @ApiModelProperty(value="库存状态")
+    private String inventorySts;
+
+    /**
+     * 系统数量
+     */
+    @TableField(value = "systemQty")
+    @ApiModelProperty(value="系统数量")
+    private Long systemQty;
+
+    /**
+     * 实盘数量
+     */
+    @TableField(value = "countedQty")
+    @ApiModelProperty(value="实盘数量")
+    private Long countedQty;
+
+    /**
+     * 调整数量
+     */
+    @TableField(value = "adjustQty")
+    @ApiModelProperty(value="调整数量")
+    private Long adjustQty;
+
+    /**
+     * 失败原因
+     */
+    @TableField(value = "rejectionNote")
+    @ApiModelProperty(value="失败原因")
+    private String rejectionNote;
+
+    /**
+     * 盘点创建人
+     */
+    @TableField(value = "countedBy")
+    @ApiModelProperty(value="盘点创建人")
+    private String countedBy;
+
+    /**
+     * 盘点日期时间
+     */
+    @TableField(value = "countedAt")
+    @ApiModelProperty(value="盘点日期时间")
+    private Date countedAt;
+
+    /**
+     * 指派用户
+     */
+    @TableField(value = "assignedTo")
+    @ApiModelProperty(value="指派用户")
+    private String assignedTo;
+
+    /**
+     * 指派时间
+     */
+    @TableField(value = "assignedAt")
+    @ApiModelProperty(value="指派时间")
+    private Date assignedAt;
+
+    /**
+     * 完成用户
+     */
+    @TableField(value = "completedBy")
+    @ApiModelProperty(value="完成用户")
+    private String completedBy;
+
+    /**
+     * 完成时间
+     */
+    @TableField(value = "completedAt")
+    @ApiModelProperty(value="完成时间")
+    private Date completedAt;
+
+    /**
+     * 状态
+     */
+    @TableField(value = "enableStatus")
+    @ApiModelProperty(value="状态")
+    private Integer enableStatus;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value="创建用户")
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value="创建时间")
+    private Date lastUpdated;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value="更新用户")
+    private String lastUpdatedBy;
+
+    /**
+     * 数据版本
+     */
+    @TableField(value = "version")
+    @ApiModelProperty(value="数据版本")
+    private Integer version;
+
+    /**
+     * 自定义字段1
+     */
+    @TableField(value = "userDef1")
+    @ApiModelProperty(value="自定义字段1")
+    private String userDef1;
+
+    /**
+     * 自定义字段2
+     */
+    @TableField(value = "userDef2")
+    @ApiModelProperty(value="自定义字段2")
+    private String userDef2;
+
+    /**
+     * 自定义字段3
+     */
+    @TableField(value = "userDef3")
+    @ApiModelProperty(value="自定义字段3")
+    private String userDef3;
+
+    /**
+     * 处理标记
+     */
+    @TableField(value = "processStamp")
+    @ApiModelProperty(value="处理标记")
+    private String processStamp;
+
+    /**
+     * 批次
+     */
+    @TableField(value = "batch")
+    @ApiModelProperty(value="批次")
+    private String batch;
+
+    /**
+     * 批号
+     */
+    @TableField(value = "lot")
+    @ApiModelProperty(value="批号")
+    private String lot;
+
+    /**
+     * 项目号
+     */
+    @TableField(value = "projectNo")
+    @ApiModelProperty(value="项目号")
+    private String projectNo;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_COUNTID = "countId";
+
+    public static final String COL_ROUND = "round";
+
+    public static final String COL_TASKHEADERID = "taskHeaderId";
+
+    public static final String COL_TASKDETAILID = "taskDetailId";
+
+    public static final String COL_WAREHOUSECODE = "warehouseCode";
+
+    public static final String COL_INVENTORYDETAILID = "inventoryDetailId";
+
+    public static final String COL_LOCATIONCODE = "locationCode";
+
+    public static final String COL_CONTAINERCODE = "containerCode";
+
+    public static final String COL_MATERIALCODE = "materialCode";
+
+    public static final String COL_MATERIALNAME = "materialName";
+
+    public static final String COL_MATERIALSPEC = "materialSpec";
+
+    public static final String COL_MATERIALUNIT = "materialUnit";
+
+    public static final String COL_COMPANYCODE = "companyCode";
+
+    public static final String COL_INVENTORYSTS = "inventorySts";
+
+    public static final String COL_SYSTEMQTY = "systemQty";
+
+    public static final String COL_COUNTEDQTY = "countedQty";
+
+    public static final String COL_ADJUSTQTY = "adjustQty";
+
+    public static final String COL_REJECTIONNOTE = "rejectionNote";
+
+    public static final String COL_COUNTEDBY = "countedBy";
+
+    public static final String COL_COUNTEDAT = "countedAt";
+
+    public static final String COL_ASSIGNEDTO = "assignedTo";
+
+    public static final String COL_ASSIGNEDAT = "assignedAt";
+
+    public static final String COL_COMPLETEDBY = "completedBy";
+
+    public static final String COL_COMPLETEDAT = "completedAt";
+
+    public static final String COL_ENABLESTATUS = "enableStatus";
+
+    public static final String COL_CREATED = "created";
+
+    public static final String COL_CREATEDBY = "createdBy";
+
+    public static final String COL_LASTUPDATED = "lastUpdated";
+
+    public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
+
+    public static final String COL_VERSION = "version";
+
+    public static final String COL_USERDEF1 = "userDef1";
+
+    public static final String COL_USERDEF2 = "userDef2";
+
+    public static final String COL_USERDEF3 = "userDef3";
+
+    public static final String COL_PROCESSSTAMP = "processStamp";
+
+    public static final String COL_BATCH = "batch";
+
+    public static final String COL_LOT = "lot";
+
+    public static final String COL_PROJECTNO = "projectNo";
+
+    /**
+     * 获取ID
+     *
+     * @return id - ID
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 设置ID
+     *
+     * @param id ID
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取盘点内部号
+     *
+     * @return countId - 盘点内部号
+     */
+    public Integer getCountId() {
+        return countId;
+    }
+
+    /**
+     * 设置盘点内部号
+     *
+     * @param countId 盘点内部号
+     */
+    public void setCountId(Integer countId) {
+        this.countId = countId;
+    }
+
+    /**
+     * 获取盘点次数
+     *
+     * @return round - 盘点次数
+     */
+    public Integer getRound() {
+        return round;
+    }
+
+    /**
+     * 设置盘点次数
+     *
+     * @param round 盘点次数
+     */
+    public void setRound(Integer round) {
+        this.round = round;
+    }
+
+    /**
+     * 获取任务头表
+     *
+     * @return taskHeaderId - 任务头表
+     */
+    public Integer getTaskHeaderId() {
+        return taskHeaderId;
+    }
+
+    /**
+     * 设置任务头表
+     *
+     * @param taskHeaderId 任务头表
+     */
+    public void setTaskHeaderId(Integer taskHeaderId) {
+        this.taskHeaderId = taskHeaderId;
+    }
+
+    /**
+     * 获取任务明细
+     *
+     * @return taskDetailId - 任务明细
+     */
+    public Integer getTaskDetailId() {
+        return taskDetailId;
+    }
+
+    /**
+     * 设置任务明细
+     *
+     * @param taskDetailId 任务明细
+     */
+    public void setTaskDetailId(Integer taskDetailId) {
+        this.taskDetailId = taskDetailId;
+    }
+
+    /**
+     * 获取仓库
+     *
+     * @return warehouseCode - 仓库
+     */
+    public String getWarehouseCode() {
+        return warehouseCode;
+    }
+
+    /**
+     * 设置仓库
+     *
+     * @param warehouseCode 仓库
+     */
+    public void setWarehouseCode(String warehouseCode) {
+        this.warehouseCode = warehouseCode;
+    }
+
+    /**
+     * 获取库存标识
+     *
+     * @return inventoryDetailId - 库存标识
+     */
+    public Integer getInventoryDetailId() {
+        return inventoryDetailId;
+    }
+
+    /**
+     * 设置库存标识
+     *
+     * @param inventoryDetailId 库存标识
+     */
+    public void setInventoryDetailId(Integer inventoryDetailId) {
+        this.inventoryDetailId = inventoryDetailId;
+    }
+
+    /**
+     * 获取货位
+     *
+     * @return locationCode - 货位
+     */
+    public String getLocationCode() {
+        return locationCode;
+    }
+
+    /**
+     * 设置货位
+     *
+     * @param locationCode 货位
+     */
+    public void setLocationCode(String locationCode) {
+        this.locationCode = locationCode;
+    }
+
+    /**
+     * 获取容器
+     *
+     * @return containerCode - 容器
+     */
+    public String getContainerCode() {
+        return containerCode;
+    }
+
+    /**
+     * 设置容器
+     *
+     * @param containerCode 容器
+     */
+    public void setContainerCode(String containerCode) {
+        this.containerCode = containerCode;
+    }
+
+    /**
+     * 获取物料
+     *
+     * @return materialCode - 物料
+     */
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    /**
+     * 设置物料
+     *
+     * @param materialCode 物料
+     */
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    /**
+     * 获取物料名称
+     *
+     * @return materialName - 物料名称
+     */
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    /**
+     * 设置物料名称
+     *
+     * @param materialName 物料名称
+     */
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
+    /**
+     * 获取物料规格
+     *
+     * @return materialSpec - 物料规格
+     */
+    public String getMaterialSpec() {
+        return materialSpec;
+    }
+
+    /**
+     * 设置物料规格
+     *
+     * @param materialSpec 物料规格
+     */
+    public void setMaterialSpec(String materialSpec) {
+        this.materialSpec = materialSpec;
+    }
+
+    /**
+     * 获取物料单位
+     *
+     * @return materialUnit - 物料单位
+     */
+    public String getMaterialUnit() {
+        return materialUnit;
+    }
+
+    /**
+     * 设置物料单位
+     *
+     * @param materialUnit 物料单位
+     */
+    public void setMaterialUnit(String materialUnit) {
+        this.materialUnit = materialUnit;
+    }
+
+    /**
+     * 获取货主
+     *
+     * @return companyCode - 货主
+     */
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    /**
+     * 设置货主
+     *
+     * @param companyCode 货主
+     */
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    /**
+     * 获取库存状态
+     *
+     * @return inventorySts - 库存状态
+     */
+    public String getInventorySts() {
+        return inventorySts;
+    }
+
+    /**
+     * 设置库存状态
+     *
+     * @param inventorySts 库存状态
+     */
+    public void setInventorySts(String inventorySts) {
+        this.inventorySts = inventorySts;
+    }
+
+    /**
+     * 获取系统数量
+     *
+     * @return systemQty - 系统数量
+     */
+    public Long getSystemQty() {
+        return systemQty;
+    }
+
+    /**
+     * 设置系统数量
+     *
+     * @param systemQty 系统数量
+     */
+    public void setSystemQty(Long systemQty) {
+        this.systemQty = systemQty;
+    }
+
+    /**
+     * 获取实盘数量
+     *
+     * @return countedQty - 实盘数量
+     */
+    public Long getCountedQty() {
+        return countedQty;
+    }
+
+    /**
+     * 设置实盘数量
+     *
+     * @param countedQty 实盘数量
+     */
+    public void setCountedQty(Long countedQty) {
+        this.countedQty = countedQty;
+    }
+
+    /**
+     * 获取调整数量
+     *
+     * @return adjustQty - 调整数量
+     */
+    public Long getAdjustQty() {
+        return adjustQty;
+    }
+
+    /**
+     * 设置调整数量
+     *
+     * @param adjustQty 调整数量
+     */
+    public void setAdjustQty(Long adjustQty) {
+        this.adjustQty = adjustQty;
+    }
+
+    /**
+     * 获取失败原因
+     *
+     * @return rejectionNote - 失败原因
+     */
+    public String getRejectionNote() {
+        return rejectionNote;
+    }
+
+    /**
+     * 设置失败原因
+     *
+     * @param rejectionNote 失败原因
+     */
+    public void setRejectionNote(String rejectionNote) {
+        this.rejectionNote = rejectionNote;
+    }
+
+    /**
+     * 获取盘点创建人
+     *
+     * @return countedBy - 盘点创建人
+     */
+    public String getCountedBy() {
+        return countedBy;
+    }
+
+    /**
+     * 设置盘点创建人
+     *
+     * @param countedBy 盘点创建人
+     */
+    public void setCountedBy(String countedBy) {
+        this.countedBy = countedBy;
+    }
+
+    /**
+     * 获取盘点日期时间
+     *
+     * @return countedAt - 盘点日期时间
+     */
+    public Date getCountedAt() {
+        return countedAt;
+    }
+
+    /**
+     * 设置盘点日期时间
+     *
+     * @param countedAt 盘点日期时间
+     */
+    public void setCountedAt(Date countedAt) {
+        this.countedAt = countedAt;
+    }
+
+    /**
+     * 获取指派用户
+     *
+     * @return assignedTo - 指派用户
+     */
+    public String getAssignedTo() {
+        return assignedTo;
+    }
+
+    /**
+     * 设置指派用户
+     *
+     * @param assignedTo 指派用户
+     */
+    public void setAssignedTo(String assignedTo) {
+        this.assignedTo = assignedTo;
+    }
+
+    /**
+     * 获取指派时间
+     *
+     * @return assignedAt - 指派时间
+     */
+    public Date getAssignedAt() {
+        return assignedAt;
+    }
+
+    /**
+     * 设置指派时间
+     *
+     * @param assignedAt 指派时间
+     */
+    public void setAssignedAt(Date assignedAt) {
+        this.assignedAt = assignedAt;
+    }
+
+    /**
+     * 获取完成用户
+     *
+     * @return completedBy - 完成用户
+     */
+    public String getCompletedBy() {
+        return completedBy;
+    }
+
+    /**
+     * 设置完成用户
+     *
+     * @param completedBy 完成用户
+     */
+    public void setCompletedBy(String completedBy) {
+        this.completedBy = completedBy;
+    }
+
+    /**
+     * 获取完成时间
+     *
+     * @return completedAt - 完成时间
+     */
+    public Date getCompletedAt() {
+        return completedAt;
+    }
+
+    /**
+     * 设置完成时间
+     *
+     * @param completedAt 完成时间
+     */
+    public void setCompletedAt(Date completedAt) {
+        this.completedAt = completedAt;
+    }
+
+    /**
+     * 获取状态
+     *
+     * @return enableStatus - 状态
+     */
+    public Integer getEnableStatus() {
+        return enableStatus;
+    }
+
+    /**
+     * 设置状态
+     *
+     * @param enableStatus 状态
+     */
+    public void setEnableStatus(Integer enableStatus) {
+        this.enableStatus = enableStatus;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return created - 创建时间
+     */
+    public Date getCreated() {
+        return created;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param created 创建时间
+     */
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    /**
+     * 获取创建用户
+     *
+     * @return createdBy - 创建用户
+     */
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    /**
+     * 设置创建用户
+     *
+     * @param createdBy 创建用户
+     */
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return lastUpdated - 创建时间
+     */
+    public Date getLastUpdated() {
+        return lastUpdated;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param lastUpdated 创建时间
+     */
+    public void setLastUpdated(Date lastUpdated) {
+        this.lastUpdated = lastUpdated;
+    }
+
+    /**
+     * 获取更新用户
+     *
+     * @return lastUpdatedBy - 更新用户
+     */
+    public String getLastUpdatedBy() {
+        return lastUpdatedBy;
+    }
+
+    /**
+     * 设置更新用户
+     *
+     * @param lastUpdatedBy 更新用户
+     */
+    public void setLastUpdatedBy(String lastUpdatedBy) {
+        this.lastUpdatedBy = lastUpdatedBy;
+    }
+
+    /**
+     * 获取数据版本
+     *
+     * @return version - 数据版本
+     */
+    public Integer getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置数据版本
+     *
+     * @param version 数据版本
+     */
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取自定义字段1
+     *
+     * @return userDef1 - 自定义字段1
+     */
+    public String getUserDef1() {
+        return userDef1;
+    }
+
+    /**
+     * 设置自定义字段1
+     *
+     * @param userDef1 自定义字段1
+     */
+    public void setUserDef1(String userDef1) {
+        this.userDef1 = userDef1;
+    }
+
+    /**
+     * 获取自定义字段2
+     *
+     * @return userDef2 - 自定义字段2
+     */
+    public String getUserDef2() {
+        return userDef2;
+    }
+
+    /**
+     * 设置自定义字段2
+     *
+     * @param userDef2 自定义字段2
+     */
+    public void setUserDef2(String userDef2) {
+        this.userDef2 = userDef2;
+    }
+
+    /**
+     * 获取自定义字段3
+     *
+     * @return userDef3 - 自定义字段3
+     */
+    public String getUserDef3() {
+        return userDef3;
+    }
+
+    /**
+     * 设置自定义字段3
+     *
+     * @param userDef3 自定义字段3
+     */
+    public void setUserDef3(String userDef3) {
+        this.userDef3 = userDef3;
+    }
+
+    /**
+     * 获取处理标记
+     *
+     * @return processStamp - 处理标记
+     */
+    public String getProcessStamp() {
+        return processStamp;
+    }
+
+    /**
+     * 设置处理标记
+     *
+     * @param processStamp 处理标记
+     */
+    public void setProcessStamp(String processStamp) {
+        this.processStamp = processStamp;
+    }
+
+    /**
+     * 获取批次
+     *
+     * @return batch - 批次
+     */
+    public String getBatch() {
+        return batch;
+    }
+
+    /**
+     * 设置批次
+     *
+     * @param batch 批次
+     */
+    public void setBatch(String batch) {
+        this.batch = batch;
+    }
+
+    /**
+     * 获取批号
+     *
+     * @return lot - 批号
+     */
+    public String getLot() {
+        return lot;
+    }
+
+    /**
+     * 设置批号
+     *
+     * @param lot 批号
+     */
+    public void setLot(String lot) {
+        this.lot = lot;
+    }
+
+    /**
+     * 获取项目号
+     *
+     * @return projectNo - 项目号
+     */
+    public String getProjectNo() {
+        return projectNo;
+    }
+
+    /**
+     * 设置项目号
+     *
+     * @param projectNo 项目号
+     */
+    public void setProjectNo(String projectNo) {
+        this.projectNo = projectNo;
+    }
+}
 \ No newline at end of file
+package com.huaheng.pc.inventory.cycleCountDetail.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
+
+public interface CycleCountDetailMapper extends BaseMapper<CycleCountDetail> {
+}
 \ No newline at end of file
+package com.huaheng.pc.inventory.cycleCountDetail.service;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.inventory.cycleCountDetail.mapper.CycleCountDetailMapper;
+import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
+@Service
+public class CycleCountDetailService extends ServiceImpl<CycleCountDetailMapper, CycleCountDetail> {
+
+}
+package com.huaheng.pc.inventory.cycleCountHeader.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;
+
+@ApiModel(value="com.huaheng.pc.inventory.cycleCountHeader.domain.CycleCountHeader")
+@TableName(value = "cycle_count_header")
+public class CycleCountHeader implements Serializable {
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="ID")
+    private Integer id;
+
+    /**
+     * 原始盘点内部号
+     */
+    @TableField(value = "countOrderId")
+    @ApiModelProperty(value="原始盘点内部号")
+    private Integer countOrderId;
+
+    /**
+     * 盘点轮次
+     */
+    @TableField(value = "round")
+    @ApiModelProperty(value="盘点轮次")
+    private Integer round;
+
+    /**
+     * 盘点主表编号
+     */
+    @TableField(value = "masterCode")
+    @ApiModelProperty(value="盘点主表编号")
+    private String masterCode;
+
+    /**
+     * 仓库编码
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库编码")
+    private String warehouseCode;
+
+    /**
+     * 货主代码
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value="货主代码")
+    private String companyCode;
+
+    /**
+     * 盘点类型
+     */
+    @TableField(value = "countType")
+    @ApiModelProperty(value="盘点类型")
+    private Integer countType;
+
+    /**
+     * 盘点状态
+     */
+    @TableField(value = "statusCyc")
+    @ApiModelProperty(value="盘点状态")
+    private Integer statusCyc;
+
+    /**
+     * 是否盘点属性
+     */
+    @TableField(value = "countAttribute")
+    @ApiModelProperty(value="是否盘点属性")
+    private Integer countAttribute;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    @ApiModelProperty(value="备注")
+    private String remark;
+
+    /**
+     * 总货位数
+     */
+    @TableField(value = "totalLocs")
+    @ApiModelProperty(value="总货位数")
+    private Integer totalLocs;
+
+    /**
+     * 总物料数
+     */
+    @TableField(value = "totalItems")
+    @ApiModelProperty(value="总物料数")
+    private Integer totalItems;
+
+    /**
+     * 指定区域
+     */
+    @TableField(value = "zoneCode")
+    @ApiModelProperty(value="指定区域")
+    private String zoneCode;
+
+    /**
+     * 库位条件（模糊）
+     */
+    @TableField(value = "locationFilter")
+    @ApiModelProperty(value="库位条件（模糊）")
+    private String locationFilter;
+
+    /**
+     * 释放人
+     */
+    @TableField(value = "releasedBy")
+    @ApiModelProperty(value="释放人")
+    private String releasedBy;
+
+    /**
+     * 释放时间
+     */
+    @TableField(value = "releasedAt")
+    @ApiModelProperty(value="释放时间")
+    private Date releasedAt;
+
+    /**
+     * 关闭人
+     */
+    @TableField(value = "closedBy")
+    @ApiModelProperty(value="关闭人")
+    private String closedBy;
+
+    /**
+     * 关闭时间
+     */
+    @TableField(value = "closedAt")
+    @ApiModelProperty(value="关闭时间")
+    private Date closedAt;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value="创建用户")
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value="创建时间")
+    private Date lastUpdated;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value="更新用户")
+    private String lastUpdatedBy;
+
+    /**
+     * 数据版本
+     */
+    @TableField(value = "version")
+    @ApiModelProperty(value="数据版本")
+    private Integer version;
+
+    /**
+     * 自定义字段1
+     */
+    @TableField(value = "userDef1")
+    @ApiModelProperty(value="自定义字段1")
+    private String userDef1;
+
+    /**
+     * 自定义字段2
+     */
+    @TableField(value = "userDef2")
+    @ApiModelProperty(value="自定义字段2")
+    private String userDef2;
+
+    /**
+     * 自定义字段4
+     */
+    @TableField(value = "userDef3")
+    @ApiModelProperty(value="自定义字段4")
+    private String userDef3;
+
+    /**
+     * 审核人
+     */
+    @TableField(value = "verifyBy")
+    @ApiModelProperty(value="审核人")
+    private String verifyBy;
+
+    /**
+     * 源盘点单号
+     */
+    @TableField(value = "sourceCode")
+    @ApiModelProperty(value="源盘点单号")
+    private String sourceCode;
+
+    /**
+     * 上传时间
+     */
+    @TableField(value = "uploadTime")
+    @ApiModelProperty(value="上传时间")
+    private Date uploadTime;
+
+    /**
+     * 上传状态，0未上传
+     */
+    @TableField(value = "uploadStatus")
+    @ApiModelProperty(value="上传状态，0未上传")
+    private Boolean uploadStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_ID = "id";
+
+    public static final String COL_COUNTORDERID = "countOrderId";
+
+    public static final String COL_ROUND = "round";
+
+    public static final String COL_MASTERCODE = "masterCode";
+
+    public static final String COL_WAREHOUSECODE = "warehouseCode";
+
+    public static final String COL_COMPANYCODE = "companyCode";
+
+    public static final String COL_COUNTTYPE = "countType";
+
+    public static final String COL_STATUSCYC = "statusCyc";
+
+    public static final String COL_COUNTATTRIBUTE = "countAttribute";
+
+    public static final String COL_REMARK = "remark";
+
+    public static final String COL_TOTALLOCS = "totalLocs";
+
+    public static final String COL_TOTALITEMS = "totalItems";
+
+    public static final String COL_ZONECODE = "zoneCode";
+
+    public static final String COL_LOCATIONFILTER = "locationFilter";
+
+    public static final String COL_RELEASEDBY = "releasedBy";
+
+    public static final String COL_RELEASEDAT = "releasedAt";
+
+    public static final String COL_CLOSEDBY = "closedBy";
+
+    public static final String COL_CLOSEDAT = "closedAt";
+
+    public static final String COL_CREATED = "created";
+
+    public static final String COL_CREATEDBY = "createdBy";
+
+    public static final String COL_LASTUPDATED = "lastUpdated";
+
+    public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
+
+    public static final String COL_VERSION = "version";
+
+    public static final String COL_USERDEF1 = "userDef1";
+
+    public static final String COL_USERDEF2 = "userDef2";
+
+    public static final String COL_USERDEF3 = "userDef3";
+
+    public static final String COL_VERIFYBY = "verifyBy";
+
+    public static final String COL_SOURCECODE = "sourceCode";
+
+    public static final String COL_UPLOADTIME = "uploadTime";
+
+    public static final String COL_UPLOADSTATUS = "uploadStatus";
+
+    /**
+     * 获取ID
+     *
+     * @return id - ID
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 设置ID
+     *
+     * @param id ID
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取原始盘点内部号
+     *
+     * @return countOrderId - 原始盘点内部号
+     */
+    public Integer getCountOrderId() {
+        return countOrderId;
+    }
+
+    /**
+     * 设置原始盘点内部号
+     *
+     * @param countOrderId 原始盘点内部号
+     */
+    public void setCountOrderId(Integer countOrderId) {
+        this.countOrderId = countOrderId;
+    }
+
+    /**
+     * 获取盘点轮次
+     *
+     * @return round - 盘点轮次
+     */
+    public Integer getRound() {
+        return round;
+    }
+
+    /**
+     * 设置盘点轮次
+     *
+     * @param round 盘点轮次
+     */
+    public void setRound(Integer round) {
+        this.round = round;
+    }
+
+    /**
+     * 获取盘点主表编号
+     *
+     * @return masterCode - 盘点主表编号
+     */
+    public String getMasterCode() {
+        return masterCode;
+    }
+
+    /**
+     * 设置盘点主表编号
+     *
+     * @param masterCode 盘点主表编号
+     */
+    public void setMasterCode(String masterCode) {
+        this.masterCode = masterCode;
+    }
+
+    /**
+     * 获取仓库编码
+     *
+     * @return warehouseCode - 仓库编码
+     */
+    public String getWarehouseCode() {
+        return warehouseCode;
+    }
+
+    /**
+     * 设置仓库编码
+     *
+     * @param warehouseCode 仓库编码
+     */
+    public void setWarehouseCode(String warehouseCode) {
+        this.warehouseCode = warehouseCode;
+    }
+
+    /**
+     * 获取货主代码
+     *
+     * @return companyCode - 货主代码
+     */
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    /**
+     * 设置货主代码
+     *
+     * @param companyCode 货主代码
+     */
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    /**
+     * 获取盘点类型
+     *
+     * @return countType - 盘点类型
+     */
+    public Integer getCountType() {
+        return countType;
+    }
+
+    /**
+     * 设置盘点类型
+     *
+     * @param countType 盘点类型
+     */
+    public void setCountType(Integer countType) {
+        this.countType = countType;
+    }
+
+    /**
+     * 获取盘点状态
+     *
+     * @return statusCyc - 盘点状态
+     */
+    public Integer getStatusCyc() {
+        return statusCyc;
+    }
+
+    /**
+     * 设置盘点状态
+     *
+     * @param statusCyc 盘点状态
+     */
+    public void setStatusCyc(Integer statusCyc) {
+        this.statusCyc = statusCyc;
+    }
+
+    /**
+     * 获取是否盘点属性
+     *
+     * @return countAttribute - 是否盘点属性
+     */
+    public Integer getCountAttribute() {
+        return countAttribute;
+    }
+
+    /**
+     * 设置是否盘点属性
+     *
+     * @param countAttribute 是否盘点属性
+     */
+    public void setCountAttribute(Integer countAttribute) {
+        this.countAttribute = countAttribute;
+    }
+
+    /**
+     * 获取备注
+     *
+     * @return remark - 备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 设置备注
+     *
+     * @param remark 备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    /**
+     * 获取总货位数
+     *
+     * @return totalLocs - 总货位数
+     */
+    public Integer getTotalLocs() {
+        return totalLocs;
+    }
+
+    /**
+     * 设置总货位数
+     *
+     * @param totalLocs 总货位数
+     */
+    public void setTotalLocs(Integer totalLocs) {
+        this.totalLocs = totalLocs;
+    }
+
+    /**
+     * 获取总物料数
+     *
+     * @return totalItems - 总物料数
+     */
+    public Integer getTotalItems() {
+        return totalItems;
+    }
+
+    /**
+     * 设置总物料数
+     *
+     * @param totalItems 总物料数
+     */
+    public void setTotalItems(Integer totalItems) {
+        this.totalItems = totalItems;
+    }
+
+    /**
+     * 获取指定区域
+     *
+     * @return zoneCode - 指定区域
+     */
+    public String getZoneCode() {
+        return zoneCode;
+    }
+
+    /**
+     * 设置指定区域
+     *
+     * @param zoneCode 指定区域
+     */
+    public void setZoneCode(String zoneCode) {
+        this.zoneCode = zoneCode;
+    }
+
+    /**
+     * 获取库位条件（模糊）
+     *
+     * @return locationFilter - 库位条件（模糊）
+     */
+    public String getLocationFilter() {
+        return locationFilter;
+    }
+
+    /**
+     * 设置库位条件（模糊）
+     *
+     * @param locationFilter 库位条件（模糊）
+     */
+    public void setLocationFilter(String locationFilter) {
+        this.locationFilter = locationFilter;
+    }
+
+    /**
+     * 获取释放人
+     *
+     * @return releasedBy - 释放人
+     */
+    public String getReleasedBy() {
+        return releasedBy;
+    }
+
+    /**
+     * 设置释放人
+     *
+     * @param releasedBy 释放人
+     */
+    public void setReleasedBy(String releasedBy) {
+        this.releasedBy = releasedBy;
+    }
+
+    /**
+     * 获取释放时间
+     *
+     * @return releasedAt - 释放时间
+     */
+    public Date getReleasedAt() {
+        return releasedAt;
+    }
+
+    /**
+     * 设置释放时间
+     *
+     * @param releasedAt 释放时间
+     */
+    public void setReleasedAt(Date releasedAt) {
+        this.releasedAt = releasedAt;
+    }
+
+    /**
+     * 获取关闭人
+     *
+     * @return closedBy - 关闭人
+     */
+    public String getClosedBy() {
+        return closedBy;
+    }
+
+    /**
+     * 设置关闭人
+     *
+     * @param closedBy 关闭人
+     */
+    public void setClosedBy(String closedBy) {
+        this.closedBy = closedBy;
+    }
+
+    /**
+     * 获取关闭时间
+     *
+     * @return closedAt - 关闭时间
+     */
+    public Date getClosedAt() {
+        return closedAt;
+    }
+
+    /**
+     * 设置关闭时间
+     *
+     * @param closedAt 关闭时间
+     */
+    public void setClosedAt(Date closedAt) {
+        this.closedAt = closedAt;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return created - 创建时间
+     */
+    public Date getCreated() {
+        return created;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param created 创建时间
+     */
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    /**
+     * 获取创建用户
+     *
+     * @return createdBy - 创建用户
+     */
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    /**
+     * 设置创建用户
+     *
+     * @param createdBy 创建用户
+     */
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return lastUpdated - 创建时间
+     */
+    public Date getLastUpdated() {
+        return lastUpdated;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param lastUpdated 创建时间
+     */
+    public void setLastUpdated(Date lastUpdated) {
+        this.lastUpdated = lastUpdated;
+    }
+
+    /**
+     * 获取更新用户
+     *
+     * @return lastUpdatedBy - 更新用户
+     */
+    public String getLastUpdatedBy() {
+        return lastUpdatedBy;
+    }
+
+    /**
+     * 设置更新用户
+     *
+     * @param lastUpdatedBy 更新用户
+     */
+    public void setLastUpdatedBy(String lastUpdatedBy) {
+        this.lastUpdatedBy = lastUpdatedBy;
+    }
+
+    /**
+     * 获取数据版本
+     *
+     * @return version - 数据版本
+     */
+    public Integer getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置数据版本
+     *
+     * @param version 数据版本
+     */
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取自定义字段1
+     *
+     * @return userDef1 - 自定义字段1
+     */
+    public String getUserDef1() {
+        return userDef1;
+    }
+
+    /**
+     * 设置自定义字段1
+     *
+     * @param userDef1 自定义字段1
+     */
+    public void setUserDef1(String userDef1) {
+        this.userDef1 = userDef1;
+    }
+
+    /**
+     * 获取自定义字段2
+     *
+     * @return userDef2 - 自定义字段2
+     */
+    public String getUserDef2() {
+        return userDef2;
+    }
+
+    /**
+     * 设置自定义字段2
+     *
+     * @param userDef2 自定义字段2
+     */
+    public void setUserDef2(String userDef2) {
+        this.userDef2 = userDef2;
+    }
+
+    /**
+     * 获取自定义字段4
+     *
+     * @return userDef3 - 自定义字段4
+     */
+    public String getUserDef3() {
+        return userDef3;
+    }
+
+    /**
+     * 设置自定义字段4
+     *
+     * @param userDef3 自定义字段4
+     */
+    public void setUserDef3(String userDef3) {
+        this.userDef3 = userDef3;
+    }
+
+    /**
+     * 获取审核人
+     *
+     * @return verifyBy - 审核人
+     */
+    public String getVerifyBy() {
+        return verifyBy;
+    }
+
+    /**
+     * 设置审核人
+     *
+     * @param verifyBy 审核人
+     */
+    public void setVerifyBy(String verifyBy) {
+        this.verifyBy = verifyBy;
+    }
+
+    /**
+     * 获取源盘点单号
+     *
+     * @return sourceCode - 源盘点单号
+     */
+    public String getSourceCode() {
+        return sourceCode;
+    }
+
+    /**
+     * 设置源盘点单号
+     *
+     * @param sourceCode 源盘点单号
+     */
+    public void setSourceCode(String sourceCode) {
+        this.sourceCode = sourceCode;
+    }
+
+    /**
+     * 获取上传时间
+     *
+     * @return uploadTime - 上传时间
+     */
+    public Date getUploadTime() {
+        return uploadTime;
+    }
+
+    /**
+     * 设置上传时间
+     *
+     * @param uploadTime 上传时间
+     */
+    public void setUploadTime(Date uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+
+    /**
+     * 获取上传状态，0未上传
+     *
+     * @return uploadStatus - 上传状态，0未上传
+     */
+    public Boolean getUploadStatus() {
+        return uploadStatus;
+    }
+
+    /**
+     * 设置上传状态，0未上传
+     *
+     * @param uploadStatus 上传状态，0未上传
+     */
+    public void setUploadStatus(Boolean uploadStatus) {
+        this.uploadStatus = uploadStatus;
+    }
+}
 \ No newline at end of file
+package com.huaheng.pc.inventory.cycleCountHeader.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.inventory.cycleCountHeader.domain.CycleCountHeader;
+
+public interface CycleCountHeaderMapper extends BaseMapper<CycleCountHeader> {
+}
 \ No newline at end of file
+package com.huaheng.pc.inventory.cycleCountHeader.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.inventory.cycleCountHeader.domain.CycleCountHeader;
+import com.huaheng.pc.inventory.cycleCountHeader.mapper.CycleCountHeaderMapper;
+@Service
+public class CycleCountHeaderService extends ServiceImpl<CycleCountHeaderMapper, CycleCountHeader> {
+
+}
@@ -5,14 +5,17 @@ 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.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.receipt.receiptDetail.domain.ReceiptDetail;
 import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
+import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -23,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
  
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
  
 @Api(tags = "入库明细")
 @Controller
@@ -60,6 +64,7 @@ public class ReceiptDetailController extends BaseController {
         lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), ReceiptDetail::getCreated, createdBegin)
                 .le(StringUtils.isNotEmpty(createdEnd), ReceiptDetail::getCreated, createdEnd)
                 .eq(ReceiptDetail::getReceiptId, receiptDetail.getReceiptId());
+
         if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
             /*使用分页查询*/
             Page<ReceiptDetail> page = new Page<>(pageNum, pageSize);
@@ -70,4 +75,24 @@ public class ReceiptDetailController extends BaseController {
             return getDataTable(list);
         }
     }
+
+    /**
+     * 新增入库明细
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存入库单
+     */
+    @ApiOperation(value="新增入库单 ", notes="新增入库单 ", httpMethod = "POST")
+    @RequiresPermissions("config:receiptHeader:add")
+    @Log(title = "入库-入库单 ",operating = "新增入库单 ", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(ReceiptDetail receiptDetail) {
+       return receiptDetailService.saveReceiptDetaial(receiptDetail);
+    }
 }
 package com.huaheng.pc.receipt.receiptDetail.service;
  
+import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 public interface ReceiptDetailService extends IService<ReceiptDetail>{
  
+    AjaxResult saveReceiptDetaial(ReceiptDetail receiptDetail);
  
 }
 package com.huaheng.pc.receipt.receiptDetail.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.material.domain.Material;
+import com.huaheng.pc.config.material.service.MaterialService;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
@@ -10,4 +16,13 @@ import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
 @Service
 public class ReceiptDetailServiceImpl extends ServiceImpl<ReceiptDetailMapper, ReceiptDetail> implements ReceiptDetailService{
  
+    @Resource
+    private MaterialService materialService;
+
+    public AjaxResult saveReceiptDetaial(ReceiptDetail receiptDetail){
+        LambdaQueryWrapper<Material> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(Material::getCompanyCode, receiptDetail.getMaterialCode());
+        receiptDetail.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        return this.save(receiptDetail) ? AjaxResult.success("操作成功！") : AjaxResult.error("操作失败！");
+    }
 }
 package com.huaheng.pc.receipt.receiptHeader.service;
  
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huaheng.pc.receipt.receiptHeader.mapper.ReceiptHeaderMapper;
 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
+import com.huaheng.pc.receipt.receiptHeader.mapper.ReceiptHeaderMapper;
+import org.springframework.stereotype.Service;
 @Service
 public class ReceiptHeaderService extends ServiceImpl<ReceiptHeaderMapper, ReceiptHeader> {
  
@@ -4,11 +4,13 @@ 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;
@@ -50,6 +52,7 @@ public class TaskHeaderController extends BaseController {
  
  
  
+
     /**
      * 查询任务列表
      */
@@ -57,7 +60,8 @@ public class TaskHeaderController extends BaseController {
     @Log(title = "任务-上架任务", operating = "查看任务列表", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(TaskHeader taskHeader,@ApiParam(name="InternalTaskType",value="类型") String InternalTaskType) {
+    public TableDataInfo list(TaskHeader taskHeader,@ApiParam(name="InternalTaskType",value="类型") String InternalTaskType,
+                          @ApiParam(name="createdBegin",value="类型") String createdBegin,@ApiParam(name="createdEnd",value="类型") String createdEnd) {
         LambdaQueryWrapper<TaskHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(TaskHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())
                           .in(TaskHeader::getCompanyCode,ShiroUtils.getCompanyCodeList())
@@ -65,7 +69,10 @@ public class TaskHeaderController extends BaseController {
                           .eq(StringUtils.isNotEmpty(taskHeader.getInternalTaskType()),TaskHeader::getInternalTaskType,taskHeader.getInternalTaskType())
                           .eq(StringUtils.isNotNull(taskHeader.getId()),TaskHeader::getId,taskHeader.getId())
                           .eq(StringUtils.isNotEmpty(taskHeader.getContainerCode()),TaskHeader::getContainerCode,taskHeader.getContainerCode())
-                          .eq(StringUtils.isNotEmpty(taskHeader.getLocationCode()),TaskHeader::getLocationCode,taskHeader.getLocationCode());
+                          .eq(StringUtils.isNotEmpty(taskHeader.getLocationCode()),TaskHeader::getLocationCode,taskHeader.getLocationCode())
+                          .gt(StringUtils.isNotEmpty(createdBegin),TaskHeader::getCreated,createdBegin)
+                          .lt(StringUtils.isNotEmpty(createdEnd),TaskHeader::getCreated,createdEnd);
+
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
@@ -83,5 +90,21 @@ public class TaskHeaderController extends BaseController {
     }
  
  
+    /**
+     * 下发任务
+     */
+    @RequiresPermissions("task:task:execute")
+    @Log(title = "任务-任务管理", operating = "下发立库任务", action = BusinessType.UPDATE)
+    @PostMapping( "/execute")
+    @ResponseBody
+    public AjaxResult execute(String taskId)
+    {
+        if (StringUtils.isEmpty(taskId))
+            return AjaxResult.error("taskId不能为空");
+        AjaxResult ajaxResult = taskHeaderService.sendTaskToWcs(Convert.toIntArray(taskId));
+        return ajaxResult;
+    }
+
+
  
 }
@@ -9,4 +9,6 @@ public interface TaskHeaderService extends IService&lt;TaskHeader&gt;{
  
     AjaxResult createTaskFromShipmentContainers(ShipmentTaskCreateModel shipmentTaskCreateModel) ;
  
+    AjaxResult<TaskHeader> sendTaskToWcs(Integer[] taskIds);
+
 }
 package com.huaheng.pc.task.taskHeader.service;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.utils.DataUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.config.location.domain.Location;
@@ -13,13 +15,17 @@ import com.huaheng.pc.shipment.shipmentContainerDetail.service.ShipmentContainer
 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.mapper.TaskDetailMapper;
 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
 import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
+import com.sun.jmx.snmp.tasks.Task;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
@@ -39,6 +45,8 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     private InventoryDetailService inventoryDetailService;
     @Autowired
     private TaskDetailService taskDetailService;
+    @Autowired
+    private TaskHeaderService taskHeaderService;
  
     /**
      * 生成出库任务
@@ -149,4 +157,63 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         return AjaxResult.success(task.getId());
  
     }
+
+    @Override
+    public AjaxResult<TaskHeader> sendTaskToWcs(Integer[] taskIds) {
+        TaskHeader task=null;
+        for(Integer taskId:taskIds){
+            task = taskHeaderService.getById(taskId);
+            if(task.getStatus() > 9){
+                return AjaxResult.error("任务" + taskId + "已经下发，请不要重复下发，操作中止");
+            }
+            //修改任务头表
+            task.setStatus(10);
+            task.setStartPickDateTime(new Date());   //生成时间
+            task.setLastUpdated(new Date());
+            task.setLastUpdatedBy(ShiroUtils.getLoginName());
+            LambdaUpdateWrapper<TaskHeader> HeaderUpdateWrapper=Wrappers.lambdaUpdate();
+            HeaderUpdateWrapper.eq(TaskHeader::getId,taskId);
+            taskHeaderService.update(task,HeaderUpdateWrapper);
+            //修改任务明细状态
+            TaskDetail record = new TaskDetail();
+            record.setStatus(10);
+            record.setLastUpdated(new Date());
+            record.setLastUpdatedBy(ShiroUtils.getLoginName());
+            LambdaUpdateWrapper<TaskDetail> lambdaUpdateWrapper=Wrappers.lambdaUpdate();
+            lambdaUpdateWrapper.eq(TaskDetail::getTaskId,task.getId());
+            taskDetailService.update(record,lambdaUpdateWrapper);
+
+
+//            if (task.getInternalTaskType().equals("100"))
+//            {
+//                List<Map<String, Object>> maps = taskDetailService.selectListMapByEqual("billId, billDetailId", condition);
+//                for (Map<String, Object> item : maps){
+//                    Integer billDetailId = DataUtils.getInteger(item.get("billDetailId"));
+//                    receiptHeaderService.updateDetailStatus(billDetailId, (short)300);
+//                }
+//                maps.stream().map(X -> X.get("billId")).distinct().forEach(X -> receiptHeaderService.receiptStatusUpdate(DataUtils.getInteger(X), (short)300));
+//            }
+//            //盘点单执行
+//            if(task.getType() == 700){
+//                CyclecountDetail cyclecountDetai = cyclecountDetailService.selectEntityById(
+//                        task.getAllocationHeadId());
+//                cyclecountDetai.setStatus(10);
+//                cyclecountDetailService.updateByModel(cyclecountDetai);
+//            }
+////            //如果是单排人工库，那么出入库都是先完成，在下发AGV任务
+////            if (task.getType().intValue() == 300 || task.getType().intValue() == 600)   {
+////                if (task.getSourceLocation().startsWith("L03") == false )   {
+////                    taskAgvService.createTaskAgv(task);
+////                }
+////            }
+////            else    {
+////                taskAgvService.createTaskAgv(task);
+////            }
+//            //任务类型是出库，那就完成任务在叫agv
+//            if (task.getType().intValue() == 100 || task.getType().intValue() == 500)   {
+//                taskAgvService.createTaskAgv(task);
+//            }
+        }
+        return AjaxResult.success("下发任务成功",task);
+    }
 }
+<?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.inventory.cycleCountDetail.mapper.CycleCountDetailMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail">
+    <!--@mbg.generated-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="countId" jdbcType="INTEGER" property="countId" />
+    <result column="round" jdbcType="INTEGER" property="round" />
+    <result column="taskHeaderId" jdbcType="INTEGER" property="taskHeaderId" />
+    <result column="taskDetailId" jdbcType="INTEGER" property="taskDetailId" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="inventoryDetailId" jdbcType="INTEGER" property="inventoryDetailId" />
+    <result column="locationCode" jdbcType="VARCHAR" property="locationCode" />
+    <result column="containerCode" jdbcType="VARCHAR" property="containerCode" />
+    <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
+    <result column="materialName" jdbcType="VARCHAR" property="materialName" />
+    <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
+    <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
+    <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
+    <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" />
+    <result column="systemQty" jdbcType="DECIMAL" property="systemQty" />
+    <result column="countedQty" jdbcType="DECIMAL" property="countedQty" />
+    <result column="adjustQty" jdbcType="DECIMAL" property="adjustQty" />
+    <result column="rejectionNote" jdbcType="VARCHAR" property="rejectionNote" />
+    <result column="countedBy" jdbcType="VARCHAR" property="countedBy" />
+    <result column="countedAt" jdbcType="TIMESTAMP" property="countedAt" />
+    <result column="assignedTo" jdbcType="VARCHAR" property="assignedTo" />
+    <result column="assignedAt" jdbcType="TIMESTAMP" property="assignedAt" />
+    <result column="completedBy" jdbcType="VARCHAR" property="completedBy" />
+    <result column="completedAt" jdbcType="TIMESTAMP" property="completedAt" />
+    <result column="enableStatus" jdbcType="INTEGER" property="enableStatus" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
+    <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
+    <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
+    <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
+    <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
+    <result column="batch" jdbcType="VARCHAR" property="batch" />
+    <result column="lot" jdbcType="VARCHAR" property="lot" />
+    <result column="projectNo" jdbcType="VARCHAR" property="projectNo" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, countId, round, taskHeaderId, taskDetailId, warehouseCode, inventoryDetailId, 
+    locationCode, containerCode, materialCode, materialName, materialSpec, materialUnit, 
+    companyCode, inventorySts, systemQty, countedQty, adjustQty, rejectionNote, countedBy, 
+    countedAt, assignedTo, assignedAt, completedBy, completedAt, enableStatus, created, 
+    createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, processStamp, 
+    batch, lot, projectNo
+  </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.inventory.cycleCountHeader.mapper.CycleCountHeaderMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.inventory.cycleCountHeader.domain.CycleCountHeader">
+    <!--@mbg.generated-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="countOrderId" jdbcType="INTEGER" property="countOrderId" />
+    <result column="round" jdbcType="INTEGER" property="round" />
+    <result column="masterCode" jdbcType="VARCHAR" property="masterCode" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
+    <result column="countType" jdbcType="INTEGER" property="countType" />
+    <result column="statusCyc" jdbcType="INTEGER" property="statusCyc" />
+    <result column="countAttribute" jdbcType="INTEGER" property="countAttribute" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="totalLocs" jdbcType="INTEGER" property="totalLocs" />
+    <result column="totalItems" jdbcType="INTEGER" property="totalItems" />
+    <result column="zoneCode" jdbcType="VARCHAR" property="zoneCode" />
+    <result column="locationFilter" jdbcType="VARCHAR" property="locationFilter" />
+    <result column="releasedBy" jdbcType="VARCHAR" property="releasedBy" />
+    <result column="releasedAt" jdbcType="TIMESTAMP" property="releasedAt" />
+    <result column="closedBy" jdbcType="VARCHAR" property="closedBy" />
+    <result column="closedAt" jdbcType="TIMESTAMP" property="closedAt" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
+    <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
+    <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
+    <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
+    <result column="verifyBy" jdbcType="VARCHAR" property="verifyBy" />
+    <result column="sourceCode" jdbcType="VARCHAR" property="sourceCode" />
+    <result column="uploadTime" jdbcType="TIMESTAMP" property="uploadTime" />
+    <result column="uploadStatus" jdbcType="BIT" property="uploadStatus" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, countOrderId, round, masterCode, warehouseCode, companyCode, countType, statusCyc, 
+    countAttribute, remark, totalLocs, totalItems, zoneCode, locationFilter, releasedBy, 
+    releasedAt, closedBy, closedAt, created, createdBy, lastUpdated, lastUpdatedBy, version, 
+    userDef1, userDef2, userDef3, verifyBy, sourceCode, uploadTime, uploadStatus
+  </sql>
+</mapper>
 \ No newline at end of file
@@ -57,11 +57,11 @@
                 <i class="fa fa-vcard"></i>差异调整
             </a>
            <!--<a class="btn btn-outline btn-danger btn-rounded" onclick="createCyclecountWithGapQty()"
-               shiro:hasPermission="inventoryHeader:cyclecountDetail:cyclecountRepeat">
+               shiro:hasPermission="inventoryHeader:cycleCountDetail:cyclecountRepeat">
                 <i class="fa fa-vcard"></i> 差异复盘
             </a>-->
             <!--<a class="btn btn-outline btn-danger btn-rounded" onclick="adjust()"
-               shiro:hasPermission="inventoryHeader:cyclecountDetail:adjust">
+               shiro:hasPermission="inventoryHeader:cycleCountDetail:adjust">
                 <i class="fa fa-vcard"></i> 差异库存调整
             </a>-->
             <a class="btn btn-outline btn-success btn-rounded" onclick="update()">
@@ -75,7 +75,7 @@
 <div th:include="include::footer"></div>
  
 <script th:inline="javascript">
-    var addFlag = [[${@permission.hasPermi('inventoryHeader:cyclecountDetail:add')}]];
+    var addFlag = [[${@permission.hasPermi('inventoryHeader:cycleCountDetail:add')}]];
     // var removeFlag = [[${@permission.hasPermi('inventoryHeader:inventoryHeader:remove')}]];
     var prefix = ctx + "inventory/inventory";
     var prefix_cycleDetails = ctx + "inventory/cyclecountDetail";
@@ -57,11 +57,11 @@
                 <i class="fa fa-plus"></i> 新增
             </a>
             <!--<a class="btn btn-outline btn-danger btn-rounded" onclick="comfirmAllWithNoGapQty()"
-               shiro:hasPermission="inventoryHeader:cyclecountDetail:confirmAll">
+               shiro:hasPermission="inventoryHeader:cycleCountDetail:confirmAll">
                 <i class="fa fa-vcard"></i> 全部无差异确认
             </a>
             <a class="btn btn-outline btn-danger btn-rounded" onclick="comfirmRemainWithNoGapQty()"
-               shiro:hasPermission="inventoryHeader:cyclecountDetail:confirmRemain">
+               shiro:hasPermission="inventoryHeader:cycleCountDetail:confirmRemain">
                 <i class="fa fa-vcard"></i> 剩余无差异确认
             </a>-->
             <a class="btn btn-outline btn-danger btn-rounded" onclick="createCyclecountWithGapQty()"
@@ -85,10 +85,10 @@
 </div>
 <div th:include="include :: footer"></div>
 <script th:inline="javascript">
-    var editFlag = [[${@permission.hasPermi('inventoryHeader:cyclecountDetail:edit')}]];
-    var removeFlag = [[${@permission.hasPermi('inventoryHeader:cyclecountDetail:remove')}]];
-    var confirmFlag=[[${@permission.hasPermi('inventoryHeader:cyclecountDetail:confirm')}]];
-    var createTaskFalg=[[${@permission.hasPermi('inventoryHeader:cyclecountDetail:createTask')}]];
+    var editFlag = [[${@permission.hasPermi('inventoryHeader:cycleCountDetail:edit')}]];
+    var removeFlag = [[${@permission.hasPermi('inventoryHeader:cycleCountDetail:remove')}]];
+    var confirmFlag=[[${@permission.hasPermi('inventoryHeader:cycleCountDetail:confirm')}]];
+    var createTaskFalg=[[${@permission.hasPermi('inventoryHeader:cycleCountDetail:createTask')}]];
     var prefix = ctx + "inventory/cyclecountDetail";
     var prefix_head = ctx + "inventory/cyclecountHeader";
     var remove_url= prefix + "/remove";
@@ -36,12 +36,12 @@
 									</li>
 									<li class="time" style="height: 30px">
 										<label>创建时间： </label>
-										<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+										<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
 										<span>-</span>
-										<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+										<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
 									</li>
 									<li>
-										任务类型：<input type="hidden" name="internalTaskType"  th:value="${InternalTaskType}"/>
+										<input type="hidden" name="internalTaskType"  th:value="${InternalTaskType}"/>
 									</li>
  
 									<!--<li>-->
@@ -228,20 +228,15 @@
 		            align: 'center',
 		            formatter: function(value, row, index) {
 		            	var actions = [];
-		            	 // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-info btn-xs " href="#" onclick="detail(\'' + row.id + '\')"><i class="fa fa-list-ul"></i>明细</a> ');
-                        if (row.lastStatus < 10)  {
-                            if(row.zoneCode != "AGV"){
-                                actions.push('<a class="btn btn-success btn-xs ' + executeFlag + '" href="#" onclick="execute(\'' + row.id + '\')"><i class="fa fa-send" style="padding-right: 1px;"></i>执行</a> ');
-                            }
+                        if (row.status < 10)  {
+                            actions.push('<a class="btn btn-success btn-xs ' + executeFlag + '" href="#" onclick="execute(\'' + row.id + '\')"><i class="fa fa-send" style="padding-right: 1px;"></i>执行</a> ');
                             actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
-                            if(row.zoneCode != "AGV"){
                             actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
-                            }
-                        }
-                        if(row.lastStatus < 10 && row.zoneCode == "AGV"){
-                            actions.push('<a style="background-color: #f59e00;border: #f59e00"  class="btn btn-primary btn-xs ' + agvFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>AGV完成</a>');
                         }
+						if (row.status > 10)  {
+							actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
+						}
                         return actions.join('');
 		            }
 		        }
@@ -287,11 +282,6 @@
                     title : '单据编码',
                 },
                 {
-                    field : 'allocationId',
-                    title : '容器物料表ID' ,
-                    sortable: true
-                },
-                {
                     field : 'materialCode',
                     title : '存货编码',
                     sortable: true
@@ -311,12 +301,12 @@
                     sortable:true
                 },
                 {
-                    field : 'sourceLocation',
+                    field : 'fromLocation',
                     title : '源库位',
                     sortable:true
                 },
                 {
-                    field : 'destinationLocation',
+                    field : 'toLocation',
                     title : '目的库位',
                     sortable:true
                 },
@@ -333,8 +323,8 @@
                     }
                 },
                 {
-                    field : 'endTime',
-                    title : '子任务完成时间' ,
+                    field : 'created',
+                    title : '创建时间' ,
                     visible:false,
                     sortable:true
                 },
@@ -1157,8 +1157,8 @@ public class CreateCode {
         packages.put("customer","com.huaheng.pc.general.customer.Customer");
         packages.put("cyclecount_adjust","com.huaheng.pc.inventoryHeader.cyclecountAdjust.CyclecountAdjust");
         packages.put("cyclecount_adjustdetail","com.huaheng.pc.inventoryHeader.cyclecountAdjustDetail.CyclecountAdjustDetail");
-        packages.put("cyclecount_detail","com.huaheng.pc.inventoryHeader.cyclecountDetail.CyclecountDetail");
-        packages.put("cyclecount_header","com.huaheng.pc.inventoryHeader.cyclecountHeader.CyclecountHeader");
+        packages.put("cyclecount_detail","com.huaheng.pc.inventoryHeader.cycleCountDetail.CycleCountDetail");
+        packages.put("cyclecount_header","com.huaheng.pc.inventoryHeader.cycleCountHeader.CycleCountHeader");
         packages.put("inventory","com.huaheng.pc.inventoryHeader.inventoryHeader.Inventory");
         packages.put("inventory_transaction","com.huaheng.pc.inventoryHeader.inventoryTransaction.InventoryTransaction");
         packages.put("location","com.huaheng.pc.config.location.Location");