diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 0bcc71b..5f0c02f 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,8 +6,8 @@
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
- <module name="wms2" />
<module name="huaheng" />
+ <module name="wms2" />
</profile>
</annotationProcessing>
</component>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5429242..3b28b25 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,23 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
- <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" afterDir="false" />
+ <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="盘点">
+ <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/add.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/addGoods.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/addGoods.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/cyclecountDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountDetail/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/edit.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/add.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/edit.html" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/report.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/report.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" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -65,22 +53,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <leaf>
- <file pinned="false" current-in-tab="false">
- <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="639">
- <caret line="85" selection-start-line="85" selection-end-line="85" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- <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 relative-caret-position="1710">
+ <caret line="117" column="46" selection-start-line="117" selection-start-column="46" selection-end-line="117" selection-end-column="46" />
</state>
</provider>
</entry>
@@ -88,21 +65,35 @@
<file pinned="false" current-in-tab="false">
<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="152">
- <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
+ <state relative-caret-position="209">
+ <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html">
- <file pinned="false" current-in-tab="true">
<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="72">
- <caret line="91" column="52" lean-forward="true" selection-start-line="91" selection-start-column="52" selection-end-line="91" selection-end-column="52" />
- <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 relative-caret-position="-1467">
+ <caret line="313" column="68" lean-forward="true" selection-start-line="313" selection-start-column="68" selection-end-line="313" selection-end-column="68" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <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="114">
+ <caret line="11" column="30" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="257">
+ <caret line="54" column="54" lean-forward="true" selection-start-line="54" selection-start-column="54" selection-end-line="54" selection-end-column="54" />
</state>
</provider>
</entry>
@@ -110,10 +101,8 @@
<file pinned="false" current-in-tab="false">
<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="-513">
- <folding>
- <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
- </folding>
+ <state relative-caret-position="8379">
+ <caret line="441" column="68" selection-start-line="441" selection-start-column="68" selection-end-line="441" selection-end-column="68" />
</state>
</provider>
</entry>
@@ -159,8 +148,6 @@
<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/inventoryDetail/inventoryDetail.html" />
<option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" />
@@ -173,6 +160,13 @@
<option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java" />
<option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/controller/DictDataController.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/add.html" />
+ <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/resources/mybatis/task/TaskHeaderMapper.xml" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
</list>
</option>
</component>
@@ -276,109 +270,7 @@
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="huaheng" type="462c0819:PsiDirectoryNode" />
<item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- </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="cycleCountDetail" 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="cycleCountDetail" 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="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
- <item name="domain" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="com" type="462c0819:PsiDirectoryNode" />
- <item name="huaheng" type="462c0819:PsiDirectoryNode" />
- <item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
- <item name="mapper" 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="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
- <item name="service" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="java" type="462c0819:PsiDirectoryNode" />
- <item name="com" type="462c0819:PsiDirectoryNode" />
- <item name="huaheng" type="462c0819:PsiDirectoryNode" />
- <item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="cycleCountHeader" 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="cycleCountHeader" 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="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
- <item name="domain" type="462c0819:PsiDirectoryNode" />
+ <item name="task" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -389,8 +281,8 @@
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="huaheng" type="462c0819:PsiDirectoryNode" />
<item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
+ <item name="task" type="462c0819:PsiDirectoryNode" />
+ <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms2" type="b2602c69:ProjectViewProjectNode" />
@@ -401,8 +293,8 @@
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="huaheng" type="462c0819:PsiDirectoryNode" />
<item name="pc" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
+ <item name="task" type="462c0819:PsiDirectoryNode" />
+ <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
@@ -410,19 +302,6 @@
<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="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>
@@ -440,17 +319,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" />
- <item name="wms2" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="resources" type="462c0819:PsiDirectoryNode" />
- <item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
<item name="task" type="462c0819:PsiDirectoryNode" />
</path>
<path>
@@ -462,28 +330,6 @@
<item name="templates" type="462c0819:PsiDirectoryNode" />
<item name="task" type="462c0819:PsiDirectoryNode" />
<item name="taskHeader" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
- </path>
- <path>
- <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
- <item name="wms2" type="462c0819:PsiDirectoryNode" />
- <item name="src" type="462c0819:PsiDirectoryNode" />
- <item name="main" type="462c0819:PsiDirectoryNode" />
- <item name="resources" type="462c0819:PsiDirectoryNode" />
- <item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="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="resources" type="462c0819:PsiDirectoryNode" />
- <item name="templates" type="462c0819:PsiDirectoryNode" />
- <item name="inventory" type="462c0819:PsiDirectoryNode" />
- <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
@@ -503,8 +349,8 @@
<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="1566803879583" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" />
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566992925117" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/../wms-glgd" />
<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" />
@@ -583,6 +429,7 @@
<workItem from="1565311988064" duration="7176000" />
<workItem from="1565328536669" duration="797000" />
<workItem from="1566803530593" duration="266000" />
+ <workItem from="1566951795036" duration="23038000" />
</task>
<task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
<created>1565226427512</created>
@@ -605,31 +452,47 @@
<option name="project" value="LOCAL" />
<updated>1565259481656</updated>
</task>
- <option name="localTasksCounter" value="4" />
+ <task id="LOCAL-00004" summary="盘点">
+ <created>1566866817508</created>
+ <option name="number" value="00004" />
+ <option name="presentableId" value="LOCAL-00004" />
+ <option name="project" value="LOCAL" />
+ <updated>1566866817508</updated>
+ </task>
+ <task id="LOCAL-00005" summary="修改字典管理获取不到父节点Id bug">
+ <created>1566872309940</created>
+ <option name="number" value="00005" />
+ <option name="presentableId" value="LOCAL-00005" />
+ <option name="project" value="LOCAL" />
+ <updated>1566872309940</updated>
+ </task>
+ <task id="LOCAL-00006" summary="任务完成-入库任务">
+ <created>1566898785579</created>
+ <option name="number" value="00006" />
+ <option name="presentableId" value="LOCAL-00006" />
+ <option name="project" value="LOCAL" />
+ <updated>1566898785579</updated>
+ </task>
+ <option name="localTasksCounter" value="7" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="266000" />
+ <option name="totallyTimeSpent" value="45377000" />
+ </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>
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
+ <editor active="true" />
<layout>
- <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 content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.1883378" />
+ <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.25670242" />
<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" />
@@ -639,32 +502,31 @@
<window_info id="Capture Tool" order="7" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
- <window_info anchor="bottom" id="Run" order="2" />
- <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+ <window_info anchor="bottom" id="Run" order="2" weight="0.42351276" />
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.39943343" />
<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="TODO" order="6" weight="0.3286119" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" weight="0.49433428" />
<window_info active="true" anchor="bottom" id="Run Dashboard" order="9" sideWeight="0.91152817" visible="true" weight="0.54532576" />
<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="Database Changes" order="11" weight="0.32719547" />
<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.16005665" />
+ <window_info anchor="bottom" id="Messages" order="14" weight="0.15864022" />
<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	" />
- <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="Maven" order="3" weight="0.3297587" />
+ <window_info anchor="right" id="Palette" order="4" />
+ <window_info anchor="right" id="Capture Analysis" order="5" />
+ <window_info anchor="right" id="Database" order="6" />
+ <window_info anchor="right" id="Palette	" order="7" />
+ <window_info anchor="right" id="Theme Preview" order="8" />
+ <window_info anchor="right" id="Bean Validation" order="9" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -682,7 +544,14 @@
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
- <option name="COLUMN_ORDER" />
+ <option name="COLUMN_ORDER">
+ <list>
+ <option value="0" />
+ <option value="1" />
+ <option value="2" />
+ <option value="3" />
+ </list>
+ </option>
</State>
</value>
</entry>
@@ -707,7 +576,6 @@
<MESSAGE value="添加库位、库位类型增删改查接口" />
<MESSAGE value="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面" />
<MESSAGE value="修改库区service" />
- <option name="LAST_COMMIT_MESSAGE" value="修改库区service" />
<MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml" />
<MESSAGE value="添加userWarehouse" />
<MESSAGE value="添加containerCapacity" />
@@ -725,7 +593,9 @@
<MESSAGE value="库存交易搜索" />
<MESSAGE value="库存状态搜索" />
<MESSAGE value="盘点" />
- <option name="LAST_COMMIT_MESSAGE" value="盘点" />
+ <MESSAGE value="修改字典管理获取不到父节点Id bug" />
+ <MESSAGE value="任务完成-入库任务" />
+ <option name="LAST_COMMIT_MESSAGE" value="任务完成-入库任务" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -760,29 +630,9 @@
</component>
<component name="editorHistoryManager">
<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/task/taskHeader/controller/TaskHeaderController.java">
- <provider selected="true" editor-type-id="text-editor">
- <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="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="-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 relative-caret-position="912">
+ <caret line="56" column="37" selection-start-line="56" selection-start-column="37" selection-end-line="56" selection-end-column="37" />
</state>
</provider>
</entry>
@@ -796,23 +646,6 @@
</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/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/inventoryDetail/inventoryDetail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-99">
@@ -834,13 +667,7 @@
</state>
</provider>
</entry>
- <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/function/Function.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-7">
- <caret line="45" column="16" lean-forward="true" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="16" />
- </state>
- </provider>
- </entry>
+ <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/function/Function.java" />
<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="226">
@@ -851,22 +678,10 @@
<entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/ICycleCountHeaderService.java">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CyclecountHeaderMapperAuto.java">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/ICycleCountDetailService.java">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CyclecountDetailMapperAuto.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="40">
- <caret line="2" column="55" selection-start-line="2" selection-start-column="55" selection-end-line="2" selection-end-column="55" />
- </state>
- </provider>
- </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/ICycleCountHeaderService.java" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CyclecountHeaderMapperAuto.java" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/ICycleCountDetailService.java" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CyclecountDetailMapperAuto.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
@@ -874,26 +689,8 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="100">
- <caret line="31" column="40" selection-start-line="31" selection-start-column="40" selection-end-line="31" selection-end-column="40" />
- <folding>
- <element signature="e#0#15820#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="764">
- <caret line="67" column="5" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="5" />
- <folding>
- <element signature="e#0#16496#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CycleCountDetailMapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
@@ -911,18 +708,6 @@
</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="-173">
- <caret line="161" column="34" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" />
- <state relative-caret-position="639">
- <caret line="85" selection-start-line="85" selection-end-line="85" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="531">
@@ -960,5 +745,121 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="122">
+ <caret line="96" column="93" selection-start-line="96" selection-start-column="93" selection-end-line="96" selection-end-column="93" />
+ </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="271">
+ <caret line="28" column="58" selection-start-line="28" selection-start-column="57" selection-end-line="28" selection-end-column="58" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/IDictDataService.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="132">
+ <caret line="69" column="15" selection-start-line="69" selection-start-column="15" selection-end-line="69" selection-end-column="15" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/DictDataServiceImpl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="132">
+ <caret line="106" column="47" selection-start-line="106" selection-start-column="39" selection-end-line="106" selection-end-column="47" />
+ </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="759">
+ <caret line="112" column="25" lean-forward="true" selection-start-line="112" selection-start-column="25" selection-end-line="112" selection-end-column="25" />
+ </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="132">
+ <caret line="500" column="12" selection-start-line="500" selection-start-column="12" selection-end-line="500" selection-end-column="12" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/add.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="102">
+ <caret line="23" column="126" selection-start-line="23" selection-start-column="118" selection-end-line="23" selection-end-column="126" />
+ </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="89">
+ <caret line="56" column="76" selection-start-line="56" selection-start-column="76" selection-end-line="56" selection-end-column="76" />
+ </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="-38">
+ <caret line="148" column="37" selection-start-line="148" selection-start-column="35" selection-end-line="148" selection-end-column="37" />
+ </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="380">
+ <caret line="86" column="37" selection-start-line="86" selection-start-column="29" selection-end-line="86" selection-end-column="37" />
+ <folding>
+ <element signature="e#1501#1502#0" expanded="true" />
+ <element signature="e#1540#1541#0" 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="1710">
+ <caret line="117" column="46" selection-start-line="117" selection-start-column="46" selection-end-line="117" selection-end-column="46" />
+ </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="8379">
+ <caret line="441" column="68" selection-start-line="441" selection-start-column="68" selection-end-line="441" selection-end-column="68" />
+ </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="114">
+ <caret line="11" column="30" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
+ </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="209">
+ <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
+ </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="257">
+ <caret line="54" column="54" lean-forward="true" selection-start-line="54" selection-start-column="54" selection-end-line="54" selection-end-column="54" />
+ </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="-1467">
+ <caret line="313" column="68" lean-forward="true" selection-start-line="313" selection-start-column="68" selection-end-line="313" selection-end-column="68" />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file