wms / wms_ningbohuazhang · Commits

Commit e51310e8a718e6c400cc2d23c8bf6772cf35d740

Authored by wangyanxiong
1 parent cf31fd3d

xml文件

Inline Side-by-side
Showing 2 changed files with 227 additions and 326 deletions
.idea/compiler.xml
  View file @e51310e
... ... @@ -6,8 +6,8 @@
6 6 <sourceOutputDir name="target/generated-sources/annotations" />
7 7 <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8 8 <outputRelativeToContentRoot value="true" />
9   - <module name="wms2" />
10 9 <module name="huaheng" />
  10 + <module name="wms2" />
11 11 </profile>
12 12 </annotationProcessing>
13 13 </component>
... ...
.idea/workspace.xml
  View file @e51310e
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
5   - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" afterDir="false" />
6   - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" afterDir="false" />
  4 + <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="盘点">
  5 + <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
7 6 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8   - <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" />
9   - <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" />
10   - <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" />
11   - <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" />
12   - <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" />
13   - <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" />
14   - <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" />
15   - <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" />
16   - <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" />
17   - <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" />
18   - <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" />
19 7 <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" />
20   - <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" />
  8 + <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" />
21 9 </list>
22 10 <ignored path="$PROJECT_DIR$/target/" />
23 11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -65,22 +53,11 @@
65 53 </component>
66 54 <component name="FileEditorManager">
67 55 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
68   - <leaf>
69   - <file pinned="false" current-in-tab="false">
70   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java">
71   - <provider selected="true" editor-type-id="text-editor" />
72   - </entry>
73   - </file>
74 56 <file pinned="false" current-in-tab="false">
75 57 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
76 58 <provider selected="true" editor-type-id="text-editor">
77   - <state relative-caret-position="639">
78   - <caret line="85" selection-start-line="85" selection-end-line="85" />
79   - <folding>
80   - <element signature="imports" expanded="true" />
81   - </folding>
82   - <state relative-caret-position="409">
83   - <caret line="103" column="57" lean-forward="true" selection-start-line="103" selection-start-column="57" selection-end-line="103" selection-end-column="57" />
  59 + <state relative-caret-position="1710">
  60 + <caret line="117" column="46" selection-start-line="117" selection-start-column="46" selection-end-line="117" selection-end-column="46" />
84 61 </state>
85 62 </provider>
86 63 </entry>
... ... @@ -88,21 +65,35 @@
88 65 <file pinned="false" current-in-tab="false">
89 66 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
90 67 <provider selected="true" editor-type-id="text-editor">
91   - <state relative-caret-position="152">
92   - <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
  68 + <state relative-caret-position="209">
  69 + <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
93 70 </state>
94 71 </provider>
95 72 </entry>
96 73 </file>
97 74 <file pinned="false" current-in-tab="true">
98   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html">
99   - <file pinned="false" current-in-tab="true">
100 75 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
101 76 <provider selected="true" editor-type-id="text-editor">
102   - <state relative-caret-position="72">
103   - <caret line="91" column="52" lean-forward="true" selection-start-line="91" selection-start-column="52" selection-end-line="91" selection-end-column="52" />
104   - <state relative-caret-position="-173">
105   - <caret line="161" column="34" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" />
  77 + <state relative-caret-position="-1467">
  78 + <caret line="313" column="68" lean-forward="true" selection-start-line="313" selection-start-column="68" selection-end-line="313" selection-end-column="68" />
  79 + </state>
  80 + </provider>
  81 + </entry>
  82 + </file>
  83 + <file pinned="false" current-in-tab="false">
  84 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">
  85 + <provider selected="true" editor-type-id="text-editor">
  86 + <state relative-caret-position="114">
  87 + <caret line="11" column="30" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
  88 + </state>
  89 + </provider>
  90 + </entry>
  91 + </file>
  92 + <file pinned="false" current-in-tab="false">
  93 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">
  94 + <provider selected="true" editor-type-id="text-editor">
  95 + <state relative-caret-position="257">
  96 + <caret line="54" column="54" lean-forward="true" selection-start-line="54" selection-start-column="54" selection-end-line="54" selection-end-column="54" />
106 97 </state>
107 98 </provider>
108 99 </entry>
... ... @@ -110,10 +101,8 @@
110 101 <file pinned="false" current-in-tab="false">
111 102 <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
112 103 <provider selected="true" editor-type-id="text-editor">
113   - <state relative-caret-position="-513">
114   - <folding>
115   - <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
116   - </folding>
  104 + <state relative-caret-position="8379">
  105 + <caret line="441" column="68" selection-start-line="441" selection-start-column="68" selection-end-line="441" selection-end-column="68" />
117 106 </state>
118 107 </provider>
119 108 </entry>
... ... @@ -159,8 +148,6 @@
159 148 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" />
160 149 <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/task.html" />
161 150 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java" />
162   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" />
163   - <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" />
164 151 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java" />
165 152 <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" />
166 153 <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html" />
... ... @@ -173,6 +160,13 @@
173 160 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" />
174 161 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/domain/CycleCountHeader.java" />
175 162 <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" />
  163 + <option value="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html" />
  164 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/controller/DictDataController.java" />
  165 + <option value="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/add.html" />
  166 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" />
  167 + <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" />
  168 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" />
  169 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
176 170 </list>
177 171 </option>
178 172 </component>
... ... @@ -276,109 +270,7 @@
276 270 <item name="com" type="462c0819:PsiDirectoryNode" />
277 271 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
278 272 <item name="pc" type="462c0819:PsiDirectoryNode" />
279   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
280   - </path>
281   - <path>
282   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
283   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
284   - <item name="src" type="462c0819:PsiDirectoryNode" />
285   - <item name="main" type="462c0819:PsiDirectoryNode" />
286   - <item name="java" type="462c0819:PsiDirectoryNode" />
287   - <item name="com" type="462c0819:PsiDirectoryNode" />
288   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
289   - <item name="pc" type="462c0819:PsiDirectoryNode" />
290   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
291   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
292   - </path>
293   - <path>
294   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
295   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
296   - <item name="src" type="462c0819:PsiDirectoryNode" />
297   - <item name="main" type="462c0819:PsiDirectoryNode" />
298   - <item name="java" type="462c0819:PsiDirectoryNode" />
299   - <item name="com" type="462c0819:PsiDirectoryNode" />
300   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
301   - <item name="pc" type="462c0819:PsiDirectoryNode" />
302   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
303   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
304   - <item name="controller" type="462c0819:PsiDirectoryNode" />
305   - </path>
306   - <path>
307   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
308   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
309   - <item name="src" type="462c0819:PsiDirectoryNode" />
310   - <item name="main" type="462c0819:PsiDirectoryNode" />
311   - <item name="java" type="462c0819:PsiDirectoryNode" />
312   - <item name="com" type="462c0819:PsiDirectoryNode" />
313   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
314   - <item name="pc" type="462c0819:PsiDirectoryNode" />
315   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
316   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
317   - <item name="domain" type="462c0819:PsiDirectoryNode" />
318   - </path>
319   - <path>
320   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
321   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
322   - <item name="src" type="462c0819:PsiDirectoryNode" />
323   - <item name="main" type="462c0819:PsiDirectoryNode" />
324   - <item name="java" type="462c0819:PsiDirectoryNode" />
325   - <item name="com" type="462c0819:PsiDirectoryNode" />
326   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
327   - <item name="pc" type="462c0819:PsiDirectoryNode" />
328   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
329   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
330   - <item name="mapper" type="462c0819:PsiDirectoryNode" />
331   - </path>
332   - <path>
333   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
334   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
335   - <item name="src" type="462c0819:PsiDirectoryNode" />
336   - <item name="main" type="462c0819:PsiDirectoryNode" />
337   - <item name="java" type="462c0819:PsiDirectoryNode" />
338   - <item name="com" type="462c0819:PsiDirectoryNode" />
339   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
340   - <item name="pc" type="462c0819:PsiDirectoryNode" />
341   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
342   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
343   - <item name="service" type="462c0819:PsiDirectoryNode" />
344   - </path>
345   - <path>
346   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
347   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
348   - <item name="src" type="462c0819:PsiDirectoryNode" />
349   - <item name="main" type="462c0819:PsiDirectoryNode" />
350   - <item name="java" type="462c0819:PsiDirectoryNode" />
351   - <item name="com" type="462c0819:PsiDirectoryNode" />
352   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
353   - <item name="pc" type="462c0819:PsiDirectoryNode" />
354   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
355   - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
356   - </path>
357   - <path>
358   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
359   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
360   - <item name="src" type="462c0819:PsiDirectoryNode" />
361   - <item name="main" type="462c0819:PsiDirectoryNode" />
362   - <item name="java" type="462c0819:PsiDirectoryNode" />
363   - <item name="com" type="462c0819:PsiDirectoryNode" />
364   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
365   - <item name="pc" type="462c0819:PsiDirectoryNode" />
366   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
367   - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
368   - <item name="controller" type="462c0819:PsiDirectoryNode" />
369   - </path>
370   - <path>
371   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
372   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
373   - <item name="src" type="462c0819:PsiDirectoryNode" />
374   - <item name="main" type="462c0819:PsiDirectoryNode" />
375   - <item name="java" type="462c0819:PsiDirectoryNode" />
376   - <item name="com" type="462c0819:PsiDirectoryNode" />
377   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
378   - <item name="pc" type="462c0819:PsiDirectoryNode" />
379   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
380   - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
381   - <item name="domain" type="462c0819:PsiDirectoryNode" />
  273 + <item name="task" type="462c0819:PsiDirectoryNode" />
382 274 </path>
383 275 <path>
384 276 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -389,8 +281,8 @@
389 281 <item name="com" type="462c0819:PsiDirectoryNode" />
390 282 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
391 283 <item name="pc" type="462c0819:PsiDirectoryNode" />
392   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
393   - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
  284 + <item name="task" type="462c0819:PsiDirectoryNode" />
  285 + <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
394 286 </path>
395 287 <path>
396 288 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -401,8 +293,8 @@
401 293 <item name="com" type="462c0819:PsiDirectoryNode" />
402 294 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
403 295 <item name="pc" type="462c0819:PsiDirectoryNode" />
404   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
405   - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
  296 + <item name="task" type="462c0819:PsiDirectoryNode" />
  297 + <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
406 298 <item name="controller" type="462c0819:PsiDirectoryNode" />
407 299 </path>
408 300 <path>
... ... @@ -410,19 +302,6 @@
410 302 <item name="wms2" type="462c0819:PsiDirectoryNode" />
411 303 <item name="src" type="462c0819:PsiDirectoryNode" />
412 304 <item name="main" type="462c0819:PsiDirectoryNode" />
413   - <item name="java" type="462c0819:PsiDirectoryNode" />
414   - <item name="com" type="462c0819:PsiDirectoryNode" />
415   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
416   - <item name="pc" type="462c0819:PsiDirectoryNode" />
417   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
418   - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
419   - <item name="domain" type="462c0819:PsiDirectoryNode" />
420   - </path>
421   - <path>
422   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
423   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
424   - <item name="src" type="462c0819:PsiDirectoryNode" />
425   - <item name="main" type="462c0819:PsiDirectoryNode" />
426 305 <item name="resources" type="462c0819:PsiDirectoryNode" />
427 306 </path>
428 307 <path>
... ... @@ -440,17 +319,6 @@
440 319 <item name="main" type="462c0819:PsiDirectoryNode" />
441 320 <item name="resources" type="462c0819:PsiDirectoryNode" />
442 321 <item name="templates" type="462c0819:PsiDirectoryNode" />
443   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
444   - </path>
445   - <path>
446   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
447   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
448   - <item name="src" type="462c0819:PsiDirectoryNode" />
449   - <item name="main" type="462c0819:PsiDirectoryNode" />
450   - <item name="resources" type="462c0819:PsiDirectoryNode" />
451   - <item name="templates" type="462c0819:PsiDirectoryNode" />
452   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
453   - <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
454 322 <item name="task" type="462c0819:PsiDirectoryNode" />
455 323 </path>
456 324 <path>
... ... @@ -462,28 +330,6 @@
462 330 <item name="templates" type="462c0819:PsiDirectoryNode" />
463 331 <item name="task" type="462c0819:PsiDirectoryNode" />
464 332 <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
465   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
466   - <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
467   - </path>
468   - <path>
469   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
470   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
471   - <item name="src" type="462c0819:PsiDirectoryNode" />
472   - <item name="main" type="462c0819:PsiDirectoryNode" />
473   - <item name="resources" type="462c0819:PsiDirectoryNode" />
474   - <item name="templates" type="462c0819:PsiDirectoryNode" />
475   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
476   - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
477   - </path>
478   - <path>
479   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
480   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
481   - <item name="src" type="462c0819:PsiDirectoryNode" />
482   - <item name="main" type="462c0819:PsiDirectoryNode" />
483   - <item name="resources" type="462c0819:PsiDirectoryNode" />
484   - <item name="templates" type="462c0819:PsiDirectoryNode" />
485   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
486   - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
487 333 </path>
488 334 </expand>
489 335 <select />
... ... @@ -503,8 +349,8 @@
503 349 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
504 350 <property name="WebServerToolWindowFactoryState" value="false" />
505 351 <property name="aspect.path.notification.shown" value="true" />
506   - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566803879583" />
507   - <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" />
  352 + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566992925117" />
  353 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../wms-glgd" />
508 354 <property name="node.js.detected.package.eslint" value="true" />
509 355 <property name="node.js.detected.package.tslint" value="true" />
510 356 <property name="node.js.path.for.package.eslint" value="project" />
... ... @@ -583,6 +429,7 @@
583 429 <workItem from="1565311988064" duration="7176000" />
584 430 <workItem from="1565328536669" duration="797000" />
585 431 <workItem from="1566803530593" duration="266000" />
  432 + <workItem from="1566951795036" duration="23038000" />
586 433 </task>
587 434 <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
588 435 <created>1565226427512</created>
... ... @@ -605,31 +452,47 @@
605 452 <option name="project" value="LOCAL" />
606 453 <updated>1565259481656</updated>
607 454 </task>
608   - <option name="localTasksCounter" value="4" />
  455 + <task id="LOCAL-00004" summary="盘点">
  456 + <created>1566866817508</created>
  457 + <option name="number" value="00004" />
  458 + <option name="presentableId" value="LOCAL-00004" />
  459 + <option name="project" value="LOCAL" />
  460 + <updated>1566866817508</updated>
  461 + </task>
  462 + <task id="LOCAL-00005" summary="修改字典管理获取不到父节点Id bug">
  463 + <created>1566872309940</created>
  464 + <option name="number" value="00005" />
  465 + <option name="presentableId" value="LOCAL-00005" />
  466 + <option name="project" value="LOCAL" />
  467 + <updated>1566872309940</updated>
  468 + </task>
  469 + <task id="LOCAL-00006" summary="任务完成-入库任务">
  470 + <created>1566898785579</created>
  471 + <option name="number" value="00006" />
  472 + <option name="presentableId" value="LOCAL-00006" />
  473 + <option name="project" value="LOCAL" />
  474 + <updated>1566898785579</updated>
  475 + </task>
  476 + <option name="localTasksCounter" value="7" />
609 477 <servers />
610 478 </component>
611 479 <component name="TimeTrackingManager">
612   - <option name="totallyTimeSpent" value="266000" />
  480 + <option name="totallyTimeSpent" value="45377000" />
  481 + </component>
  482 + <component name="TodoView">
  483 + <todo-panel id="selected-file">
  484 + <is-autoscroll-to-source value="true" />
  485 + </todo-panel>
  486 + <todo-panel id="all">
  487 + <are-packages-shown value="true" />
  488 + <is-autoscroll-to-source value="true" />
  489 + </todo-panel>
613 490 </component>
614 491 <component name="ToolWindowManager">
615 492 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
  493 + <editor active="true" />
616 494 <layout>
617   - <window_info id="Designer" />
618   - <window_info id="Image Layers" />
619   - <window_info id="Capture Tool" />
620   - <window_info id="UI Designer" />
621   - <window_info id="Favorites" side_tool="true" />
622   - <window_info id="Web" side_tool="true" />
623   - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
624   - <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
625   - <window_info anchor="bottom" id="Spring" />
626   - <window_info anchor="bottom" id="Terminal" />
627   - <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
628   - <window_info anchor="bottom" id="Event Log" side_tool="true" />
629   - <window_info anchor="bottom" id="Java Enterprise" />
630   - <window_info anchor="bottom" id="Database Changes" />
631   - <window_info anchor="bottom" id="Version Control" />
632   - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.1883378" />
  495 + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.25670242" />
633 496 <window_info id="Structure" order="1" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
634 497 <window_info id="Web" order="2" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
635 498 <window_info id="Designer" order="3" />
... ... @@ -639,32 +502,31 @@
639 502 <window_info id="Capture Tool" order="7" />
640 503 <window_info anchor="bottom" id="Message" order="0" />
641 504 <window_info anchor="bottom" id="Find" order="1" />
642   - <window_info anchor="bottom" id="Run" order="2" />
643   - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
  505 + <window_info anchor="bottom" id="Run" order="2" weight="0.42351276" />
  506 + <window_info anchor="bottom" id="Debug" order="3" weight="0.39943343" />
644 507 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
645 508 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
646   - <window_info anchor="bottom" id="TODO" order="6" weight="0.3275488" />
  509 + <window_info anchor="bottom" id="TODO" order="6" weight="0.3286119" />
647 510 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
648 511 <window_info anchor="bottom" id="Version Control" order="8" weight="0.49433428" />
649 512 <window_info active="true" anchor="bottom" id="Run Dashboard" order="9" sideWeight="0.91152817" visible="true" weight="0.54532576" />
650 513 <window_info anchor="bottom" id="Spring" order="10" weight="0.3286119" />
651   - <window_info anchor="bottom" id="Database Changes" order="11" weight="0.3275488" />
  514 + <window_info anchor="bottom" id="Database Changes" order="11" weight="0.32719547" />
652 515 <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.08847185" side_tool="true" weight="0.34560907" />
653 516 <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.3275488" />
654   - <window_info anchor="bottom" id="Messages" order="14" weight="0.16005665" />
  517 + <window_info anchor="bottom" id="Messages" order="14" weight="0.15864022" />
655 518 <window_info anchor="bottom" id="MyBatis Log" order="15" />
656 519 <window_info anchor="bottom" id="Terminal" order="16" />
657   - <window_info anchor="bottom" id="TODO" order="6" />
658   - <window_info anchor="right" id="Maven" weight="0.3297587" />
659   - <window_info anchor="right" id="Palette" />
660   - <window_info anchor="right" id="Capture Analysis" />
661   - <window_info anchor="right" id="Database" />
662   - <window_info anchor="right" id="Palette&#9;" />
663   - <window_info anchor="right" id="Theme Preview" />
664   - <window_info anchor="right" id="Bean Validation" />
665 520 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
666 521 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
667 522 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  523 + <window_info anchor="right" id="Maven" order="3" weight="0.3297587" />
  524 + <window_info anchor="right" id="Palette" order="4" />
  525 + <window_info anchor="right" id="Capture Analysis" order="5" />
  526 + <window_info anchor="right" id="Database" order="6" />
  527 + <window_info anchor="right" id="Palette&#9;" order="7" />
  528 + <window_info anchor="right" id="Theme Preview" order="8" />
  529 + <window_info anchor="right" id="Bean Validation" order="9" />
668 530 </layout>
669 531 </component>
670 532 <component name="TypeScriptGeneratedFilesManager">
... ... @@ -682,7 +544,14 @@
682 544 <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
683 545 <collection />
684 546 </option>
685   - <option name="COLUMN_ORDER" />
  547 + <option name="COLUMN_ORDER">
  548 + <list>
  549 + <option value="0" />
  550 + <option value="1" />
  551 + <option value="2" />
  552 + <option value="3" />
  553 + </list>
  554 + </option>
686 555 </State>
687 556 </value>
688 557 </entry>
... ... @@ -707,7 +576,6 @@
707 576 <MESSAGE value="添加库位、库位类型增删改查接口" />
708 577 <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
709 578 <MESSAGE value="修改库区service" />
710   - <option name="LAST_COMMIT_MESSAGE" value="修改库区service" />
711 579 <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" />
712 580 <MESSAGE value="添加userWarehouse" />
713 581 <MESSAGE value="添加containerCapacity" />
... ... @@ -725,7 +593,9 @@
725 593 <MESSAGE value="库存交易搜索" />
726 594 <MESSAGE value="库存状态搜索" />
727 595 <MESSAGE value="盘点" />
728   - <option name="LAST_COMMIT_MESSAGE" value="盘点" />
  596 + <MESSAGE value="修改字典管理获取不到父节点Id bug" />
  597 + <MESSAGE value="任务完成-入库任务" />
  598 + <option name="LAST_COMMIT_MESSAGE" value="任务完成-入库任务" />
729 599 </component>
730 600 <component name="XDebuggerManager">
731 601 <breakpoint-manager>
... ... @@ -760,29 +630,9 @@
760 630 </component>
761 631 <component name="editorHistoryManager">
762 632 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskHeader.java">
763   - <provider selected="true" editor-type-id="text-editor" />
764   - </entry>
765   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
766   - <provider selected="true" editor-type-id="text-editor">
767   - <state relative-caret-position="409">
768   - <caret line="103" column="57" lean-forward="true" selection-start-line="103" selection-start-column="57" selection-end-line="103" selection-end-column="57" />
769   - </state>
770   - </provider>
771   - </entry>
772   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
773   - <provider selected="true" editor-type-id="text-editor">
774   - <state relative-caret-position="152">
775   - <caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
776   - </state>
777   - </provider>
778   - </entry>
779   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
780 633 <provider selected="true" editor-type-id="text-editor">
781   - <state relative-caret-position="-513">
782   - <folding>
783   - <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
784   - <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
785   - </folding>
  634 + <state relative-caret-position="912">
  635 + <caret line="56" column="37" selection-start-line="56" selection-start-column="37" selection-end-line="56" selection-end-column="37" />
786 636 </state>
787 637 </provider>
788 638 </entry>
... ... @@ -796,23 +646,6 @@
796 646 </state>
797 647 </provider>
798 648 </entry>
799   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
800   - <provider selected="true" editor-type-id="text-editor">
801   - <state relative-caret-position="40">
802   - <caret line="55" column="48" lean-forward="true" selection-start-line="55" selection-start-column="48" selection-end-line="55" selection-end-column="48" />
803   - <folding>
804   - <element signature="imports" expanded="true" />
805   - </folding>
806   - </state>
807   - </provider>
808   - </entry>
809   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js">
810   - <provider selected="true" editor-type-id="text-editor">
811   - <state relative-caret-position="213">
812   - <caret line="119" column="12" selection-start-line="119" selection-start-column="12" selection-end-line="119" selection-end-column="12" />
813   - </state>
814   - </provider>
815   - </entry>
816 649 <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
817 650 <provider selected="true" editor-type-id="text-editor">
818 651 <state relative-caret-position="-99">
... ... @@ -834,13 +667,7 @@
834 667 </state>
835 668 </provider>
836 669 </entry>
837   - <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/function/Function.java">
838   - <provider selected="true" editor-type-id="text-editor">
839   - <state relative-caret-position="-7">
840   - <caret line="45" column="16" lean-forward="true" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="16" />
841   - </state>
842   - </provider>
843   - </entry>
  670 + <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/function/Function.java" />
844 671 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java">
845 672 <provider selected="true" editor-type-id="text-editor">
846 673 <state relative-caret-position="226">
... ... @@ -851,22 +678,10 @@
851 678 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java">
852 679 <provider selected="true" editor-type-id="text-editor" />
853 680 </entry>
854   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/ICycleCountHeaderService.java">
855   - <provider selected="true" editor-type-id="text-editor" />
856   - </entry>
857   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CyclecountHeaderMapperAuto.java">
858   - <provider selected="true" editor-type-id="text-editor" />
859   - </entry>
860   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/ICycleCountDetailService.java">
861   - <provider selected="true" editor-type-id="text-editor" />
862   - </entry>
863   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CyclecountDetailMapperAuto.java">
864   - <provider selected="true" editor-type-id="text-editor">
865   - <state relative-caret-position="40">
866   - <caret line="2" column="55" selection-start-line="2" selection-start-column="55" selection-end-line="2" selection-end-column="55" />
867   - </state>
868   - </provider>
869   - </entry>
  681 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/ICycleCountHeaderService.java" />
  682 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CyclecountHeaderMapperAuto.java" />
  683 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/ICycleCountDetailService.java" />
  684 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CyclecountDetailMapperAuto.java" />
870 685 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java">
871 686 <provider selected="true" editor-type-id="text-editor">
872 687 <state relative-caret-position="420">
... ... @@ -874,26 +689,8 @@
874 689 </state>
875 690 </provider>
876 691 </entry>
877   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java">
878   - <provider selected="true" editor-type-id="text-editor">
879   - <state relative-caret-position="100">
880   - <caret line="31" column="40" selection-start-line="31" selection-start-column="40" selection-end-line="31" selection-end-column="40" />
881   - <folding>
882   - <element signature="e#0#15820#0" expanded="true" />
883   - </folding>
884   - </state>
885   - </provider>
886   - </entry>
887   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java">
888   - <provider selected="true" editor-type-id="text-editor">
889   - <state relative-caret-position="764">
890   - <caret line="67" column="5" selection-start-line="67" selection-start-column="5" selection-end-line="67" selection-end-column="5" />
891   - <folding>
892   - <element signature="e#0#16496#0" expanded="true" />
893   - </folding>
894   - </state>
895   - </provider>
896   - </entry>
  692 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java" />
  693 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/service/CycleCountHeaderServiceImpl.java" />
897 694 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/mapper/CycleCountDetailMapper.java">
898 695 <provider selected="true" editor-type-id="text-editor">
899 696 <state relative-caret-position="120">
... ... @@ -911,18 +708,6 @@
911 708 </state>
912 709 </provider>
913 710 </entry>
914   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
915   - <provider selected="true" editor-type-id="text-editor">
916   - <state relative-caret-position="-173">
917   - <caret line="161" column="34" selection-start-line="161" selection-start-column="34" selection-end-line="161" selection-end-column="34" />
918   - <state relative-caret-position="639">
919   - <caret line="85" selection-start-line="85" selection-end-line="85" />
920   - <folding>
921   - <element signature="imports" expanded="true" />
922   - </folding>
923   - </state>
924   - </provider>
925   - </entry>
926 711 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java">
927 712 <provider selected="true" editor-type-id="text-editor">
928 713 <state relative-caret-position="531">
... ... @@ -960,5 +745,121 @@
960 745 </state>
961 746 </provider>
962 747 </entry>
  748 + <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
  749 + <provider selected="true" editor-type-id="text-editor">
  750 + <state relative-caret-position="122">
  751 + <caret line="96" column="93" selection-start-line="96" selection-start-column="93" selection-end-line="96" selection-end-column="93" />
  752 + </state>
  753 + </provider>
  754 + </entry>
  755 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
  756 + <provider selected="true" editor-type-id="text-editor">
  757 + <state relative-caret-position="271">
  758 + <caret line="28" column="58" selection-start-line="28" selection-start-column="57" selection-end-line="28" selection-end-column="58" />
  759 + </state>
  760 + </provider>
  761 + </entry>
  762 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/IDictDataService.java">
  763 + <provider selected="true" editor-type-id="text-editor">
  764 + <state relative-caret-position="132">
  765 + <caret line="69" column="15" selection-start-line="69" selection-start-column="15" selection-end-line="69" selection-end-column="15" />
  766 + </state>
  767 + </provider>
  768 + </entry>
  769 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/DictDataServiceImpl.java">
  770 + <provider selected="true" editor-type-id="text-editor">
  771 + <state relative-caret-position="132">
  772 + <caret line="106" column="47" selection-start-line="106" selection-start-column="39" selection-end-line="106" selection-end-column="47" />
  773 + </state>
  774 + </provider>
  775 + </entry>
  776 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/controller/DictTypeController.java">
  777 + <provider selected="true" editor-type-id="text-editor">
  778 + <state relative-caret-position="759">
  779 + <caret line="112" column="25" lean-forward="true" selection-start-line="112" selection-start-column="25" selection-end-line="112" selection-end-column="25" />
  780 + </state>
  781 + </provider>
  782 + </entry>
  783 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js">
  784 + <provider selected="true" editor-type-id="text-editor">
  785 + <state relative-caret-position="132">
  786 + <caret line="500" column="12" selection-start-line="500" selection-start-column="12" selection-end-line="500" selection-end-column="12" />
  787 + </state>
  788 + </provider>
  789 + </entry>
  790 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/add.html">
  791 + <provider selected="true" editor-type-id="text-editor">
  792 + <state relative-caret-position="102">
  793 + <caret line="23" column="126" selection-start-line="23" selection-start-column="118" selection-end-line="23" selection-end-column="126" />
  794 + </state>
  795 + </provider>
  796 + </entry>
  797 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html">
  798 + <provider selected="true" editor-type-id="text-editor">
  799 + <state relative-caret-position="89">
  800 + <caret line="56" column="76" selection-start-line="56" selection-start-column="76" selection-end-line="56" selection-end-column="76" />
  801 + </state>
  802 + </provider>
  803 + </entry>
  804 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/type/type.html">
  805 + <provider selected="true" editor-type-id="text-editor">
  806 + <state relative-caret-position="-38">
  807 + <caret line="148" column="37" selection-start-line="148" selection-start-column="35" selection-end-line="148" selection-end-column="37" />
  808 + </state>
  809 + </provider>
  810 + </entry>
  811 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/controller/DictDataController.java">
  812 + <provider selected="true" editor-type-id="text-editor">
  813 + <state relative-caret-position="380">
  814 + <caret line="86" column="37" selection-start-line="86" selection-start-column="29" selection-end-line="86" selection-end-column="37" />
  815 + <folding>
  816 + <element signature="e#1501#1502#0" expanded="true" />
  817 + <element signature="e#1540#1541#0" expanded="true" />
  818 + </folding>
  819 + </state>
  820 + </provider>
  821 + </entry>
  822 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
  823 + <provider selected="true" editor-type-id="text-editor">
  824 + <state relative-caret-position="1710">
  825 + <caret line="117" column="46" selection-start-line="117" selection-start-column="46" selection-end-line="117" selection-end-column="46" />
  826 + </state>
  827 + </provider>
  828 + </entry>
  829 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
  830 + <provider selected="true" editor-type-id="text-editor">
  831 + <state relative-caret-position="8379">
  832 + <caret line="441" column="68" selection-start-line="441" selection-start-column="68" selection-end-line="441" selection-end-column="68" />
  833 + </state>
  834 + </provider>
  835 + </entry>
  836 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">
  837 + <provider selected="true" editor-type-id="text-editor">
  838 + <state relative-caret-position="114">
  839 + <caret line="11" column="30" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
  840 + </state>
  841 + </provider>
  842 + </entry>
  843 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
  844 + <provider selected="true" editor-type-id="text-editor">
  845 + <state relative-caret-position="209">
  846 + <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
  847 + </state>
  848 + </provider>
  849 + </entry>
  850 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">
  851 + <provider selected="true" editor-type-id="text-editor">
  852 + <state relative-caret-position="257">
  853 + <caret line="54" column="54" lean-forward="true" selection-start-line="54" selection-start-column="54" selection-end-line="54" selection-end-column="54" />
  854 + </state>
  855 + </provider>
  856 + </entry>
  857 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
  858 + <provider selected="true" editor-type-id="text-editor">
  859 + <state relative-caret-position="-1467">
  860 + <caret line="313" column="68" lean-forward="true" selection-start-line="313" selection-start-column="68" selection-end-line="313" selection-end-column="68" />
  861 + </state>
  862 + </provider>
  863 + </entry>
963 864 </component>
964 865 </project>
965 866 \ No newline at end of file
... ...