wms / wms2_xinyi · Commits

Commit 00b73b05902d023e141891bb77ae450409255c6b

Authored by pengcheng
1 parent d12fb0d9

workspace.xml

Inline Side-by-side
Showing 1 changed file with 12 additions and 131 deletions
.idea/workspace.xml
  View file @00b73b0
@@ -67,86 +67,7 @@ @@ -67,86 +67,7 @@
67 <select /> 67 <select />
68 </component> 68 </component>
69 <component name="FileEditorManager"> 69 <component name="FileEditorManager">
70 - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">  
71 - <file pinned="false" current-in-tab="false">  
72 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java">  
73 - <provider selected="true" editor-type-id="text-editor">  
74 - <state relative-caret-position="436">  
75 - <caret line="70" column="44" lean-forward="true" selection-start-line="70" selection-start-column="44" selection-end-line="70" selection-end-column="44" />  
76 - <folding>  
77 - <element signature="imports" expanded="true" />  
78 - </folding>  
79 - </state>  
80 - </provider>  
81 - </entry>  
82 - </file>  
83 - <file pinned="false" current-in-tab="false">  
84 - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/zone/zone.html">  
85 - <provider selected="true" editor-type-id="text-editor">  
86 - <state relative-caret-position="385">  
87 - <caret line="31" column="65" lean-forward="true" selection-start-line="31" selection-start-column="65" selection-end-line="31" selection-end-column="65" />  
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/templates/config/zoneCapacity/add.html">  
94 - <provider selected="true" editor-type-id="text-editor">  
95 - <state relative-caret-position="268">  
96 - <caret line="68" column="37" selection-start-line="68" selection-start-column="37" selection-end-line="68" selection-end-column="37" />  
97 - </state>  
98 - </provider>  
99 - </entry>  
100 - </file>  
101 - <file pinned="false" current-in-tab="false">  
102 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneServiceImpl.java">  
103 - <provider selected="true" editor-type-id="text-editor">  
104 - <state relative-caret-position="200">  
105 - <caret line="8" column="23" lean-forward="true" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />  
106 - <folding>  
107 - <element signature="imports" expanded="true" />  
108 - </folding>  
109 - </state>  
110 - </provider>  
111 - </entry>  
112 - </file>  
113 - <file pinned="false" current-in-tab="true">  
114 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java">  
115 - <provider selected="true" editor-type-id="text-editor">  
116 - <state relative-caret-position="358">  
117 - <caret line="102" column="5" lean-forward="true" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" />  
118 - <folding>  
119 - <element signature="imports" expanded="true" />  
120 - </folding>  
121 - </state>  
122 - </provider>  
123 - </entry>  
124 - </file>  
125 - <file pinned="false" current-in-tab="false">  
126 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityService.java">  
127 - <provider selected="true" editor-type-id="text-editor">  
128 - <state relative-caret-position="200">  
129 - <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />  
130 - <folding>  
131 - <element signature="imports" expanded="true" />  
132 - </folding>  
133 - </state>  
134 - </provider>  
135 - </entry>  
136 - </file>  
137 - <file pinned="false" current-in-tab="false">  
138 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java">  
139 - <provider selected="true" editor-type-id="text-editor">  
140 - <state relative-caret-position="350">  
141 - <caret line="20" column="43" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" />  
142 - <folding>  
143 - <element signature="imports" expanded="true" />  
144 - </folding>  
145 - </state>  
146 - </provider>  
147 - </entry>  
148 - </file>  
149 - </leaf> 70 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
150 </component> 71 </component>
151 <component name="FileTemplateManagerImpl"> 72 <component name="FileTemplateManagerImpl">
152 <option name="RECENT_TEMPLATES"> 73 <option name="RECENT_TEMPLATES">
@@ -227,7 +148,6 @@ @@ -227,7 +148,6 @@
227 </navigator> 148 </navigator>
228 <panes> 149 <panes>
229 <pane id="PackagesPane" /> 150 <pane id="PackagesPane" />
230 - <pane id="Scope" />  
231 <pane id="ProjectPane"> 151 <pane id="ProjectPane">
232 <subPane> 152 <subPane>
233 <expand> 153 <expand>
@@ -363,45 +283,6 @@ @@ -363,45 +283,6 @@
363 <item name="com" type="462c0819:PsiDirectoryNode" /> 283 <item name="com" type="462c0819:PsiDirectoryNode" />
364 <item name="huaheng" type="462c0819:PsiDirectoryNode" /> 284 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
365 <item name="pc" type="462c0819:PsiDirectoryNode" /> 285 <item name="pc" type="462c0819:PsiDirectoryNode" />
366 - <item name="config" type="462c0819:PsiDirectoryNode" />  
367 - <item name="zoneCapacity" 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="config" type="462c0819:PsiDirectoryNode" />  
380 - <item name="zoneCapacity" type="462c0819:PsiDirectoryNode" />  
381 - <item name="mapper" type="462c0819:PsiDirectoryNode" />  
382 - </path>  
383 - <path>  
384 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
385 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
386 - <item name="src" type="462c0819:PsiDirectoryNode" />  
387 - <item name="main" type="462c0819:PsiDirectoryNode" />  
388 - <item name="java" type="462c0819:PsiDirectoryNode" />  
389 - <item name="com" type="462c0819:PsiDirectoryNode" />  
390 - <item name="huaheng" type="462c0819:PsiDirectoryNode" />  
391 - <item name="pc" type="462c0819:PsiDirectoryNode" />  
392 - <item name="config" type="462c0819:PsiDirectoryNode" />  
393 - <item name="zoneCapacity" type="462c0819:PsiDirectoryNode" />  
394 - <item name="service" type="462c0819:PsiDirectoryNode" />  
395 - </path>  
396 - <path>  
397 - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />  
398 - <item name="wms2" type="462c0819:PsiDirectoryNode" />  
399 - <item name="src" type="462c0819:PsiDirectoryNode" />  
400 - <item name="main" type="462c0819:PsiDirectoryNode" />  
401 - <item name="java" type="462c0819:PsiDirectoryNode" />  
402 - <item name="com" type="462c0819:PsiDirectoryNode" />  
403 - <item name="huaheng" type="462c0819:PsiDirectoryNode" />  
404 - <item name="pc" type="462c0819:PsiDirectoryNode" />  
405 <item name="general" type="462c0819:PsiDirectoryNode" /> 286 <item name="general" type="462c0819:PsiDirectoryNode" />
406 </path> 287 </path>
407 <path> 288 <path>
@@ -484,6 +365,7 @@ @@ -484,6 +365,7 @@
484 <select /> 365 <select />
485 </subPane> 366 </subPane>
486 </pane> 367 </pane>
  368 + <pane id="Scope" />
487 </panes> 369 </panes>
488 </component> 370 </component>
489 <component name="PropertiesComponent"> 371 <component name="PropertiesComponent">
@@ -495,7 +377,7 @@ @@ -495,7 +377,7 @@
495 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> 377 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
496 <property name="WebServerToolWindowFactoryState" value="false" /> 378 <property name="WebServerToolWindowFactoryState" value="false" />
497 <property name="aspect.path.notification.shown" value="true" /> 379 <property name="aspect.path.notification.shown" value="true" />
498 - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1565255020864" /> 380 + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1565331675249" />
499 <property name="database.console.LAST_STATE" value="true" /> 381 <property name="database.console.LAST_STATE" value="true" />
500 <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" /> 382 <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" />
501 <property name="project.structure.last.edited" value="Project" /> 383 <property name="project.structure.last.edited" value="Project" />
@@ -651,9 +533,8 @@ @@ -651,9 +533,8 @@
651 </component> 533 </component>
652 <component name="ToolWindowManager"> 534 <component name="ToolWindowManager">
653 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> 535 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
654 - <editor active="true" />  
655 <layout> 536 <layout>
656 - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.491453" visible="true" weight="0.269437" /> 537 + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.491453" visible="true" weight="0.2727882" />
657 <window_info id="Structure" order="1" sideWeight="0.508547" side_tool="true" weight="0.2600536" /> 538 <window_info id="Structure" order="1" sideWeight="0.508547" side_tool="true" weight="0.2600536" />
658 <window_info id="Designer" order="2" /> 539 <window_info id="Designer" order="2" />
659 <window_info id="Image Layers" order="3" /> 540 <window_info id="Image Layers" order="3" />
@@ -661,7 +542,6 @@ @@ -661,7 +542,6 @@
661 <window_info id="UI Designer" order="5" /> 542 <window_info id="UI Designer" order="5" />
662 <window_info id="Favorites" order="6" side_tool="true" /> 543 <window_info id="Favorites" order="6" side_tool="true" />
663 <window_info id="Web" order="7" side_tool="true" /> 544 <window_info id="Web" order="7" side_tool="true" />
664 - <window_info anchor="bottom" id="Database Console" weight="0.3286119" />  
665 <window_info anchor="bottom" id="Message" order="0" /> 545 <window_info anchor="bottom" id="Message" order="0" />
666 <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" /> 546 <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
667 <window_info anchor="bottom" id="Run" order="2" /> 547 <window_info anchor="bottom" id="Run" order="2" />
@@ -677,6 +557,7 @@ @@ -677,6 +557,7 @@
677 <window_info anchor="bottom" id="Database Changes" order="12" show_stripe_button="false" /> 557 <window_info anchor="bottom" id="Database Changes" order="12" show_stripe_button="false" />
678 <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.4989339" weight="0.3281471" /> 558 <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.4989339" weight="0.3281471" />
679 <window_info anchor="bottom" id="Messages" order="14" weight="0.3286119" /> 559 <window_info anchor="bottom" id="Messages" order="14" weight="0.3286119" />
  560 + <window_info anchor="bottom" id="Database Console" order="15" weight="0.3286119" />
680 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 561 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
681 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 562 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
682 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 563 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -1133,13 +1014,6 @@ @@ -1133,13 +1014,6 @@
1133 </state> 1014 </state>
1134 </provider> 1015 </provider>
1135 </entry> 1016 </entry>
1136 - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java">  
1137 - <provider selected="true" editor-type-id="text-editor">  
1138 - <state relative-caret-position="225">  
1139 - <caret line="56" selection-start-line="56" selection-end-line="56" />  
1140 - </state>  
1141 - </provider>  
1142 - </entry>  
1143 <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js"> 1017 <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js">
1144 <provider selected="true" editor-type-id="text-editor"> 1018 <provider selected="true" editor-type-id="text-editor">
1145 <state relative-caret-position="194"> 1019 <state relative-caret-position="194">
@@ -1228,6 +1102,13 @@ @@ -1228,6 +1102,13 @@
1228 </state> 1102 </state>
1229 </provider> 1103 </provider>
1230 </entry> 1104 </entry>
  1105 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java">
  1106 + <provider selected="true" editor-type-id="text-editor">
  1107 + <state relative-caret-position="225">
  1108 + <caret line="56" selection-start-line="56" selection-end-line="56" />
  1109 + </state>
  1110 + </provider>
  1111 + </entry>
1231 </component> 1112 </component>
1232 <component name="masterDetails"> 1113 <component name="masterDetails">
1233 <states> 1114 <states>