|
|
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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
6
7
8
9
10
11
12
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/domain/Material.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/domain/Material.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/materialUnit/service/MaterialUnitService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/materialUnit/service/MaterialUnitService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/materialUnit/service/MaterialUnitServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/materialUnit/service/MaterialUnitServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/role/domain/Role.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/role/domain/Role.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java" afterDir="false" />
|
|
|
13
|
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/material/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/material/add.html" afterDir="false" />
|
|
|
14
|
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/material/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/material/edit.html" afterDir="false" />
|
|
|
15
16
17
18
19
20
21
|
</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>
|
|
|
22
|
<component name="DatabaseView">
|
|
|
23
|
<option name="SHOW_INTERMEDIATE" value="false" />
|
|
|
24
25
26
27
28
|
<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" />
|
|
|
29
|
<option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
|
|
|
30
31
32
33
34
35
|
<option name="HIDDEN_KINDS">
<set />
</option>
<expand>
<path>
<item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
|
|
|
36
|
<item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
|
|
|
37
38
39
|
</path>
<path>
<item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
|
|
|
40
|
<item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
|
|
|
41
42
43
44
|
<item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
</path>
<path>
<item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
|
|
|
45
|
<item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
|
|
|
46
47
48
|
<item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
<item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
</path>
|
|
|
49
50
51
52
53
54
55
|
<path>
<item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
<item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
<item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
<item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
<item name="company: table" type="285a2a93:MysqlImplModel$Table" />
</path>
|
|
|
56
57
58
|
</expand>
<select />
</component>
|
|
|
59
60
61
62
63
64
65
|
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
</list>
</option>
</component>
|
|
|
66
|
<component name="Git.Settings">
|
|
|
67
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
68
69
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
|
|
|
70
|
<entry key="$PROJECT_DIR$" value="master" />
|
|
|
71
72
|
</map>
</option>
|
|
|
73
|
</component>
|
|
|
74
75
76
|
<component name="IgnoredFileRootStore">
<option name="generatedRoots">
<set>
|
|
|
77
|
<option value="E:\code\wms2\.idea" />
|
|
|
78
79
80
|
</set>
</option>
</component>
|
|
|
81
82
83
|
<component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
|
|
|
84
85
|
</component>
<component name="PropertiesComponent">
|
|
|
86
|
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
|
|
|
87
|
<property name="DatabaseDriversLRU" value="mysql" />
|
|
|
88
|
<property name="ExpandSpringBootJavaOptionsPanel" value="true" />
|
|
|
89
90
91
92
|
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
<property name="RequestMappingsPanelWidth0" value="75" />
<property name="RequestMappingsPanelWidth1" value="75" />
|
|
|
93
94
95
|
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
|
|
|
96
97
98
99
100
101
102
|
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" />
<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)" />
|
|
|
103
|
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
|
|
|
104
|
</component>
|
|
|
105
|
<component name="RecentsManager">
|
|
|
106
107
108
|
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\code\wms2\src\main\resources\mybatis\general" />
<recent name="E:\code\wms2\src\main\resources\mybatis\config" />
|
|
|
109
110
|
</key>
</component>
|
|
|
111
|
<component name="RunDashboard">
|
|
|
112
113
114
115
116
|
<option name="configurationTypes">
<set>
<option value="SpringBootApplicationConfigurationType" />
</set>
</option>
|
|
|
117
118
119
120
121
122
123
124
125
126
127
|
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
|
|
|
128
|
<component name="RunManager">
|
|
|
129
|
<configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
|
|
130
|
<module name="huaheng" />
|
|
|
131
132
133
134
|
<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" />
|
|
|
135
136
137
138
|
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
|
|
|
139
|
<configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
|
|
|
140
141
|
<module name="WMSV1" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
|
|
|
142
|
<option name="ALTERNATIVE_JRE_PATH" />
|
|
|
143
144
145
146
147
|
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
|
|
|
148
149
150
|
<component name="ServiceViewManager">
<option name="allServicesViewState">
<serviceView>
|
|
|
151
|
<option name="contentProportion" value="0.18875067" />
|
|
|
152
|
<treeState>
|
|
|
153
154
155
|
<expand>
<path>
<item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
|
|
|
156
|
<item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@21a8d0c6" type="7427dc5b:ServiceModel$ServiceGroupNode" />
|
|
|
157
158
|
</path>
</expand>
|
|
|
159
160
161
162
163
|
<select />
</treeState>
</serviceView>
</option>
</component>
|
|
|
164
165
166
167
168
|
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
|
|
|
169
|
<changelist id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="" />
|
|
|
170
|
<created>1565160110910</created>
|
|
|
171
172
|
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
|
|
|
173
174
175
176
177
178
179
|
<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" />
|
|
|
180
|
<workItem from="1565345715376" duration="452000" />
|
|
|
181
182
|
<workItem from="1565570424829" duration="11663000" />
<workItem from="1565587737758" duration="4606000" />
|
|
|
183
|
</task>
|
|
|
184
185
|
<task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
<created>1565226427512</created>
|
|
|
186
187
188
|
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
|
|
|
189
|
<updated>1565226427512</updated>
|
|
|
190
|
</task>
|
|
|
191
192
|
<task id="LOCAL-00002" summary="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面">
<created>1565256884822</created>
|
|
|
193
194
195
|
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
|
|
|
196
|
<updated>1565256884822</updated>
|
|
|
197
|
</task>
|
|
|
198
199
|
<task id="LOCAL-00003" summary="修改库区service">
<created>1565259481656</created>
|
|
|
200
201
202
|
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
|
|
|
203
|
<updated>1565259481656</updated>
|
|
|
204
|
</task>
|
|
|
205
206
207
208
209
210
211
|
<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>
|
|
|
212
213
214
215
216
217
218
|
<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>
|
|
|
219
220
221
222
223
224
225
226
|
<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>
<option name="localTasksCounter" value="7" />
|
|
|
227
228
229
230
231
|
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
|
|
|
232
233
234
235
236
237
|
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
|
|
|
238
|
<option name="COLUMN_ORDER" />
|
|
|
239
240
241
242
243
|
</State>
</value>
</entry>
</map>
</option>
|
|
|
244
245
246
247
248
249
250
251
252
253
254
255
256
257
|
<option name="RECENT_FILTERS">
<map>
<entry key="Branch">
<value>
<list />
</value>
</entry>
<entry key="User">
<value>
<list />
</value>
</entry>
</map>
</option>
|
|
|
258
259
|
</component>
<component name="VcsManagerConfiguration">
|
|
|
260
261
262
|
<MESSAGE value="添加库位、库位类型增删改查接口" />
<MESSAGE value="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面" />
<MESSAGE value="修改库区service" />
|
|
|
263
|
<MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml" />
|
|
|
264
|
<MESSAGE value="添加userWarehouse" />
|
|
|
265
266
267
268
269
270
271
272
273
274
275
276
277
|
<MESSAGE value="添加containerCapacity" />
<option name="LAST_COMMIT_MESSAGE" value="添加containerCapacity" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url>
<line>107</line>
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
|
|
|
278
|
</component>
|
|
|
279
|
</project>
|
