Commit 67d88c1bacb5ba512c0aa1f744ff86ddc4f26458
Merge remote-tracking branch 'origin/develop' into develop
Showing
4 changed files
with
274 additions
and
761 deletions
.idea/compiler.xml
... | ... | @@ -6,12 +6,10 @@ |
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="huaheng" /> | |
9 | 10 | <module name="WMSV1" /> |
10 | 11 | </profile> |
11 | 12 | </annotationProcessing> |
12 | - <bytecodeTargetLevel> | |
13 | - <module name="huaheng" target="1.8" /> | |
14 | - </bytecodeTargetLevel> | |
15 | 13 | </component> |
16 | 14 | <component name="JavacSettings"> |
17 | 15 | <option name="ADDITIONAL_OPTIONS_OVERRIDE"> |
... | ... |
.idea/workspace.xml
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | 2 | <project version="4"> |
3 | 3 | <component name="ChangeListManager"> |
4 | - <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="回退" /> | |
5 | - <list id="560adde2-f267-4051-b179-368004a880e1" name="Revert "库区容量增加修改"" comment="Revert "库区容量增加修改" This reverts commit d12fb0d9"> | |
4 | + <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment=""> | |
5 | + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/framework/config/MybatisPlusConfig.java" afterDir="false" /> | |
6 | + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> | |
7 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/framework/web/controller/BaseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/framework/web/controller/BaseController.java" afterDir="false" /> | |
6 | 8 | <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java" afterDir="false" /> |
9 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java" afterDir="false" /> | |
10 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java" afterDir="false" /> | |
11 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java" afterDir="false" /> | |
12 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/controller/LocationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/controller/LocationController.java" afterDir="false" /> | |
13 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/domain/Location.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/domain/Location.java" afterDir="false" /> | |
14 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/service/LocationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/service/LocationServiceImpl.java" afterDir="false" /> | |
15 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java" afterDir="false" /> | |
16 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" afterDir="false" /> | |
17 | + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/location/addBatch.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/location/addBatch.html" afterDir="false" /> | |
18 | + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/location/location.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/location/location.html" afterDir="false" /> | |
7 | 19 | </list> |
8 | - <ignored path="$PROJECT_DIR$/target/" /> | |
9 | 20 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
10 | 21 | <option name="SHOW_DIALOG" value="false" /> |
11 | 22 | <option name="HIGHLIGHT_CONFLICTS" value="true" /> |
... | ... | @@ -13,133 +24,259 @@ |
13 | 24 | <option name="LAST_RESOLUTION" value="IGNORE" /> |
14 | 25 | </component> |
15 | 26 | <component name="DatabaseView"> |
16 | - <option name="SHOW_INTERMEDIATE" value="true" /> | |
27 | + <option name="SHOW_INTERMEDIATE" value="false" /> | |
17 | 28 | <option name="GROUP_DATA_SOURCES" value="true" /> |
18 | 29 | <option name="GROUP_SCHEMA" value="true" /> |
19 | 30 | <option name="GROUP_CONTENTS" value="false" /> |
20 | 31 | <option name="SORT_POSITIONED" value="false" /> |
21 | 32 | <option name="SHOW_EMPTY_GROUPS" value="false" /> |
22 | - <option name="AUTO_SCROLL_FROM_SOURCE" value="false" /> | |
33 | + <option name="AUTO_SCROLL_FROM_SOURCE" value="true" /> | |
23 | 34 | <option name="HIDDEN_KINDS"> |
24 | 35 | <set /> |
25 | 36 | </option> |
26 | 37 | <expand> |
27 | 38 | <path> |
28 | 39 | <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> |
29 | - <item name="wms2" type="feb32156:DbDataSourceImpl" /> | |
40 | + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> | |
30 | 41 | </path> |
31 | 42 | <path> |
32 | 43 | <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> |
33 | - <item name="wms2" type="feb32156:DbDataSourceImpl" /> | |
44 | + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> | |
34 | 45 | <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> |
35 | 46 | </path> |
36 | 47 | <path> |
37 | 48 | <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> |
38 | - <item name="wms2" type="feb32156:DbDataSourceImpl" /> | |
49 | + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> | |
39 | 50 | <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> |
40 | 51 | <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" /> |
41 | 52 | </path> |
53 | + <path> | |
54 | + <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" /> | |
55 | + <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> | |
56 | + <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> | |
57 | + <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" /> | |
58 | + <item name="location: table" type="285a2a93:MysqlImplModel$Table" /> | |
59 | + </path> | |
42 | 60 | </expand> |
43 | 61 | <select /> |
44 | 62 | </component> |
45 | 63 | <component name="FileEditorManager"> |
46 | 64 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
65 | + <file pinned="false" current-in-tab="false"> | |
66 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java"> | |
67 | + <provider selected="true" editor-type-id="text-editor"> | |
68 | + <state relative-caret-position="70"> | |
69 | + <caret line="124" column="57" selection-start-line="124" selection-start-column="38" selection-end-line="124" selection-end-column="57" /> | |
70 | + </state> | |
71 | + </provider> | |
72 | + </entry> | |
73 | + </file> | |
47 | 74 | <file pinned="false" current-in-tab="true"> |
48 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/locationType/controller/LocationTypeController.java"> | |
75 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/user/edit.html"> | |
49 | 76 | <provider selected="true" editor-type-id="text-editor"> |
50 | - <state relative-caret-position="165"> | |
51 | - <caret line="45" selection-start-line="45" selection-end-line="45" /> | |
77 | + <state relative-caret-position="171"> | |
78 | + <caret line="69" column="65" lean-forward="true" selection-start-line="69" selection-start-column="65" selection-end-line="69" selection-end-column="65" /> | |
52 | 79 | </state> |
53 | 80 | </provider> |
54 | 81 | </entry> |
55 | 82 | </file> |
83 | + <file pinned="false" current-in-tab="false"> | |
84 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java"> | |
85 | + <provider selected="true" editor-type-id="text-editor"> | |
86 | + <state relative-caret-position="193"> | |
87 | + <caret line="87" column="77" selection-start-line="87" selection-start-column="61" selection-end-line="87" selection-end-column="77" /> | |
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/system/user/add.html"> | |
94 | + <provider selected="true" editor-type-id="text-editor" /> | |
95 | + </entry> | |
96 | + </file> | |
56 | 97 | </leaf> |
57 | 98 | </component> |
58 | 99 | <component name="FileTemplateManagerImpl"> |
59 | 100 | <option name="RECENT_TEMPLATES"> |
60 | 101 | <list> |
61 | - <option value="Interface" /> | |
62 | 102 | <option value="Class" /> |
63 | 103 | </list> |
64 | 104 | </option> |
65 | 105 | </component> |
66 | - <component name="FindInProjectRecents"> | |
67 | - <findStrings> | |
68 | - <find>zone</find> | |
69 | - </findStrings> | |
70 | - </component> | |
71 | 106 | <component name="Git.Settings"> |
72 | 107 | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
73 | 108 | <option name="RECENT_BRANCH_BY_REPOSITORY"> |
74 | 109 | <map> |
75 | - <entry key="$PROJECT_DIR$" value="developMain" /> | |
110 | + <entry key="$PROJECT_DIR$" value="master" /> | |
76 | 111 | </map> |
77 | 112 | </option> |
78 | - <option name="RESET_MODE" value="HARD" /> | |
79 | - </component> | |
80 | - <component name="IdeDocumentHistory"> | |
81 | - <option name="CHANGED_PATHS"> | |
82 | - <list> | |
83 | - <option value="$PROJECT_DIR$/src/main/resources/application.properties" /> | |
84 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/security/ShiroUtils.java" /> | |
85 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/LoginController.java" /> | |
86 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java" /> | |
87 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseService.java" /> | |
88 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseServiceImpl.java" /> | |
89 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/mapper/WarehouseMapper.java" /> | |
90 | - <option value="$PROJECT_DIR$/src/main/resources/mybatis/general/WarehouseMapper.xml" /> | |
91 | - <option value="$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml" /> | |
92 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java" /> | |
93 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java" /> | |
94 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/domain/Zone.java" /> | |
95 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/domain/ZoneCapacity.java" /> | |
96 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/mapper/ZoneCapacityMapper.java" /> | |
97 | - <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneMapper.xml" /> | |
98 | - <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneCapacityMapper.xml" /> | |
99 | - <option value="$PROJECT_DIR$/src/main/resources/templates/config/zone/zone.html" /> | |
100 | - <option value="$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/zoneCapacity.html" /> | |
101 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneServiceImpl.java" /> | |
102 | - <option value="$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/add.html" /> | |
103 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityService.java" /> | |
104 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java" /> | |
105 | - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java" /> | |
106 | - </list> | |
107 | - </option> | |
108 | 113 | </component> |
109 | 114 | <component name="IgnoredFileRootStore"> |
110 | 115 | <option name="generatedRoots"> |
111 | 116 | <set> |
112 | - <option value="C:\Users\Administrator\IdeaProjects\wms2\.idea" /> | |
117 | + <option value="E:\code\wms2\.idea" /> | |
113 | 118 | </set> |
114 | 119 | </option> |
115 | 120 | </component> |
116 | - <component name="MavenImportPreferences"> | |
117 | - <option name="importingSettings"> | |
118 | - <MavenImportingSettings> | |
119 | - <option name="importAutomatically" value="true" /> | |
120 | - </MavenImportingSettings> | |
121 | - </option> | |
122 | - </component> | |
123 | 121 | <component name="ProjectFrameBounds" extendedState="6"> |
124 | - <option name="x" value="-9" /> | |
125 | - <option name="y" value="-9" /> | |
126 | - <option name="width" value="1938" /> | |
127 | - <option name="height" value="1048" /> | |
122 | + <option name="x" value="470" /> | |
123 | + <option name="width" value="980" /> | |
124 | + <option name="height" value="1030" /> | |
125 | + </component> | |
126 | + <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" /> | |
127 | + <component name="ProjectLevelVcsManager"> | |
128 | + <ConfirmationsSetting value="2" id="Add" /> | |
128 | 129 | </component> |
129 | - <component name="ProjectId" id="1P2xIFeseJehotA5kuRjbIbfKQa" /> | |
130 | 130 | <component name="ProjectView"> |
131 | 131 | <navigator proportions="" version="1"> |
132 | - <flattenPackages ProjectPane="false" /> | |
133 | - <hideEmptyPackages ProjectPane="false" /> | |
134 | 132 | <foldersAlwaysOnTop value="true" /> |
135 | 133 | </navigator> |
136 | 134 | <panes> |
137 | 135 | <pane id="PackagesPane" /> |
138 | - <pane id="ProjectPane" /> | |
139 | 136 | <pane id="Scope" /> |
137 | + <pane id="ProjectPane"> | |
138 | + <subPane> | |
139 | + <expand> | |
140 | + <path> | |
141 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
142 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
143 | + </path> | |
144 | + <path> | |
145 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
146 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
147 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
148 | + </path> | |
149 | + <path> | |
150 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
151 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
152 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
153 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
154 | + </path> | |
155 | + <path> | |
156 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
157 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
158 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
159 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
160 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
161 | + </path> | |
162 | + <path> | |
163 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
164 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
165 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
166 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
167 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
168 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
169 | + </path> | |
170 | + <path> | |
171 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
172 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
173 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
174 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
175 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
176 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
177 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
178 | + </path> | |
179 | + <path> | |
180 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
181 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
182 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
183 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
184 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
185 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
186 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
187 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
188 | + </path> | |
189 | + <path> | |
190 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
191 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
192 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
193 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
194 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
195 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
196 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
197 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
198 | + <item name="system" type="462c0819:PsiDirectoryNode" /> | |
199 | + </path> | |
200 | + <path> | |
201 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
202 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
203 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
204 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
205 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
206 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
207 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
208 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
209 | + <item name="system" type="462c0819:PsiDirectoryNode" /> | |
210 | + <item name="user" type="462c0819:PsiDirectoryNode" /> | |
211 | + </path> | |
212 | + <path> | |
213 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
214 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
215 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
216 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
217 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
218 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
219 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
220 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
221 | + <item name="system" type="462c0819:PsiDirectoryNode" /> | |
222 | + <item name="user" type="462c0819:PsiDirectoryNode" /> | |
223 | + <item name="controller" type="462c0819:PsiDirectoryNode" /> | |
224 | + </path> | |
225 | + <path> | |
226 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
227 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
228 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
229 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
230 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
231 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
232 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
233 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
234 | + <item name="system" type="462c0819:PsiDirectoryNode" /> | |
235 | + <item name="user" type="462c0819:PsiDirectoryNode" /> | |
236 | + <item name="domain" type="462c0819:PsiDirectoryNode" /> | |
237 | + </path> | |
238 | + <path> | |
239 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
240 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
241 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
242 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
243 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
244 | + </path> | |
245 | + <path> | |
246 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
247 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
248 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
249 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
250 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
251 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
252 | + </path> | |
253 | + <path> | |
254 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
255 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
256 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
257 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
258 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
259 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
260 | + <item name="system" type="462c0819:PsiDirectoryNode" /> | |
261 | + </path> | |
262 | + <path> | |
263 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
264 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
265 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
266 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
267 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
268 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
269 | + <item name="system" type="462c0819:PsiDirectoryNode" /> | |
270 | + <item name="user" type="462c0819:PsiDirectoryNode" /> | |
271 | + </path> | |
272 | + </expand> | |
273 | + <select /> | |
274 | + </subPane> | |
275 | + </pane> | |
140 | 276 | </panes> |
141 | 277 | </component> |
142 | 278 | <component name="PropertiesComponent"> |
279 | + <property name="ASKED_ADD_EXTERNAL_FILES" value="true" /> | |
143 | 280 | <property name="DatabaseDriversLRU" value="mysql" /> |
144 | 281 | <property name="RequestMappingsPanelOrder0" value="0" /> |
145 | 282 | <property name="RequestMappingsPanelOrder1" value="1" /> |
... | ... | @@ -148,21 +285,19 @@ |
148 | 285 | <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> |
149 | 286 | <property name="WebServerToolWindowFactoryState" value="false" /> |
150 | 287 | <property name="aspect.path.notification.shown" value="true" /> |
151 | - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1565255020864" /> | |
152 | - <property name="database.console.LAST_STATE" value="true" /> | |
153 | - <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" /> | |
154 | - <property name="project.structure.last.edited" value="Project" /> | |
155 | - <property name="project.structure.proportion" value="0.0" /> | |
156 | - <property name="project.structure.side.proportion" value="0.0" /> | |
288 | + <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" /> | |
289 | + <property name="node.js.detected.package.eslint" value="true" /> | |
290 | + <property name="node.js.detected.package.tslint" value="true" /> | |
291 | + <property name="node.js.path.for.package.eslint" value="project" /> | |
292 | + <property name="node.js.path.for.package.tslint" value="project" /> | |
293 | + <property name="node.js.selected.package.eslint" value="(autodetect)" /> | |
294 | + <property name="node.js.selected.package.tslint" value="(autodetect)" /> | |
157 | 295 | <property name="settings.editor.selected.configurable" value="preferences.pluginManager" /> |
158 | 296 | </component> |
159 | 297 | <component name="RecentsManager"> |
160 | - <key name="CopyClassDialog.RECENTS_KEY"> | |
161 | - <recent name="com.huaheng.pc.config.zoneCapacity.controller" /> | |
162 | - </key> | |
163 | - <key name="CopyFile.RECENT_KEYS"> | |
164 | - <recent name="C:\Users\Administrator\IdeaProjects\wms2\src\main\resources\mybatis\config" /> | |
165 | - <recent name="C:\Users\Administrator\IdeaProjects\wms2\src\main\java\com\huaheng\pc\config" /> | |
298 | + <key name="MoveFile.RECENT_KEYS"> | |
299 | + <recent name="E:\code\wms2\src\main\resources\mybatis\general" /> | |
300 | + <recent name="E:\code\wms2\src\main\resources\mybatis\config" /> | |
166 | 301 | </key> |
167 | 302 | </component> |
168 | 303 | <component name="RunDashboard"> |
... | ... | @@ -177,32 +312,25 @@ |
177 | 312 | </list> |
178 | 313 | </option> |
179 | 314 | </component> |
180 | - <component name="RunManager" selected="Spring Boot.HuaHengApplication"> | |
181 | - <configuration name="CreateCode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> | |
182 | - <option name="MAIN_CLASS_NAME" value="com.huaheng.test.CreateCode" /> | |
315 | + <component name="RunManager"> | |
316 | + <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> | |
183 | 317 | <module name="WMSV1" /> |
184 | - <extension name="coverage"> | |
185 | - <pattern> | |
186 | - <option name="PATTERN" value="com.huaheng.test.*" /> | |
187 | - <option name="ENABLED" value="true" /> | |
188 | - </pattern> | |
189 | - </extension> | |
318 | + <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> | |
319 | + <option name="ALTERNATIVE_JRE_PATH" /> | |
320 | + <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" /> | |
321 | + <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" /> | |
190 | 322 | <method v="2"> |
191 | 323 | <option name="Make" enabled="true" /> |
192 | 324 | </method> |
193 | 325 | </configuration> |
194 | - <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> | |
326 | + <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> | |
195 | 327 | <module name="WMSV1" /> |
196 | 328 | <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> |
329 | + <option name="ALTERNATIVE_JRE_PATH" /> | |
197 | 330 | <method v="2"> |
198 | 331 | <option name="Make" enabled="true" /> |
199 | 332 | </method> |
200 | 333 | </configuration> |
201 | - <recent_temporary> | |
202 | - <list> | |
203 | - <item itemvalue="Application.CreateCode" /> | |
204 | - </list> | |
205 | - </recent_temporary> | |
206 | 334 | </component> |
207 | 335 | <component name="ServiceViewManager"> |
208 | 336 | <option name="allServicesViewState"> |
... | ... | @@ -211,7 +339,7 @@ |
211 | 339 | <expand> |
212 | 340 | <path> |
213 | 341 | <item name="services root" type="e789fda9:ObjectUtils$Sentinel" /> |
214 | - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@5097fb15" type="7427dc5b:ServiceModel$ServiceGroupNode" /> | |
342 | + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" /> | |
215 | 343 | </path> |
216 | 344 | </expand> |
217 | 345 | <select /> |
... | ... | @@ -219,101 +347,63 @@ |
219 | 347 | </serviceView> |
220 | 348 | </option> |
221 | 349 | </component> |
222 | - <component name="StructureViewFactory"> | |
223 | - <option name="ACTIVE_ACTIONS" value=",SHOW_PROPERTIES,SHOW_ANONYMOUS,SHOW_LAMBDA,SHOW_INTERFACES,VISIBILITY_SORTER" /> | |
224 | - </component> | |
225 | 350 | <component name="SvnConfiguration"> |
226 | 351 | <configuration /> |
227 | 352 | </component> |
228 | 353 | <component name="TaskManager"> |
229 | 354 | <task active="true" id="Default" summary="Default task"> |
230 | - <changelist id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="" /> | |
231 | - <created>1563950700252</created> | |
355 | + <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" /> | |
356 | + <created>1565160110910</created> | |
232 | 357 | <option name="number" value="Default" /> |
233 | 358 | <option name="presentableId" value="Default" /> |
234 | - <updated>1563950700252</updated> | |
235 | - <workItem from="1563950701881" duration="73000" /> | |
236 | - <workItem from="1565055472980" duration="9734000" /> | |
237 | - <workItem from="1565078101170" duration="2642000" /> | |
238 | - <workItem from="1565080771601" duration="951000" /> | |
239 | - <workItem from="1565082117731" duration="348000" /> | |
240 | - <workItem from="1565085916295" duration="323000" /> | |
241 | - <workItem from="1565087331641" duration="170000" /> | |
242 | - <workItem from="1565138504203" duration="3006000" /> | |
243 | - <workItem from="1565162212626" duration="6726000" /> | |
244 | - <workItem from="1565169755725" duration="2857000" /> | |
245 | - <workItem from="1565242132637" duration="963000" /> | |
246 | - <workItem from="1565244881255" duration="620000" /> | |
247 | - <workItem from="1565245587599" duration="32000" /> | |
248 | - <workItem from="1565245636976" duration="7465000" /> | |
359 | + <updated>1565160110910</updated> | |
360 | + <workItem from="1565160112236" duration="11971000" /> | |
361 | + <workItem from="1565224833241" duration="14642000" /> | |
362 | + <workItem from="1565242153135" duration="1476000" /> | |
363 | + <workItem from="1565259513116" duration="148000" /> | |
364 | + <workItem from="1565311988064" duration="7176000" /> | |
365 | + <workItem from="1565328536669" duration="797000" /> | |
249 | 366 | </task> |
250 | - <task id="LOCAL-00001" summary="用户查询修改"> | |
251 | - <created>1565058322310</created> | |
367 | + <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口"> | |
368 | + <created>1565226427512</created> | |
252 | 369 | <option name="number" value="00001" /> |
253 | 370 | <option name="presentableId" value="LOCAL-00001" /> |
254 | 371 | <option name="project" value="LOCAL" /> |
255 | - <updated>1565058322310</updated> | |
372 | + <updated>1565226427512</updated> | |
256 | 373 | </task> |
257 | - <task id="LOCAL-00002" summary="库区设置编辑"> | |
258 | - <created>1565075790786</created> | |
374 | + <task id="LOCAL-00002" summary="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面"> | |
375 | + <created>1565256884822</created> | |
259 | 376 | <option name="number" value="00002" /> |
260 | 377 | <option name="presentableId" value="LOCAL-00002" /> |
261 | 378 | <option name="project" value="LOCAL" /> |
262 | - <updated>1565075790786</updated> | |
379 | + <updated>1565256884822</updated> | |
263 | 380 | </task> |
264 | - <task id="LOCAL-00003" summary="库区设置编辑"> | |
265 | - <created>1565075857018</created> | |
381 | + <task id="LOCAL-00003" summary="修改库区service"> | |
382 | + <created>1565259481656</created> | |
266 | 383 | <option name="number" value="00003" /> |
267 | 384 | <option name="presentableId" value="LOCAL-00003" /> |
268 | 385 | <option name="project" value="LOCAL" /> |
269 | - <updated>1565075857018</updated> | |
386 | + <updated>1565259481656</updated> | |
270 | 387 | </task> |
271 | - <task id="LOCAL-00004" summary="库区设置编辑"> | |
272 | - <created>1565075883212</created> | |
388 | + <task id="LOCAL-00004" summary="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml"> | |
389 | + <created>1565342188814</created> | |
273 | 390 | <option name="number" value="00004" /> |
274 | 391 | <option name="presentableId" value="LOCAL-00004" /> |
275 | 392 | <option name="project" value="LOCAL" /> |
276 | - <updated>1565075883212</updated> | |
277 | - </task> | |
278 | - <task id="LOCAL-00005" summary="库区设置编辑"> | |
279 | - <created>1565075915322</created> | |
280 | - <option name="number" value="00005" /> | |
281 | - <option name="presentableId" value="LOCAL-00005" /> | |
282 | - <option name="project" value="LOCAL" /> | |
283 | - <updated>1565075915322</updated> | |
284 | - </task> | |
285 | - <task id="LOCAL-00006" summary="回退"> | |
286 | - <created>1565081123490</created> | |
287 | - <option name="number" value="00006" /> | |
288 | - <option name="presentableId" value="LOCAL-00006" /> | |
289 | - <option name="project" value="LOCAL" /> | |
290 | - <updated>1565081123490</updated> | |
291 | - </task> | |
292 | - <task id="LOCAL-00007" summary="zone修改"> | |
293 | - <created>1565172969186</created> | |
294 | - <option name="number" value="00007" /> | |
295 | - <option name="presentableId" value="LOCAL-00007" /> | |
296 | - <option name="project" value="LOCAL" /> | |
297 | - <updated>1565172969186</updated> | |
298 | - </task> | |
299 | - <task id="LOCAL-00008" summary="回退"> | |
300 | - <created>1565332810976</created> | |
301 | - <option name="number" value="00008" /> | |
302 | - <option name="presentableId" value="LOCAL-00008" /> | |
303 | - <option name="project" value="LOCAL" /> | |
304 | - <updated>1565332810976</updated> | |
393 | + <updated>1565342188814</updated> | |
305 | 394 | </task> |
306 | - <option name="localTasksCounter" value="9" /> | |
395 | + <option name="localTasksCounter" value="5" /> | |
307 | 396 | <servers /> |
308 | 397 | </component> |
309 | 398 | <component name="TimeTrackingManager"> |
310 | - <option name="totallyTimeSpent" value="21886000" /> | |
399 | + <option name="totallyTimeSpent" value="893000" /> | |
311 | 400 | </component> |
312 | 401 | <component name="ToolWindowManager"> |
313 | 402 | <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> |
403 | + <editor active="true" /> | |
314 | 404 | <layout> |
315 | - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.491453" visible="true" weight="0.2727882" /> | |
316 | - <window_info id="Structure" order="1" sideWeight="0.508547" side_tool="true" weight="0.2600536" /> | |
405 | + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2533512" /> | |
406 | + <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> | |
317 | 407 | <window_info id="Designer" order="2" /> |
318 | 408 | <window_info id="Image Layers" order="3" /> |
319 | 409 | <window_info id="Capture Tool" order="4" /> |
... | ... | @@ -321,28 +411,27 @@ |
321 | 411 | <window_info id="Favorites" order="6" side_tool="true" /> |
322 | 412 | <window_info id="Web" order="7" side_tool="true" /> |
323 | 413 | <window_info anchor="bottom" id="Message" order="0" /> |
324 | - <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" /> | |
325 | - <window_info anchor="bottom" id="Run" order="2" /> | |
326 | - <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.25354108" /> | |
414 | + <window_info anchor="bottom" id="Find" order="1" /> | |
415 | + <window_info anchor="bottom" id="Run" order="2" weight="0.25212464" /> | |
416 | + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> | |
327 | 417 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> |
328 | 418 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> |
329 | - <window_info anchor="bottom" id="TODO" order="6" /> | |
330 | - <window_info anchor="bottom" id="Spring" order="7" /> | |
331 | - <window_info anchor="bottom" id="Terminal" order="8" /> | |
419 | + <window_info anchor="bottom" id="TODO" order="6" weight="0.3286119" /> | |
420 | + <window_info anchor="bottom" id="Spring" order="7" weight="0.3286119" /> | |
421 | + <window_info anchor="bottom" id="Terminal" order="8" weight="0.3286119" /> | |
332 | 422 | <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" /> |
333 | - <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5010661" side_tool="true" weight="0.329718" /> | |
334 | - <window_info anchor="bottom" id="Java Enterprise" order="11" /> | |
335 | - <window_info anchor="bottom" id="Database Changes" order="12" show_stripe_button="false" /> | |
336 | - <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.4989339" weight="0.3281471" /> | |
337 | - <window_info anchor="bottom" id="Messages" order="14" weight="0.3286119" /> | |
338 | - <window_info anchor="bottom" id="Database Console" order="15" weight="0.3286119" /> | |
423 | + <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> | |
424 | + <window_info anchor="bottom" id="Messages" order="11" /> | |
425 | + <window_info anchor="bottom" id="Java Enterprise" order="12" weight="0.3286119" /> | |
426 | + <window_info anchor="bottom" id="Database Changes" order="13" weight="0.3286119" /> | |
427 | + <window_info active="true" anchor="bottom" id="Version Control" order="14" visible="true" weight="0.42351276" /> | |
339 | 428 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> |
340 | 429 | <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> |
341 | 430 | <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> |
342 | - <window_info anchor="right" id="Maven" order="3" /> | |
431 | + <window_info anchor="right" id="Maven" order="3" weight="0.3297587" /> | |
343 | 432 | <window_info anchor="right" id="Palette" order="4" /> |
344 | 433 | <window_info anchor="right" id="Capture Analysis" order="5" /> |
345 | - <window_info anchor="right" id="Database" order="6" weight="0.26876676" /> | |
434 | + <window_info anchor="right" id="Database" order="6" /> | |
346 | 435 | <window_info anchor="right" id="Palette	" order="7" /> |
347 | 436 | <window_info anchor="right" id="Theme Preview" order="8" /> |
348 | 437 | <window_info anchor="right" id="Bean Validation" order="9" /> |
... | ... | @@ -363,25 +452,7 @@ |
363 | 452 | <option name="RECENTLY_FILTERED_BRANCH_GROUPS"> |
364 | 453 | <collection /> |
365 | 454 | </option> |
366 | - <option name="FILTERS"> | |
367 | - <map> | |
368 | - <entry key="branch"> | |
369 | - <value> | |
370 | - <list> | |
371 | - <option value="origin/develop" /> | |
372 | - </list> | |
373 | - </value> | |
374 | - </entry> | |
375 | - </map> | |
376 | - </option> | |
377 | - <option name="COLUMN_ORDER"> | |
378 | - <list> | |
379 | - <option value="0" /> | |
380 | - <option value="1" /> | |
381 | - <option value="2" /> | |
382 | - <option value="3" /> | |
383 | - </list> | |
384 | - </option> | |
455 | + <option name="COLUMN_ORDER" /> | |
385 | 456 | </State> |
386 | 457 | </value> |
387 | 458 | </entry> |
... | ... | @@ -391,578 +462,22 @@ |
391 | 462 | <map> |
392 | 463 | <entry key="Branch"> |
393 | 464 | <value> |
394 | - <list> | |
395 | - <RecentGroup> | |
396 | - <option name="FILTER_VALUES"> | |
397 | - <option value="origin/develop" /> | |
398 | - </option> | |
399 | - </RecentGroup> | |
400 | - </list> | |
465 | + <list /> | |
466 | + </value> | |
467 | + </entry> | |
468 | + <entry key="User"> | |
469 | + <value> | |
470 | + <list /> | |
401 | 471 | </value> |
402 | 472 | </entry> |
403 | 473 | </map> |
404 | 474 | </option> |
405 | 475 | </component> |
406 | 476 | <component name="VcsManagerConfiguration"> |
407 | - <MESSAGE value="用户查询修改" /> | |
408 | - <MESSAGE value="库区设置编辑" /> | |
409 | - <MESSAGE value="zone修改" /> | |
410 | - <MESSAGE value="回退" /> | |
411 | - <option name="LAST_COMMIT_MESSAGE" value="回退" /> | |
412 | - </component> | |
413 | - <component name="XDebuggerManager"> | |
414 | - <breakpoint-manager> | |
415 | - <breakpoints> | |
416 | - <line-breakpoint enabled="true" type="java-line"> | |
417 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java</url> | |
418 | - <line>52</line> | |
419 | - <properties /> | |
420 | - <option name="timeStamp" value="11" /> | |
421 | - </line-breakpoint> | |
422 | - <line-breakpoint enabled="true" type="java-line"> | |
423 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java</url> | |
424 | - <line>56</line> | |
425 | - <properties /> | |
426 | - <option name="timeStamp" value="13" /> | |
427 | - </line-breakpoint> | |
428 | - </breakpoints> | |
429 | - </breakpoint-manager> | |
430 | - </component> | |
431 | - <component name="antWorkspaceConfiguration"> | |
432 | - <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> | |
433 | - <option name="FILTER_TARGETS" value="false" /> | |
434 | - </component> | |
435 | - <component name="editorHistoryManager"> | |
436 | - <entry file="file://$PROJECT_DIR$/pom.xml"> | |
437 | - <provider selected="true" editor-type-id="text-editor" /> | |
438 | - </entry> | |
439 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/domain/Company.java"> | |
440 | - <provider selected="true" editor-type-id="text-editor"> | |
441 | - <state relative-caret-position="100"> | |
442 | - <caret line="11" selection-start-line="11" selection-end-line="11" /> | |
443 | - </state> | |
444 | - </provider> | |
445 | - </entry> | |
446 | - <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties"> | |
447 | - <provider selected="true" editor-type-id="text-editor"> | |
448 | - <state relative-caret-position="-2585"> | |
449 | - <caret line="22" column="14" lean-forward="true" selection-start-line="22" selection-start-column="14" selection-end-line="22" selection-end-column="14" /> | |
450 | - </state> | |
451 | - </provider> | |
452 | - </entry> | |
453 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/zone/controller/ZoneController.java" /> | |
454 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java"> | |
455 | - <provider selected="true" editor-type-id="text-editor"> | |
456 | - <state relative-caret-position="1625"> | |
457 | - <caret line="79" column="22" selection-start-line="79" selection-start-column="22" selection-end-line="79" selection-end-column="22" /> | |
458 | - </state> | |
459 | - </provider> | |
460 | - </entry> | |
461 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java"> | |
462 | - <provider selected="true" editor-type-id="text-editor"> | |
463 | - <state relative-caret-position="245"> | |
464 | - <caret line="16" column="22" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" /> | |
465 | - </state> | |
466 | - </provider> | |
467 | - </entry> | |
468 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/general/company/company.html"> | |
469 | - <provider selected="true" editor-type-id="text-editor"> | |
470 | - <state relative-caret-position="-150" /> | |
471 | - </provider> | |
472 | - </entry> | |
473 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/menu/mapper/MenuMapper.java"> | |
474 | - <provider selected="true" editor-type-id="text-editor"> | |
475 | - <state relative-caret-position="375"> | |
476 | - <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" /> | |
477 | - <folding> | |
478 | - <element signature="imports" expanded="true" /> | |
479 | - </folding> | |
480 | - </state> | |
481 | - </provider> | |
482 | - </entry> | |
483 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/menu/service/MenuServiceImpl.java"> | |
484 | - <provider selected="true" editor-type-id="text-editor"> | |
485 | - <state relative-caret-position="250"> | |
486 | - <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" /> | |
487 | - </state> | |
488 | - </provider> | |
489 | - </entry> | |
490 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/general/ZoneMapper.xml" /> | |
491 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java"> | |
492 | - <provider selected="true" editor-type-id="text-editor"> | |
493 | - <state relative-caret-position="168"> | |
494 | - <caret line="100" column="20" selection-start-line="100" selection-start-column="20" selection-end-line="100" selection-end-column="20" /> | |
495 | - </state> | |
496 | - </provider> | |
497 | - </entry> | |
498 | - <entry file="jar://C:/Program Files (x86)/jdk1.9/src.zip!/java/lang/Integer.java"> | |
499 | - <provider selected="true" editor-type-id="text-editor"> | |
500 | - <state relative-caret-position="124"> | |
501 | - <caret line="51" column="19" selection-start-line="51" selection-start-column="19" selection-end-line="51" selection-end-column="19" /> | |
502 | - </state> | |
503 | - </provider> | |
504 | - </entry> | |
505 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/security/ShiroUtils.java"> | |
506 | - <provider selected="true" editor-type-id="text-editor"> | |
507 | - <state relative-caret-position="141"> | |
508 | - <caret line="78" column="32" lean-forward="true" selection-start-line="78" selection-start-column="32" selection-end-line="78" selection-end-column="32" /> | |
509 | - </state> | |
510 | - </provider> | |
511 | - </entry> | |
512 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html"> | |
513 | - <provider selected="true" editor-type-id="text-editor"> | |
514 | - <state relative-caret-position="-1187"> | |
515 | - <caret line="72" column="58" selection-start-line="72" selection-start-column="58" selection-end-line="72" selection-end-column="58" /> | |
516 | - </state> | |
517 | - </provider> | |
518 | - </entry> | |
519 | - <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/login.js"> | |
520 | - <provider selected="true" editor-type-id="text-editor"> | |
521 | - <state relative-caret-position="225"> | |
522 | - <caret line="21" column="66" selection-start-line="21" selection-start-column="62" selection-end-line="21" selection-end-column="66" /> | |
523 | - </state> | |
524 | - </provider> | |
525 | - </entry> | |
526 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/general/WarehouseMapper.xml"> | |
527 | - <provider selected="true" editor-type-id="text-editor"> | |
528 | - <state relative-caret-position="2553"> | |
529 | - <caret line="130" column="11" selection-start-line="130" selection-start-column="11" selection-end-line="130" selection-end-column="11" /> | |
530 | - </state> | |
531 | - </provider> | |
532 | - </entry> | |
533 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/mapper/WarehouseMapper.java"> | |
534 | - <provider selected="true" editor-type-id="text-editor"> | |
535 | - <state relative-caret-position="175"> | |
536 | - <caret line="12" selection-start-line="12" selection-end-line="12" /> | |
537 | - </state> | |
538 | - </provider> | |
539 | - </entry> | |
540 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseServiceImpl.java"> | |
541 | - <provider selected="true" editor-type-id="text-editor"> | |
542 | - <state relative-caret-position="200"> | |
543 | - <caret line="19" column="21" selection-start-line="19" selection-start-column="21" selection-end-line="19" selection-end-column="21" /> | |
544 | - </state> | |
545 | - </provider> | |
546 | - </entry> | |
547 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseService.java"> | |
548 | - <provider selected="true" editor-type-id="text-editor"> | |
549 | - <state relative-caret-position="200"> | |
550 | - <caret line="12" column="91" selection-start-line="12" selection-start-column="91" selection-end-line="12" selection-end-column="91" /> | |
551 | - </state> | |
552 | - </provider> | |
553 | - </entry> | |
554 | - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.0.7.RELEASE/spring-web-5.0.7.RELEASE.jar!/org/springframework/web/method/support/InvocableHandlerMethod.class"> | |
555 | - <provider selected="true" editor-type-id="text-editor"> | |
556 | - <state relative-caret-position="135"> | |
557 | - <caret line="127" selection-start-line="127" selection-end-line="127" /> | |
558 | - </state> | |
559 | - </provider> | |
560 | - </entry> | |
561 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java"> | |
562 | - <provider selected="true" editor-type-id="text-editor"> | |
563 | - <state relative-caret-position="149"> | |
564 | - <caret line="25" column="53" selection-start-line="25" selection-start-column="53" selection-end-line="25" selection-end-column="53" /> | |
565 | - </state> | |
566 | - </provider> | |
567 | - </entry> | |
568 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/LoginController.java"> | |
569 | - <provider selected="true" editor-type-id="text-editor"> | |
570 | - <state relative-caret-position="252"> | |
571 | - <caret line="92" selection-start-line="92" selection-end-line="92" /> | |
572 | - </state> | |
573 | - </provider> | |
574 | - </entry> | |
575 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml"> | |
576 | - <provider selected="true" editor-type-id="text-editor"> | |
577 | - <state relative-caret-position="185"> | |
578 | - <caret line="188" column="26" selection-start-line="188" selection-start-column="26" selection-end-line="188" selection-end-column="26" /> | |
579 | - </state> | |
580 | - </provider> | |
581 | - </entry> | |
582 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserMapper.java"> | |
583 | - <provider selected="true" editor-type-id="text-editor"> | |
584 | - <state relative-caret-position="135"> | |
585 | - <caret line="132" column="37" selection-start-line="132" selection-start-column="37" selection-end-line="132" selection-end-column="37" /> | |
586 | - </state> | |
587 | - </provider> | |
588 | - </entry> | |
589 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java"> | |
590 | - <provider selected="true" editor-type-id="text-editor"> | |
591 | - <state> | |
592 | - <caret line="471" column="43" selection-start-line="471" selection-start-column="43" selection-end-line="471" selection-end-column="43" /> | |
593 | - </state> | |
594 | - </provider> | |
595 | - </entry> | |
596 | - <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/d0963ee7-a6e7-4e61-9f9b-2a0b4ecc4332/console.sql"> | |
597 | - <provider selected="true" editor-type-id="text-editor" /> | |
598 | - </entry> | |
599 | - <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties"> | |
600 | - <provider selected="true" editor-type-id="text-editor"> | |
601 | - <state relative-caret-position="275"> | |
602 | - <caret line="11" column="51" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="51" /> | |
603 | - </state> | |
604 | - </provider> | |
605 | - </entry> | |
606 | - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.0.7.RELEASE/spring-core-5.0.7.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class"> | |
607 | - <provider selected="true" editor-type-id="text-editor"> | |
608 | - <state relative-caret-position="133"> | |
609 | - <caret line="33" column="110" selection-start-line="33" selection-start-column="110" selection-end-line="33" selection-end-column="110" /> | |
610 | - </state> | |
611 | - </provider> | |
612 | - </entry> | |
613 | - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2-sources.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.java"> | |
614 | - <provider selected="true" editor-type-id="text-editor"> | |
615 | - <state relative-caret-position="158"> | |
616 | - <caret line="198" lean-forward="true" selection-start-line="198" selection-end-line="198" /> | |
617 | - </state> | |
618 | - </provider> | |
619 | - </entry> | |
620 | - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/com/baomidou/mybatisplus/extension/service/impl/ServiceImpl.java"> | |
621 | - <provider selected="true" editor-type-id="text-editor"> | |
622 | - <state relative-caret-position="158"> | |
623 | - <caret line="275" column="32" lean-forward="true" selection-start-line="275" selection-start-column="32" selection-end-line="275" selection-end-column="32" /> | |
624 | - <folding> | |
625 | - <element signature="e#9323#9324#0" expanded="true" /> | |
626 | - <element signature="e#9381#9382#0" expanded="true" /> | |
627 | - <element signature="e#9463#9464#0" expanded="true" /> | |
628 | - <element signature="e#9527#9528#0" expanded="true" /> | |
629 | - </folding> | |
630 | - </state> | |
631 | - </provider> | |
632 | - </entry> | |
633 | - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/com/baomidou/mybatisplus/extension/service/IService.java"> | |
634 | - <provider selected="true" editor-type-id="text-editor"> | |
635 | - <state relative-caret-position="-17"> | |
636 | - <caret line="249" column="7" lean-forward="true" selection-start-line="249" selection-start-column="7" selection-end-line="249" selection-end-column="7" /> | |
637 | - </state> | |
638 | - </provider> | |
639 | - </entry> | |
640 | - <entry file="das://e67b6455-2363-423c-bed8-503129974854/schema/wms_v2/table/zone_capacity" /> | |
641 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/general/container/container.html"> | |
642 | - <provider selected="true" editor-type-id="text-editor"> | |
643 | - <state relative-caret-position="450"> | |
644 | - <caret line="24" column="90" lean-forward="true" selection-start-line="24" selection-start-column="90" selection-end-line="24" selection-end-column="90" /> | |
645 | - </state> | |
646 | - </provider> | |
647 | - </entry> | |
648 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/mapper/ZoneMapper.java"> | |
649 | - <provider selected="true" editor-type-id="text-editor"> | |
650 | - <state relative-caret-position="100"> | |
651 | - <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" /> | |
652 | - </state> | |
653 | - </provider> | |
654 | - </entry> | |
655 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneService.java"> | |
656 | - <provider selected="true" editor-type-id="text-editor"> | |
657 | - <state relative-caret-position="25"> | |
658 | - <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" /> | |
659 | - </state> | |
660 | - </provider> | |
661 | - </entry> | |
662 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneCapacityMapper.xml"> | |
663 | - <provider selected="true" editor-type-id="text-editor"> | |
664 | - <state relative-caret-position="75"> | |
665 | - <caret line="3" column="70" selection-start-line="3" selection-start-column="70" selection-end-line="3" selection-end-column="70" /> | |
666 | - </state> | |
667 | - </provider> | |
668 | - </entry> | |
669 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/ZoneMapper.xml"> | |
670 | - <provider selected="true" editor-type-id="text-editor"> | |
671 | - <state relative-caret-position="353"> | |
672 | - <caret line="26" column="27" selection-start-line="26" selection-start-column="11" selection-end-line="26" selection-end-column="27" /> | |
673 | - </state> | |
674 | - </provider> | |
675 | - </entry> | |
676 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/domain/Zone.java"> | |
677 | - <provider selected="true" editor-type-id="text-editor"> | |
678 | - <state relative-caret-position="253"> | |
679 | - <caret line="123" column="13" lean-forward="true" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" /> | |
680 | - </state> | |
681 | - </provider> | |
682 | - </entry> | |
683 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/domain/ZoneCapacity.java"> | |
684 | - <provider selected="true" editor-type-id="text-editor"> | |
685 | - <state relative-caret-position="-8697"> | |
686 | - <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" /> | |
687 | - <folding> | |
688 | - <element signature="imports" expanded="true" /> | |
689 | - <element signature="e#2856#2857#0" expanded="true" /> | |
690 | - <element signature="e#2881#2882#0" expanded="true" /> | |
691 | - <element signature="e#2918#2919#0" expanded="true" /> | |
692 | - <element signature="e#2946#2947#0" expanded="true" /> | |
693 | - <element signature="e#2986#2987#0" expanded="true" /> | |
694 | - <element signature="e#3022#3023#0" expanded="true" /> | |
695 | - <element signature="e#3080#3081#0" expanded="true" /> | |
696 | - <element signature="e#3130#3131#0" expanded="true" /> | |
697 | - <element signature="e#3168#3169#0" expanded="true" /> | |
698 | - <element signature="e#3202#3203#0" expanded="true" /> | |
699 | - <element signature="e#3256#3257#0" expanded="true" /> | |
700 | - <element signature="e#3302#3303#0" expanded="true" /> | |
701 | - <element signature="e#3341#3342#0" expanded="true" /> | |
702 | - <element signature="e#3376#3377#0" expanded="true" /> | |
703 | - <element signature="e#3432#3433#0" expanded="true" /> | |
704 | - <element signature="e#3480#3481#0" expanded="true" /> | |
705 | - <element signature="e#3519#3520#0" expanded="true" /> | |
706 | - <element signature="e#3554#3555#0" expanded="true" /> | |
707 | - <element signature="e#3610#3611#0" expanded="true" /> | |
708 | - <element signature="e#3658#3659#0" expanded="true" /> | |
709 | - <element signature="e#3697#3698#0" expanded="true" /> | |
710 | - <element signature="e#3732#3733#0" expanded="true" /> | |
711 | - <element signature="e#3788#3789#0" expanded="true" /> | |
712 | - <element signature="e#3836#3837#0" expanded="true" /> | |
713 | - <element signature="e#3875#3876#0" expanded="true" /> | |
714 | - <element signature="e#3910#3911#0" expanded="true" /> | |
715 | - <element signature="e#3966#3967#0" expanded="true" /> | |
716 | - <element signature="e#4014#4015#0" expanded="true" /> | |
717 | - <element signature="e#4051#4052#0" expanded="true" /> | |
718 | - <element signature="e#4084#4085#0" expanded="true" /> | |
719 | - <element signature="e#4136#4137#0" expanded="true" /> | |
720 | - <element signature="e#4180#4181#0" expanded="true" /> | |
721 | - <element signature="e#4214#4215#0" expanded="true" /> | |
722 | - <element signature="e#4243#4244#0" expanded="true" /> | |
723 | - <element signature="e#4288#4289#0" expanded="true" /> | |
724 | - <element signature="e#4324#4325#0" expanded="true" /> | |
725 | - <element signature="e#4358#4359#0" expanded="true" /> | |
726 | - <element signature="e#4387#4388#0" expanded="true" /> | |
727 | - <element signature="e#4432#4433#0" expanded="true" /> | |
728 | - <element signature="e#4468#4469#0" expanded="true" /> | |
729 | - <element signature="e#4500#4501#0" expanded="true" /> | |
730 | - <element signature="e#4530#4531#0" expanded="true" /> | |
731 | - <element signature="e#4574#4575#0" expanded="true" /> | |
732 | - <element signature="e#4612#4613#0" expanded="true" /> | |
733 | - <element signature="e#4648#4649#0" expanded="true" /> | |
734 | - <element signature="e#4680#4681#0" expanded="true" /> | |
735 | - <element signature="e#4730#4731#0" expanded="true" /> | |
736 | - <element signature="e#4772#4773#0" expanded="true" /> | |
737 | - <element signature="e#4808#4809#0" expanded="true" /> | |
738 | - <element signature="e#4842#4843#0" expanded="true" /> | |
739 | - <element signature="e#4894#4895#0" expanded="true" /> | |
740 | - <element signature="e#4940#4941#0" expanded="true" /> | |
741 | - <element signature="e#4980#4981#0" expanded="true" /> | |
742 | - <element signature="e#5016#5017#0" expanded="true" /> | |
743 | - <element signature="e#5074#5075#0" expanded="true" /> | |
744 | - <element signature="e#5124#5125#0" expanded="true" /> | |
745 | - <element signature="e#5159#5160#0" expanded="true" /> | |
746 | - <element signature="e#5189#5190#0" expanded="true" /> | |
747 | - <element signature="e#5236#5237#0" expanded="true" /> | |
748 | - <element signature="e#5274#5275#0" expanded="true" /> | |
749 | - <element signature="e#5309#5310#0" expanded="true" /> | |
750 | - <element signature="e#5340#5341#0" expanded="true" /> | |
751 | - <element signature="e#5388#5389#0" expanded="true" /> | |
752 | - <element signature="e#5428#5429#0" expanded="true" /> | |
753 | - <element signature="e#5463#5464#0" expanded="true" /> | |
754 | - <element signature="e#5494#5495#0" expanded="true" /> | |
755 | - <element signature="e#5542#5543#0" expanded="true" /> | |
756 | - <element signature="e#5582#5583#0" expanded="true" /> | |
757 | - <element signature="e#5617#5618#0" expanded="true" /> | |
758 | - <element signature="e#5648#5649#0" expanded="true" /> | |
759 | - <element signature="e#5696#5697#0" expanded="true" /> | |
760 | - <element signature="e#5736#5737#0" expanded="true" /> | |
761 | - <element signature="e#5771#5772#0" expanded="true" /> | |
762 | - <element signature="e#5802#5803#0" expanded="true" /> | |
763 | - <element signature="e#5850#5851#0" expanded="true" /> | |
764 | - <element signature="e#5890#5891#0" expanded="true" /> | |
765 | - <element signature="e#5925#5926#0" expanded="true" /> | |
766 | - <element signature="e#5956#5957#0" expanded="true" /> | |
767 | - <element signature="e#6004#6005#0" expanded="true" /> | |
768 | - <element signature="e#6044#6045#0" expanded="true" /> | |
769 | - <element signature="e#6079#6080#0" expanded="true" /> | |
770 | - <element signature="e#6110#6111#0" expanded="true" /> | |
771 | - <element signature="e#6158#6159#0" expanded="true" /> | |
772 | - <element signature="e#6198#6199#0" expanded="true" /> | |
773 | - <element signature="e#6233#6234#0" expanded="true" /> | |
774 | - <element signature="e#6264#6265#0" expanded="true" /> | |
775 | - <element signature="e#6312#6313#0" expanded="true" /> | |
776 | - <element signature="e#6352#6353#0" expanded="true" /> | |
777 | - <element signature="e#6387#6388#0" expanded="true" /> | |
778 | - <element signature="e#6418#6419#0" expanded="true" /> | |
779 | - <element signature="e#6466#6467#0" expanded="true" /> | |
780 | - <element signature="e#6506#6507#0" expanded="true" /> | |
781 | - <element signature="e#6545#6546#0" expanded="true" /> | |
782 | - <element signature="e#6580#6581#0" expanded="true" /> | |
783 | - <element signature="e#6636#6637#0" expanded="true" /> | |
784 | - <element signature="e#6684#6685#0" expanded="true" /> | |
785 | - </folding> | |
786 | - </state> | |
787 | - </provider> | |
788 | - </entry> | |
789 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java"> | |
790 | - <provider selected="true" editor-type-id="text-editor"> | |
791 | - <state relative-caret-position="292"> | |
792 | - <caret line="63" selection-start-line="63" selection-end-line="63" /> | |
793 | - </state> | |
794 | - </provider> | |
795 | - </entry> | |
796 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java"> | |
797 | - <provider selected="true" editor-type-id="text-editor"> | |
798 | - <state relative-caret-position="225"> | |
799 | - <caret line="56" selection-start-line="56" selection-end-line="56" /> | |
800 | - </state> | |
801 | - </provider> | |
802 | - </entry> | |
803 | - <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js"> | |
804 | - <provider selected="true" editor-type-id="text-editor"> | |
805 | - <state relative-caret-position="194"> | |
806 | - <caret line="75" column="39" selection-start-line="75" selection-start-column="39" selection-end-line="75" selection-end-column="39" /> | |
807 | - </state> | |
808 | - </provider> | |
809 | - </entry> | |
810 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/zoneCapacity.html"> | |
811 | - <provider selected="true" editor-type-id="text-editor"> | |
812 | - <state relative-caret-position="1460"> | |
813 | - <caret line="128" column="18" selection-start-line="128" selection-start-column="18" selection-end-line="128" selection-end-column="18" /> | |
814 | - </state> | |
815 | - </provider> | |
816 | - </entry> | |
817 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java"> | |
818 | - <provider selected="true" editor-type-id="text-editor"> | |
819 | - <state relative-caret-position="436"> | |
820 | - <caret line="70" column="44" lean-forward="true" selection-start-line="70" selection-start-column="44" selection-end-line="70" selection-end-column="44" /> | |
821 | - <folding> | |
822 | - <element signature="imports" expanded="true" /> | |
823 | - </folding> | |
824 | - </state> | |
825 | - </provider> | |
826 | - </entry> | |
827 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/zone/zone.html"> | |
828 | - <provider selected="true" editor-type-id="text-editor"> | |
829 | - <state relative-caret-position="385"> | |
830 | - <caret line="31" column="65" lean-forward="true" selection-start-line="31" selection-start-column="65" selection-end-line="31" selection-end-column="65" /> | |
831 | - </state> | |
832 | - </provider> | |
833 | - </entry> | |
834 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/mapper/ZoneCapacityMapper.java"> | |
835 | - <provider selected="true" editor-type-id="text-editor"> | |
836 | - <state relative-caret-position="125"> | |
837 | - <caret line="5" column="61" selection-start-line="5" selection-start-column="61" selection-end-line="5" selection-end-column="61" /> | |
838 | - <folding> | |
839 | - <element signature="imports" expanded="true" /> | |
840 | - </folding> | |
841 | - </state> | |
842 | - </provider> | |
843 | - </entry> | |
844 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/service/ZoneServiceImpl.java"> | |
845 | - <provider selected="true" editor-type-id="text-editor"> | |
846 | - <state relative-caret-position="200"> | |
847 | - <caret line="8" column="23" lean-forward="true" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" /> | |
848 | - <folding> | |
849 | - <element signature="imports" expanded="true" /> | |
850 | - </folding> | |
851 | - </state> | |
852 | - </provider> | |
853 | - </entry> | |
854 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/zoneCapacity/add.html"> | |
855 | - <provider selected="true" editor-type-id="text-editor"> | |
856 | - <state relative-caret-position="268"> | |
857 | - <caret line="68" column="37" selection-start-line="68" selection-start-column="37" selection-end-line="68" selection-end-column="37" /> | |
858 | - </state> | |
859 | - </provider> | |
860 | - </entry> | |
861 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityService.java"> | |
862 | - <provider selected="true" editor-type-id="text-editor"> | |
863 | - <state relative-caret-position="200"> | |
864 | - <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" /> | |
865 | - <folding> | |
866 | - <element signature="imports" expanded="true" /> | |
867 | - </folding> | |
868 | - </state> | |
869 | - </provider> | |
870 | - </entry> | |
871 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java"> | |
872 | - <provider selected="true" editor-type-id="text-editor"> | |
873 | - <state relative-caret-position="350"> | |
874 | - <caret line="20" column="43" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" /> | |
875 | - <folding> | |
876 | - <element signature="imports" expanded="true" /> | |
877 | - </folding> | |
878 | - </state> | |
879 | - </provider> | |
880 | - </entry> | |
881 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java"> | |
882 | - <provider selected="true" editor-type-id="text-editor"> | |
883 | - <state relative-caret-position="358"> | |
884 | - <caret line="102" column="5" lean-forward="true" selection-start-line="102" selection-start-column="5" selection-end-line="102" selection-end-column="5" /> | |
885 | - <folding> | |
886 | - <element signature="imports" expanded="true" /> | |
887 | - </folding> | |
888 | - </state> | |
889 | - </provider> | |
890 | - </entry> | |
891 | - </component> | |
892 | - <component name="masterDetails"> | |
893 | - <states> | |
894 | - <state key="ArtifactsStructureConfigurable.UI"> | |
895 | - <settings> | |
896 | - <artifact-editor /> | |
897 | - <splitter-proportions> | |
898 | - <option name="proportions"> | |
899 | - <list> | |
900 | - <option value="0.2" /> | |
901 | - </list> | |
902 | - </option> | |
903 | - </splitter-proportions> | |
904 | - </settings> | |
905 | - </state> | |
906 | - <state key="FacetStructureConfigurable.UI"> | |
907 | - <settings> | |
908 | - <last-edited>Spring</last-edited> | |
909 | - <splitter-proportions> | |
910 | - <option name="proportions"> | |
911 | - <list> | |
912 | - <option value="0.2" /> | |
913 | - </list> | |
914 | - </option> | |
915 | - </splitter-proportions> | |
916 | - </settings> | |
917 | - </state> | |
918 | - <state key="GlobalLibrariesConfigurable.UI"> | |
919 | - <settings> | |
920 | - <splitter-proportions> | |
921 | - <option name="proportions"> | |
922 | - <list> | |
923 | - <option value="0.2" /> | |
924 | - </list> | |
925 | - </option> | |
926 | - </splitter-proportions> | |
927 | - </settings> | |
928 | - </state> | |
929 | - <state key="JdkListConfigurable.UI"> | |
930 | - <settings> | |
931 | - <last-edited>1.8</last-edited> | |
932 | - <splitter-proportions> | |
933 | - <option name="proportions"> | |
934 | - <list> | |
935 | - <option value="0.2" /> | |
936 | - </list> | |
937 | - </option> | |
938 | - </splitter-proportions> | |
939 | - </settings> | |
940 | - </state> | |
941 | - <state key="ModuleStructureConfigurable.UI"> | |
942 | - <settings> | |
943 | - <last-edited>WMSV1</last-edited> | |
944 | - <splitter-proportions> | |
945 | - <option name="proportions"> | |
946 | - <list> | |
947 | - <option value="0.2" /> | |
948 | - <option value="0.6" /> | |
949 | - </list> | |
950 | - </option> | |
951 | - </splitter-proportions> | |
952 | - </settings> | |
953 | - </state> | |
954 | - <state key="ProjectLibrariesConfigurable.UI"> | |
955 | - <settings> | |
956 | - <last-edited>Maven: ch.qos.logback:logback-classic:1.2.3</last-edited> | |
957 | - <splitter-proportions> | |
958 | - <option name="proportions"> | |
959 | - <list> | |
960 | - <option value="0.2" /> | |
961 | - </list> | |
962 | - </option> | |
963 | - </splitter-proportions> | |
964 | - </settings> | |
965 | - </state> | |
966 | - </states> | |
477 | + <MESSAGE value="添加库位、库位类型增删改查接口" /> | |
478 | + <MESSAGE value="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面" /> | |
479 | + <MESSAGE value="修改库区service" /> | |
480 | + <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml" /> | |
481 | + <option name="LAST_COMMIT_MESSAGE" value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml" /> | |
967 | 482 | </component> |
968 | 483 | </project> |
969 | 484 | \ No newline at end of file |
... | ... |
src/main/resources/mybatis/general/CompanyMapper.xml
... | ... | @@ -54,7 +54,7 @@ |
54 | 54 | INNER JOIN warehouse_company wc ON wc.companyId=c.id AND wc.warehouseCode = #{warehouseCode} |
55 | 55 | </select> |
56 | 56 | <select id="selectByWarehouseCode" resultType="com.huaheng.pc.general.company.domain.Company"> |
57 | - select id from company INNER JOIN warehouse_company ON company.id = warehouse_company.companyId | |
57 | + select company.id from company INNER JOIN warehouse_company ON company.id = warehouse_company.companyId | |
58 | 58 | where company.warehouseCode = #{warehouseCode} |
59 | 59 | </select> |
60 | 60 | |
... | ... |
src/main/resources/templates/system/user/edit.html
... | ... | @@ -62,7 +62,7 @@ |
62 | 62 | <label class="col-sm-3 control-label">货主:</label> |
63 | 63 | <div class="col-sm-8"> |
64 | 64 | <label th:each="company:${companys}" class="checkbox-inline i-checks"> |
65 | - <input name="company" type="checkbox" th:value="${company.id}" th:text=" ${company.name}" th:checked="${company.flag}" th:disabled="${company.enable == false}"> | |
65 | + <input name="company" type="checkbox" th:value="${company.id}" th:text=" ${company.name}" th:checked="${company.flag}" > | |
66 | 66 | </label> |
67 | 67 | </div> |
68 | 68 | </div> |
... | ... |