|
|
1
2
3
|
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
|
|
|
4
|
<list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="">
|
|
|
5
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" afterDir="false" />
|
|
|
6
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" afterDir="false" />
|
|
|
7
8
9
10
11
12
13
|
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
|
|
|
14
|
<component name="DatabaseView">
|
|
|
15
|
<option name="SHOW_INTERMEDIATE" value="false" />
|
|
|
16
17
18
19
20
|
<option name="GROUP_DATA_SOURCES" value="true" />
<option name="GROUP_SCHEMA" value="true" />
<option name="GROUP_CONTENTS" value="false" />
<option name="SORT_POSITIONED" value="false" />
<option name="SHOW_EMPTY_GROUPS" value="false" />
|
|
|
21
|
<option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
|
|
|
22
23
24
25
26
27
|
<option name="HIDDEN_KINDS">
<set />
</option>
<expand>
<path>
<item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
|
|
|
28
|
<item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
|
|
|
29
30
31
|
</path>
<path>
<item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
|
|
|
32
|
<item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
|
|
|
33
34
35
36
|
<item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
</path>
<path>
<item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
|
|
|
37
|
<item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
|
|
|
38
39
40
41
42
43
|
<item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
<item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
</path>
</expand>
<select />
</component>
|
|
|
44
45
46
|
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
|
|
|
47
|
<option value="FxmlFile" />
|
|
|
48
|
<option value="Interface" />
|
|
|
49
|
<option value="HTML File" />
|
|
|
50
|
<option value="Class" />
|
|
|
51
52
53
|
</list>
</option>
</component>
|
|
|
54
|
<component name="Git.Settings">
|
|
|
55
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
56
57
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
|
|
|
58
|
<entry key="$PROJECT_DIR$" value="master" />
|
|
|
59
60
|
</map>
</option>
|
|
|
61
|
</component>
|
|
|
62
63
64
|
<component name="IgnoredFileRootStore">
<option name="generatedRoots">
<set>
|
|
|
65
|
<option value="E:\code\wms2\.idea" />
|
|
|
66
67
68
|
</set>
</option>
</component>
|
|
|
69
70
71
|
<component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
|
|
|
72
73
|
</component>
<component name="PropertiesComponent">
|
|
|
74
|
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
|
|
|
75
|
<property name="DatabaseDriversLRU" value="mysql" />
|
|
|
76
|
<property name="DefaultHtmlFileTemplate" value="HTML File" />
|
|
|
77
|
<property name="ExpandSpringBootJavaOptionsPanel" value="true" />
|
|
|
78
79
80
81
|
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
|
|
|
82
83
84
|
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
|
|
|
85
|
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis/config" />
|
|
|
86
87
88
89
90
91
|
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.detected.package.tslint" value="true" />
<property name="node.js.path.for.package.eslint" value="project" />
<property name="node.js.path.for.package.tslint" value="project" />
<property name="node.js.selected.package.eslint" value="(autodetect)" />
<property name="node.js.selected.package.tslint" value="(autodetect)" />
|
|
|
92
|
<property name="nodejs_package_manager_path" value="npm" />
|
|
|
93
94
95
|
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.0" />
|
|
|
96
|
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
|
|
|
97
|
</component>
|
|
|
98
|
<component name="RecentsManager">
|
|
|
99
100
101
102
|
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\code\wms2\src\main\resources\mybatis\config" />
<recent name="E:\code\wms2\src\main\java\com\huaheng\pc\config" />
<recent name="E:\code\wms2\src\main\resources\static\ajax\libs\layui\lay\modules" />
|
|
|
103
104
|
<recent name="E:\code\wms2\target\classes\static\file" />
<recent name="E:\code\wms2\src\main\resources\static\file" />
|
|
|
105
106
107
108
109
|
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\code\wms2\src\main\resources\templates\general\carrier" />
<recent name="E:\code\wms2\src\main\resources\mybatis\general" />
<recent name="E:\code\wms2\src\main\resources\mybatis\config" />
|
|
|
110
|
</key>
|
|
|
111
|
</component>
|
|
|
112
|
<component name="RunDashboard">
|
|
|
113
114
115
116
117
|
<option name="configurationTypes">
<set>
<option value="SpringBootApplicationConfigurationType" />
</set>
</option>
|
|
|
118
119
120
121
122
123
124
125
126
127
128
|
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
|
|
|
129
|
<component name="RunManager">
|
|
|
130
|
<configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
|
|
131
|
<module name="huaheng" />
|
|
|
132
133
134
135
|
<option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
<option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
|
|
|
136
137
138
139
|
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
|
|
|
140
|
<configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
|
|
141
142
|
<module name="WMSV1" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
|
|
|
143
|
<option name="ALTERNATIVE_JRE_PATH" />
|
|
|
144
145
146
147
148
|
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
|
|
|
149
150
151
|
<component name="ServiceViewManager">
<option name="allServicesViewState">
<serviceView>
|
|
|
152
|
<option name="contentProportion" value="0.18875067" />
|
|
|
153
|
<treeState>
|
|
|
154
155
156
|
<expand>
<path>
<item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
|
|
|
157
|
<item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@dbb4d4b" type="7427dc5b:ServiceModel$ServiceGroupNode" />
|
|
|
158
159
|
</path>
</expand>
|
|
|
160
161
162
163
164
|
<select />
</treeState>
</serviceView>
</option>
</component>
|
|
|
165
166
167
168
169
|
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
|
|
|
170
|
<changelist id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="" />
|
|
|
171
|
<created>1565160110910</created>
|
|
|
172
173
|
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
|
|
|
174
175
176
177
178
179
180
|
<updated>1565160110910</updated>
<workItem from="1565160112236" duration="11971000" />
<workItem from="1565224833241" duration="14642000" />
<workItem from="1565242153135" duration="1476000" />
<workItem from="1565259513116" duration="148000" />
<workItem from="1565311988064" duration="7176000" />
<workItem from="1565328536669" duration="797000" />
|
|
|
181
|
<workItem from="1565345715376" duration="452000" />
|
|
|
182
|
<workItem from="1565570424829" duration="11663000" />
|
|
|
183
184
|
<workItem from="1565587737758" duration="12961000" />
<workItem from="1565657307503" duration="115000" />
|
|
|
185
|
<workItem from="1565657439247" duration="2447000" />
|
|
|
186
187
|
<workItem from="1565662229227" duration="20296000" />
<workItem from="1565691345079" duration="6000" />
|
|
|
188
189
190
191
192
193
194
195
|
<workItem from="1565743087352" duration="10121000" />
<workItem from="1565760941070" duration="6738000" />
<workItem from="1565768341327" duration="2970000" />
<workItem from="1565771864886" duration="599000" />
<workItem from="1565772469694" duration="23000" />
<workItem from="1565772518459" duration="4348000" />
<workItem from="1565829438280" duration="3502000" />
<workItem from="1565832950552" duration="86000" />
|
|
|
196
|
<workItem from="1565833039573" duration="288000" />
|
|
|
197
|
<workItem from="1565833342181" duration="13946000" />
|
|
|
198
199
|
<workItem from="1565936336169" duration="3845000" />
<workItem from="1565941296716" duration="6217000" />
|
|
|
200
|
<workItem from="1566175534262" duration="11506000" />
|
|
|
201
|
</task>
|
|
|
202
203
|
<task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
<created>1565226427512</created>
|
|
|
204
205
206
|
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
|
|
|
207
|
<updated>1565226427512</updated>
|
|
|
208
|
</task>
|
|
|
209
210
|
<task id="LOCAL-00002" summary="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面">
<created>1565256884822</created>
|
|
|
211
212
213
|
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
|
|
|
214
|
<updated>1565256884822</updated>
|
|
|
215
|
</task>
|
|
|
216
217
|
<task id="LOCAL-00003" summary="修改库区service">
<created>1565259481656</created>
|
|
|
218
219
220
|
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
|
|
|
221
|
<updated>1565259481656</updated>
|
|
|
222
|
</task>
|
|
|
223
224
225
226
227
228
229
|
<task id="LOCAL-00004" summary="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml">
<created>1565342188814</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1565342188814</updated>
</task>
|
|
|
230
231
232
233
234
235
236
|
<task id="LOCAL-00005" summary="添加userWarehouse">
<created>1565571202923</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1565571202923</updated>
</task>
|
|
|
237
238
239
240
241
242
243
|
<task id="LOCAL-00006" summary="添加containerCapacity">
<created>1565578920011</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1565578920011</updated>
</task>
|
|
|
244
245
246
247
248
249
250
251
252
253
254
255
256
257
|
<task id="LOCAL-00007" summary="添加物料页面">
<created>1565593159103</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1565593159103</updated>
</task>
<task id="LOCAL-00008" summary="添加商品详情">
<created>1565598117104</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1565598117104</updated>
</task>
|
|
|
258
259
260
261
262
263
264
|
<task id="LOCAL-00009" summary="添加物料时判断单位是否存在，不存在则添加物料单位">
<created>1565659672152</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1565659672152</updated>
</task>
|
|
|
265
266
267
268
269
270
271
|
<task id="LOCAL-00010" summary="添加task实体类">
<created>1565665525508</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1565665525508</updated>
</task>
|
|
|
272
273
274
275
276
277
278
|
<task id="LOCAL-00011" summary="添加商品、商品详情页面">
<created>1565686619774</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1565686619774</updated>
</task>
|
|
|
279
280
281
282
283
284
285
|
<task id="LOCAL-00012" summary="添加承运商">
<created>1565745258070</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1565745258070</updated>
</task>
|
|
|
286
287
288
289
290
291
292
|
<task id="LOCAL-00013" summary="添加物料导入、导出模板，添加Excel导入导出配置文件">
<created>1565833218584</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1565833218584</updated>
</task>
|
|
|
293
294
295
296
297
298
299
|
<task id="LOCAL-00014" summary="添加仓库配置">
<created>1566176469173</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1566176469173</updated>
</task>
|
|
|
300
301
302
303
304
305
306
307
|
<task id="LOCAL-00015" summary="添加物料单位，重新生成库存主表和库存明细表">
<created>1566192821310</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1566192821310</updated>
</task>
<option name="localTasksCounter" value="16" />
|
|
|
308
309
310
311
312
|
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
|
|
|
313
314
315
316
317
318
|
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
|
|
|
319
|
<option name="COLUMN_ORDER" />
|
|
|
320
321
322
323
324
|
</State>
</value>
</entry>
</map>
</option>
|
|
|
325
326
327
328
329
330
331
332
333
334
335
336
337
338
|
<option name="RECENT_FILTERS">
<map>
<entry key="Branch">
<value>
<list />
</value>
</entry>
<entry key="User">
<value>
<list />
</value>
</entry>
</map>
</option>
|
|
|
339
340
|
</component>
<component name="VcsManagerConfiguration">
|
|
|
341
342
343
|
<MESSAGE value="添加库位、库位类型增删改查接口" />
<MESSAGE value="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面" />
<MESSAGE value="修改库区service" />
|
|
|
344
|
<MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml" />
|
|
|
345
|
<MESSAGE value="添加userWarehouse" />
|
|
|
346
|
<MESSAGE value="添加containerCapacity" />
|
|
|
347
348
|
<MESSAGE value="添加物料页面" />
<MESSAGE value="添加商品详情" />
|
|
|
349
|
<MESSAGE value="添加物料时判断单位是否存在，不存在则添加物料单位" />
|
|
|
350
|
<MESSAGE value="添加task实体类" />
|
|
|
351
|
<MESSAGE value="添加商品、商品详情页面" />
|
|
|
352
|
<MESSAGE value="添加承运商" />
|
|
|
353
|
<MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" />
|
|
|
354
|
<MESSAGE value="添加仓库配置" />
|
|
|
355
356
|
<MESSAGE value="添加物料单位，重新生成库存主表和库存明细表" />
<option name="LAST_COMMIT_MESSAGE" value="添加物料单位，重新生成库存主表和库存明细表" />
|
|
|
357
358
359
360
361
|
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
|
|
|
362
363
364
|
<url>file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/poi/ExcelUtil.java</url>
<line>302</line>
<option name="timeStamp" value="12" />
|
|
|
365
|
</line-breakpoint>
|
|
|
366
|
<line-breakpoint enabled="true" type="java-line">
|
|
|
367
368
369
|
<url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java</url>
<line>66</line>
<option name="timeStamp" value="24" />
|
|
|
370
|
</line-breakpoint>
|
|
|
371
372
373
374
375
|
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/controllerAdvice/MyControllerAdvice.java</url>
<line>26</line>
<option name="timeStamp" value="25" />
</line-breakpoint>
|
|
|
376
377
|
</breakpoints>
</breakpoint-manager>
|
|
|
378
|
</component>
|
|
|
379
|
</project>
|
