wms / wms_tianjinggelinmei · Files

Blame view

.idea/workspace.xml 57.1 KB
Edit Raw Normal View History
初始化分支
db744b72
 
tangying authored 
1
2
3
 
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="ChangeListManager">
库存主单查询和页面
9e7efbc3
 
xqs authored 
4
5
 
    <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html" afterDir="false" />
库区设置编辑
69aa10ad
 
pengcheng authored 
6
 
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
库存主单查询和页面
9e7efbc3
 
xqs authored 
7
8
9
 
      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
      <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" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" afterDir="false" />
BigDecimal
d1d6277b
 
xqs authored 
10
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" afterDir="false" />
库存主单查询和页面
9e7efbc3
 
xqs authored 
11
12
 
      <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" afterDir="false" />
初始化分支
db744b72
 
tangying authored 
13
 
    </list>
库存主单查询和页面
9e7efbc3
 
xqs authored 
14
 
    <ignored path="$PROJECT_DIR$/target/" />
初始化分支
db744b72
 
tangying authored 
15
16
17
18
19
20
 
    <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>
maven
81c737f9
 
pengcheng authored 
21
 
  <component name="DatabaseView">
修改客户页面
0c8a451b
 
mahuandong authored 
22
 
    <option name="SHOW_INTERMEDIATE" value="false" />
maven
81c737f9
 
pengcheng authored 
23
24
25
26
27
 
    <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" />
修改客户页面
0c8a451b
 
mahuandong authored 
28
 
    <option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
maven
81c737f9
 
pengcheng authored 
29
30
31
32
33
34
 
    <option name="HIDDEN_KINDS">
      <set />
    </option>
    <expand>
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
修改客户页面
0c8a451b
 
mahuandong authored 
35
 
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
maven
81c737f9
 
pengcheng authored 
36
37
38
 
      </path>
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
修改客户页面
0c8a451b
 
mahuandong authored 
39
 
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
maven
81c737f9
 
pengcheng authored 
40
41
42
43
 
        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
      </path>
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
修改客户页面
0c8a451b
 
mahuandong authored 
44
 
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
maven
81c737f9
 
pengcheng authored 
45
46
47
48
49
50
 
        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
        <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
      </path>
    </expand>
    <select />
  </component>
库存主单查询和页面
9e7efbc3
 
xqs authored 
51
52
53
 
  <component name="FavoritesManager">
    <favorites_list name="wms2" />
  </component>
BigDecimal
d1d6277b
 
xqs authored 
54
 
  <component name="FileEditorManager">
库存主单查询和页面
9e7efbc3
 
xqs authored 
55
56
57
58
59
60
61
62
63
64
 
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
      <file pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="79">
              <caret line="72" column="28" selection-start-line="72" selection-start-column="28" selection-end-line="72" selection-end-column="28" />
            </state>
          </provider>
        </entry>
      </file>
BigDecimal
d1d6277b
 
xqs authored 
65
 
      <file pinned="false" current-in-tab="false">
库存主单查询和页面
9e7efbc3
 
xqs authored 
66
 
        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java">
BigDecimal
d1d6277b
 
xqs authored 
67
 
          <provider selected="true" editor-type-id="text-editor">
库存主单查询和页面
9e7efbc3
 
xqs authored 
68
69
 
            <state relative-caret-position="80">
              <caret line="5" column="49" selection-start-line="5" selection-start-column="49" selection-end-line="5" selection-end-column="49" />
BigDecimal
d1d6277b
 
xqs authored 
70
71
72
73
74
 
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
库存主单查询和页面
9e7efbc3
 
xqs authored 
75
 
        <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml">
BigDecimal
d1d6277b
 
xqs authored 
76
 
          <provider selected="true" editor-type-id="text-editor">
库存主单查询和页面
9e7efbc3
 
xqs authored 
77
78
 
            <state relative-caret-position="315">
              <caret line="32" column="30" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="30" />
BigDecimal
d1d6277b
 
xqs authored 
79
80
81
82
83
 
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
库存主单查询和页面
9e7efbc3
 
xqs authored 
84
 
        <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.class">
BigDecimal
d1d6277b
 
xqs authored 
85
 
          <provider selected="true" editor-type-id="text-editor">
库存主单查询和页面
9e7efbc3
 
xqs authored 
86
87
 
            <state relative-caret-position="116">
              <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
BigDecimal
d1d6277b
 
xqs authored 
88
89
90
91
 
            </state>
          </provider>
        </entry>
      </file>
库存主单查询和页面
9e7efbc3
 
xqs authored 
92
93
 
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
BigDecimal
d1d6277b
 
xqs authored 
94
 
          <provider selected="true" editor-type-id="text-editor">
库存主单查询和页面
9e7efbc3
 
xqs authored 
95
96
97
98
99
 
            <state relative-caret-position="499">
              <caret line="125" column="44" selection-start-line="125" selection-start-column="33" selection-end-line="125" selection-end-column="44" />
              <folding>
                <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
              </folding>
BigDecimal
d1d6277b
 
xqs authored 
100
101
102
103
104
105
106
 
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java">
          <provider selected="true" editor-type-id="text-editor">
库存主单查询和页面
9e7efbc3
 
xqs authored 
107
108
 
            <state relative-caret-position="-668">
              <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
BigDecimal
d1d6277b
 
xqs authored 
109
110
111
112
113
 
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
库存主单查询和页面
9e7efbc3
 
xqs authored 
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
 
        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="94">
              <caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" />
              <folding>
                <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
                <element signature="e#2365#2371#0" expanded="true" />
                <element signature="e#3190#7361#0" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
BigDecimal
d1d6277b
 
xqs authored 
129
 
          <provider selected="true" editor-type-id="text-editor">
库存主单查询和页面
9e7efbc3
 
xqs authored 
130
131
 
            <state>
              <caret column="28" selection-start-column="28" selection-end-column="28" />
BigDecimal
d1d6277b
 
xqs authored 
132
133
134
135
136
137
 
            </state>
          </provider>
        </entry>
      </file>
    </leaf>
  </component>
库区设置编辑
69aa10ad
 
pengcheng authored 
138
139
140
 
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
      <list>
添加承运商
859ce700
 
mahuandong authored 
141
 
        <option value="FxmlFile" />
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
142
 
        <option value="Interface" />
添加承运商页面，入库单类型
57897606
 
mahuandong authored 
143
144
 
        <option value="Class" />
        <option value="HTML File" />
库区设置编辑
69aa10ad
 
pengcheng authored 
145
146
147
 
      </list>
    </option>
  </component>
库存主单查询和页面
9e7efbc3
 
xqs authored 
148
149
150
151
152
 
  <component name="FindInProjectRecents">
    <findStrings>
      <find>detail</find>
    </findStrings>
  </component>
初始化分支
db744b72
 
tangying authored 
153
 
  <component name="Git.Settings">
新增和编辑bug
f1da3eec
 
wangyanxiong authored 
154
 
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
库区设置编辑
69aa10ad
 
pengcheng authored 
155
156
 
    <option name="RECENT_BRANCH_BY_REPOSITORY">
      <map>
修改客户页面
0c8a451b
 
mahuandong authored 
157
 
        <entry key="$PROJECT_DIR$" value="master" />
库区设置编辑
69aa10ad
 
pengcheng authored 
158
159
 
      </map>
    </option>
新增和编辑bug
f1da3eec
 
wangyanxiong authored 
160
 
  </component>
BigDecimal
d1d6277b
 
xqs authored 
161
162
163
164
 
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" />
库存主单查询和页面
9e7efbc3
 
xqs authored 
165
166
167
168
169
170
171
172
 
        <option value="$PROJECT_DIR$/README.md" />
        <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/cyclecountAdjust.html" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" />
        <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html" />
        <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" />
        <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" />
BigDecimal
d1d6277b
 
xqs authored 
173
174
175
 
      </list>
    </option>
  </component>
maven
81c737f9
 
pengcheng authored 
176
177
178
 
  <component name="IgnoredFileRootStore">
    <option name="generatedRoots">
      <set>
修改客户页面
0c8a451b
 
mahuandong authored 
179
 
        <option value="E:\code\wms2\.idea" />
maven
81c737f9
 
pengcheng authored 
180
181
182
 
      </set>
    </option>
  </component>
库存主单查询和页面
9e7efbc3
 
xqs authored 
183
184
185
186
187
188
189
 
  <component name="MavenImportPreferences">
    <option name="importingSettings">
      <MavenImportingSettings>
        <option name="importAutomatically" value="true" />
      </MavenImportingSettings>
    </option>
  </component>
BigDecimal
d1d6277b
 
xqs authored 
190
191
192
 
  <component name="ProjectFrameBounds" extendedState="6">
    <option name="x" value="-10" />
    <option name="y" value="-10" />
库存主单查询和页面
9e7efbc3
 
xqs authored 
193
194
 
    <option name="width" value="1939" />
    <option name="height" value="1049" />
BigDecimal
d1d6277b
 
xqs authored 
195
 
  </component>
修改客户页面
0c8a451b
 
mahuandong authored 
196
197
198
 
  <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
  <component name="ProjectLevelVcsManager">
    <ConfirmationsSetting value="2" id="Add" />
初始化分支
db744b72
 
tangying authored 
199
 
  </component>
BigDecimal
d1d6277b
 
xqs authored 
200
201
202
203
204
 
  <component name="ProjectView">
    <navigator proportions="" version="1">
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
库存主单查询和页面
9e7efbc3
 
xqs authored 
205
 
      <pane id="Scope" />
BigDecimal
d1d6277b
 
xqs authored 
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
 
      <pane id="PackagesPane" />
      <pane id="ProjectPane">
        <subPane>
          <expand>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
              <item name="inventory" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
              <item name="inventory" type="462c0819:PsiDirectoryNode" />
              <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
              <item name="inventory" type="462c0819:PsiDirectoryNode" />
              <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
库存主单查询和页面
9e7efbc3
 
xqs authored 
293
 
              <item name="controller" type="462c0819:PsiDirectoryNode" />
BigDecimal
d1d6277b
 
xqs authored 
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
 
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
              <item name="inventory" type="462c0819:PsiDirectoryNode" />
              <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
              <item name="inventory" type="462c0819:PsiDirectoryNode" />
              <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
              <item name="controller" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
              <item name="inventory" type="462c0819:PsiDirectoryNode" />
              <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
              <item name="domain" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
库存主单查询和页面
9e7efbc3
 
xqs authored 
342
343
344
345
346
347
348
349
350
351
352
353
354
 
              <item name="inventory" type="462c0819:PsiDirectoryNode" />
              <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
              <item name="mapper" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
BigDecimal
d1d6277b
 
xqs authored 
355
356
357
358
359
360
361
362
363
364
365
366
 
              <item name="shipment" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
              <item name="shipment" type="462c0819:PsiDirectoryNode" />
库存主单查询和页面
9e7efbc3
 
xqs authored 
367
 
              <item name="shipmentHeader" type="462c0819:PsiDirectoryNode" />
BigDecimal
d1d6277b
 
xqs authored 
368
369
370
371
372
373
374
375
376
377
378
 
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
              <item name="shipment" type="462c0819:PsiDirectoryNode" />
库存主单查询和页面
9e7efbc3
 
xqs authored 
379
 
              <item name="shipmentHeader" type="462c0819:PsiDirectoryNode" />
BigDecimal
d1d6277b
 
xqs authored 
380
381
382
383
384
385
386
387
388
389
390
391
 
              <item name="domain" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
              <item name="shipment" type="462c0819:PsiDirectoryNode" />
库存主单查询和页面
9e7efbc3
 
xqs authored 
392
 
              <item name="shippingCombination" type="462c0819:PsiDirectoryNode" />
BigDecimal
d1d6277b
 
xqs authored 
393
394
395
396
397
398
399
400
401
402
403
 
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
              <item name="shipment" type="462c0819:PsiDirectoryNode" />
库存主单查询和页面
9e7efbc3
 
xqs authored 
404
405
406
407
408
409
410
411
412
413
414
415
416
417
 
              <item name="shippingCombination" type="462c0819:PsiDirectoryNode" />
              <item name="controller" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="java" type="462c0819:PsiDirectoryNode" />
              <item name="com" type="462c0819:PsiDirectoryNode" />
              <item name="huaheng" type="462c0819:PsiDirectoryNode" />
              <item name="pc" type="462c0819:PsiDirectoryNode" />
              <item name="shipment" type="462c0819:PsiDirectoryNode" />
              <item name="shippingCombination" type="462c0819:PsiDirectoryNode" />
BigDecimal
d1d6277b
 
xqs authored 
418
419
 
              <item name="service" type="462c0819:PsiDirectoryNode" />
            </path>
库存主单查询和页面
9e7efbc3
 
xqs authored 
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
 
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="resources" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="resources" type="462c0819:PsiDirectoryNode" />
              <item name="templates" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="resources" type="462c0819:PsiDirectoryNode" />
              <item name="templates" type="462c0819:PsiDirectoryNode" />
              <item name="inventory" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="resources" type="462c0819:PsiDirectoryNode" />
              <item name="templates" type="462c0819:PsiDirectoryNode" />
              <item name="inventory" type="462c0819:PsiDirectoryNode" />
              <item name="cyclecountAdjust" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="resources" type="462c0819:PsiDirectoryNode" />
              <item name="templates" type="462c0819:PsiDirectoryNode" />
              <item name="inventory" type="462c0819:PsiDirectoryNode" />
              <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="resources" type="462c0819:PsiDirectoryNode" />
              <item name="templates" type="462c0819:PsiDirectoryNode" />
              <item name="inventory" type="462c0819:PsiDirectoryNode" />
              <item name="invetoryDetail" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="resources" type="462c0819:PsiDirectoryNode" />
              <item name="templates" type="462c0819:PsiDirectoryNode" />
              <item name="receipt" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="resources" type="462c0819:PsiDirectoryNode" />
              <item name="templates" type="462c0819:PsiDirectoryNode" />
              <item name="receipt" type="462c0819:PsiDirectoryNode" />
              <item name="receiptContainerDetail" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="src" type="462c0819:PsiDirectoryNode" />
              <item name="main" type="462c0819:PsiDirectoryNode" />
              <item name="resources" type="462c0819:PsiDirectoryNode" />
              <item name="templates" type="462c0819:PsiDirectoryNode" />
              <item name="receipt" type="462c0819:PsiDirectoryNode" />
              <item name="receiptHeader" type="462c0819:PsiDirectoryNode" />
            </path>
BigDecimal
d1d6277b
 
xqs authored 
503
504
505
506
507
508
 
          </expand>
          <select />
        </subPane>
      </pane>
    </panes>
  </component>
初始化分支
db744b72
 
tangying authored 
509
 
  <component name="PropertiesComponent">
修改客户页面
0c8a451b
 
mahuandong authored 
510
 
    <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
maven
81c737f9
 
pengcheng authored 
511
 
    <property name="DatabaseDriversLRU" value="mysql" />
添加物料时判断单位是否存在，不存在则添加物料单位
a3149609
 
mahuandong authored 
512
 
    <property name="DefaultHtmlFileTemplate" value="HTML File" />
添加userWarehouse
08918cf7
 
mahuandong authored 
513
 
    <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
库区设置编辑
69aa10ad
 
pengcheng authored 
514
515
516
517
 
    <property name="RequestMappingsPanelOrder0" value="0" />
    <property name="RequestMappingsPanelOrder1" value="1" />
    <property name="RequestMappingsPanelWidth0" value="75" />
    <property name="RequestMappingsPanelWidth1" value="75" />
初始化分支
db744b72
 
tangying authored 
518
519
520
 
    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
库存主单查询和页面
9e7efbc3
 
xqs authored 
521
 
    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail" />
修改客户页面
0c8a451b
 
mahuandong authored 
522
523
524
525
526
527
 
    <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)" />
添加商品、商品详情页面
b9abda20
 
mahuandong authored 
528
 
    <property name="nodejs_package_manager_path" value="npm" />
添加承运商页面，入库单类型
57897606
 
mahuandong authored 
529
530
531
 
    <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" />
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
532
 
    <property name="settings.editor.selected.configurable" value="File.Encoding" />
初始化分支
db744b72
 
tangying authored 
533
 
  </component>
maven
81c737f9
 
pengcheng authored 
534
 
  <component name="RecentsManager">
添加承运商页面，入库单类型
57897606
 
mahuandong authored 
535
 
    <key name="CopyFile.RECENT_KEYS">
库存主单查询和页面
9e7efbc3
 
xqs authored 
536
537
 
      <recent name="C:\Project\wms2\src\main\resources\templates\inventory\invetoryDetail" />
      <recent name="C:\Project\wms2\src\main\resources\templates\inventory\inventoryHeader" />
添加承运商页面，入库单类型
57897606
 
mahuandong authored 
538
539
540
 
      <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" />
库存主单查询和页面
9e7efbc3
 
xqs authored 
541
542
543
544
545
 
    </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" />
添加承运商页面，入库单类型
57897606
 
mahuandong authored 
546
 
    </key>
maven
81c737f9
 
pengcheng authored 
547
 
  </component>
初始化分支
db744b72
 
tangying authored 
548
 
  <component name="RunDashboard">
添加containerCapacity
dbd79ed5
 
mahuandong authored 
549
550
551
552
553
 
    <option name="configurationTypes">
      <set>
        <option value="SpringBootApplicationConfigurationType" />
      </set>
    </option>
初始化分支
db744b72
 
tangying authored 
554
555
556
557
558
559
560
561
562
563
 
    <option name="ruleStates">
      <list>
        <RuleState>
          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
        </RuleState>
        <RuleState>
          <option name="name" value="StatusDashboardGroupingRule" />
        </RuleState>
      </list>
    </option>
库存主单查询和页面
9e7efbc3
 
xqs authored 
564
 
    <option name="contentProportion" value="0.08743169" />
初始化分支
db744b72
 
tangying authored 
565
 
  </component>
Merge branch 'develop' of http:/...
34ed17de
 
wangyanxiong authored 
566
 
  <component name="RunManager">
修改客户页面
0c8a451b
 
mahuandong authored 
567
 
    <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
BigDecimal
d1d6277b
 
xqs authored 
568
 
      <module name="wms2" />
修改客户页面
0c8a451b
 
mahuandong authored 
569
570
571
572
 
      <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" />
库区设置编辑
69aa10ad
 
pengcheng authored 
573
574
575
576
 
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
修改客户页面
0c8a451b
 
mahuandong authored 
577
 
    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
初始化分支
db744b72
 
tangying authored 
578
579
 
      <module name="WMSV1" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
修改客户页面
0c8a451b
 
mahuandong authored 
580
 
      <option name="ALTERNATIVE_JRE_PATH" />
初始化分支
db744b72
 
tangying authored 
581
582
583
584
585
 
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
  </component>
maven
81c737f9
 
pengcheng authored 
586
587
588
 
  <component name="ServiceViewManager">
    <option name="allServicesViewState">
      <serviceView>
添加物料页面
2ebb5e32
 
mahuandong authored 
589
 
        <option name="contentProportion" value="0.18875067" />
maven
81c737f9
 
pengcheng authored 
590
 
        <treeState>
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
591
592
593
 
          <expand>
            <path>
              <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
添加承运商页面，入库单类型
57897606
 
mahuandong authored 
594
595
596
597
 
              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@5ef312b7" type="7427dc5b:ServiceModel$ServiceGroupNode" />
            </path>
            <path>
              <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
BigDecimal
d1d6277b
 
xqs authored 
598
 
              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@28150ae" type="7427dc5b:ServiceModel$ServiceGroupNode" />
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
599
600
 
            </path>
          </expand>
maven
81c737f9
 
pengcheng authored 
601
602
603
604
605
 
          <select />
        </treeState>
      </serviceView>
    </option>
  </component>
初始化分支
db744b72
 
tangying authored 
606
607
608
609
610
 
  <component name="SvnConfiguration">
    <configuration />
  </component>
  <component name="TaskManager">
    <task active="true" id="Default" summary="Default task">
添加userWarehouse
08918cf7
 
mahuandong authored 
611
 
      <changelist id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="" />
修改客户页面
0c8a451b
 
mahuandong authored 
612
 
      <created>1565160110910</created>
初始化分支
db744b72
 
tangying authored 
613
614
 
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
修改客户页面
0c8a451b
 
mahuandong authored 
615
616
617
618
619
620
621
 
      <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" />
添加userWarehouse
08918cf7
 
mahuandong authored 
622
 
      <workItem from="1565345715376" duration="452000" />
添加物料页面
2ebb5e32
 
mahuandong authored 
623
 
      <workItem from="1565570424829" duration="11663000" />
添加物料时判断单位是否存在，不存在则添加物料单位
a3149609
 
mahuandong authored 
624
625
 
      <workItem from="1565587737758" duration="12961000" />
      <workItem from="1565657307503" duration="115000" />
添加task实体类
81f151cc
 
mahuandong authored 
626
 
      <workItem from="1565657439247" duration="2447000" />
添加承运商
859ce700
 
mahuandong authored 
627
628
 
      <workItem from="1565662229227" duration="20296000" />
      <workItem from="1565691345079" duration="6000" />
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
629
630
631
632
633
634
635
636
 
      <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" />
添加承运商页面，入库单类型
57897606
 
mahuandong authored 
637
 
      <workItem from="1565833039573" duration="288000" />
BigDecimal
d1d6277b
 
xqs authored 
638
 
      <workItem from="1565833342181" duration="13946000" />
初始化分支
db744b72
 
tangying authored 
639
 
    </task>
修改客户页面
0c8a451b
 
mahuandong authored 
640
641
 
    <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
      <created>1565226427512</created>
库区设置编辑
69aa10ad
 
pengcheng authored 
642
643
644
 
      <option name="number" value="00001" />
      <option name="presentableId" value="LOCAL-00001" />
      <option name="project" value="LOCAL" />
修改客户页面
0c8a451b
 
mahuandong authored 
645
 
      <updated>1565226427512</updated>
库区设置编辑
69aa10ad
 
pengcheng authored 
646
 
    </task>
修改客户页面
0c8a451b
 
mahuandong authored 
647
648
 
    <task id="LOCAL-00002" summary="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面">
      <created>1565256884822</created>
maven
81c737f9
 
pengcheng authored 
649
650
651
 
      <option name="number" value="00002" />
      <option name="presentableId" value="LOCAL-00002" />
      <option name="project" value="LOCAL" />
修改客户页面
0c8a451b
 
mahuandong authored 
652
 
      <updated>1565256884822</updated>
maven
81c737f9
 
pengcheng authored 
653
 
    </task>
修改客户页面
0c8a451b
 
mahuandong authored 
654
655
 
    <task id="LOCAL-00003" summary="修改库区service">
      <created>1565259481656</created>
maven
81c737f9
 
pengcheng authored 
656
657
658
 
      <option name="number" value="00003" />
      <option name="presentableId" value="LOCAL-00003" />
      <option name="project" value="LOCAL" />
修改客户页面
0c8a451b
 
mahuandong authored 
659
 
      <updated>1565259481656</updated>
maven
81c737f9
 
pengcheng authored 
660
 
    </task>
Merge branch 'develop' of http:/...
d9319430
 
wangyanxiong authored 
661
662
663
664
665
666
667
 
    <task id="LOCAL-00004" summary="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.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>
添加containerCapacity
dbd79ed5
 
mahuandong authored 
668
669
670
671
672
673
674
 
    <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>
添加物料页面
2ebb5e32
 
mahuandong authored 
675
676
677
678
679
680
681
 
    <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>
添加物料时判断单位是否存在，不存在则添加物料单位
a3149609
 
mahuandong authored 
682
683
684
685
686
687
688
689
690
691
692
693
694
695
 
    <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>
添加task实体类
81f151cc
 
mahuandong authored 
696
697
698
699
700
701
702
 
    <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>
添加商品、商品详情页面
b9abda20
 
mahuandong authored 
703
704
705
706
707
708
709
 
    <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>
添加承运商
859ce700
 
mahuandong authored 
710
711
712
713
714
715
716
 
    <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>
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
717
718
719
720
721
722
723
 
    <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>
添加承运商页面，入库单类型
57897606
 
mahuandong authored 
724
725
726
727
728
729
730
 
    <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>
BigDecimal
d1d6277b
 
xqs authored 
731
 
    <option name="localTasksCounter" value="14" />
初始化分支
db744b72
 
tangying authored 
732
733
 
    <servers />
  </component>
库存主单查询和页面
9e7efbc3
 
xqs authored 
734
735
736
737
738
739
740
741
742
 
  <component name="TodoView" selected-index="1">
    <todo-panel id="selected-file">
      <is-autoscroll-to-source value="true" />
    </todo-panel>
    <todo-panel id="all">
      <are-packages-shown value="true" />
      <is-autoscroll-to-source value="true" />
    </todo-panel>
  </component>
BigDecimal
d1d6277b
 
xqs authored 
743
744
745
746
 
  <component name="ToolWindowManager">
    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
    <editor active="true" />
    <layout>
库存主单查询和页面
9e7efbc3
 
xqs authored 
747
748
749
 
      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.23793566" />
      <window_info id="Structure" order="1" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
      <window_info id="Web" order="2" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
BigDecimal
d1d6277b
 
xqs authored 
750
751
 
      <window_info id="Designer" order="3" />
      <window_info id="UI Designer" order="4" />
库存主单查询和页面
9e7efbc3
 
xqs authored 
752
 
      <window_info id="Favorites" order="5" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
BigDecimal
d1d6277b
 
xqs authored 
753
754
755
756
757
758
 
      <window_info anchor="bottom" id="Message" order="0" />
      <window_info anchor="bottom" id="Find" order="1" />
      <window_info anchor="bottom" id="Run" order="2" />
      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
库存主单查询和页面
9e7efbc3
 
xqs authored 
759
 
      <window_info anchor="bottom" id="TODO" order="6" weight="0.3286119" />
BigDecimal
d1d6277b
 
xqs authored 
760
 
      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
库存主单查询和页面
9e7efbc3
 
xqs authored 
761
762
763
764
 
      <window_info anchor="bottom" id="Version Control" order="8" weight="0.592068" />
      <window_info active="true" anchor="bottom" id="Run Dashboard" order="9" visible="true" weight="0.4022663" />
      <window_info anchor="bottom" id="Spring" order="10" weight="0.3286119" />
      <window_info anchor="bottom" id="Database Changes" order="11" weight="0.3286119" />
BigDecimal
d1d6277b
 
xqs authored 
765
 
      <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
库存主单查询和页面
9e7efbc3
 
xqs authored 
766
767
768
 
      <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.3286119" />
      <window_info anchor="bottom" id="Messages" order="14" weight="0.43909347" />
      <window_info anchor="bottom" id="MyBatis Log" order="15" />
BigDecimal
d1d6277b
 
xqs authored 
769
770
771
772
773
774
775
776
777
778
 
      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
      <window_info anchor="right" id="Palette" order="3" />
      <window_info anchor="right" id="Maven" order="4" />
      <window_info anchor="right" id="Bean Validation" order="5" />
      <window_info anchor="right" id="Database" order="6" />
      <window_info anchor="right" id="Palette&#9;" order="7" />
    </layout>
  </component>
初始化分支
db744b72
 
tangying authored 
779
780
781
 
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="1" />
  </component>
库区设置编辑
69aa10ad
 
pengcheng authored 
782
783
784
785
786
787
 
  <component name="Vcs.Log.Tabs.Properties">
    <option name="TAB_STATES">
      <map>
        <entry key="MAIN">
          <value>
            <State>
BigDecimal
d1d6277b
 
xqs authored 
788
789
790
791
792
793
 
              <option name="RECENTLY_FILTERED_USER_GROUPS">
                <collection />
              </option>
              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
                <collection />
              </option>
库存主单查询和页面
9e7efbc3
 
xqs authored 
794
795
796
797
798
799
800
801
 
              <option name="COLUMN_ORDER">
                <list>
                  <option value="0" />
                  <option value="1" />
                  <option value="2" />
                  <option value="3" />
                </list>
              </option>
库区设置编辑
69aa10ad
 
pengcheng authored 
802
803
804
805
806
 
            </State>
          </value>
        </entry>
      </map>
    </option>
新增和编辑bug
f1da3eec
 
wangyanxiong authored 
807
808
809
810
811
812
813
814
815
816
817
818
819
820
 
    <option name="RECENT_FILTERS">
      <map>
        <entry key="Branch">
          <value>
            <list />
          </value>
        </entry>
        <entry key="User">
          <value>
            <list />
          </value>
        </entry>
      </map>
    </option>
库区设置编辑
69aa10ad
 
pengcheng authored 
821
822
 
  </component>
  <component name="VcsManagerConfiguration">
修改客户页面
0c8a451b
 
mahuandong authored 
823
824
825
 
    <MESSAGE value="添加库位、库位类型增删改查接口" />
    <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
    <MESSAGE value="修改库区service" />
Merge branch 'develop' of http:/...
d9319430
 
wangyanxiong authored 
826
 
    <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" />
添加containerCapacity
dbd79ed5
 
mahuandong authored 
827
 
    <MESSAGE value="添加userWarehouse" />
添加物料页面
2ebb5e32
 
mahuandong authored 
828
 
    <MESSAGE value="添加containerCapacity" />
添加物料时判断单位是否存在，不存在则添加物料单位
a3149609
 
mahuandong authored 
829
830
 
    <MESSAGE value="添加物料页面" />
    <MESSAGE value="添加商品详情" />
添加task实体类
81f151cc
 
mahuandong authored 
831
 
    <MESSAGE value="添加物料时判断单位是否存在，不存在则添加物料单位" />
添加商品、商品详情页面
b9abda20
 
mahuandong authored 
832
 
    <MESSAGE value="添加task实体类" />
添加承运商
859ce700
 
mahuandong authored 
833
 
    <MESSAGE value="添加商品、商品详情页面" />
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
834
 
    <MESSAGE value="添加承运商" />
添加承运商页面，入库单类型
57897606
 
mahuandong authored 
835
 
    <MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" />
BigDecimal
d1d6277b
 
xqs authored 
836
 
    <option name="LAST_COMMIT_MESSAGE" value="添加物料导入、导出模板，添加Excel导入导出配置文件" />
添加物料页面
2ebb5e32
 
mahuandong authored 
837
838
839
840
841
 
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <breakpoints>
        <line-breakpoint enabled="true" type="java-line">
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
842
843
 
          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url>
          <line>198</line>
BigDecimal
d1d6277b
 
xqs authored 
844
 
          <properties />
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
845
846
847
848
849
 
          <option name="timeStamp" value="11" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/poi/ExcelUtil.java</url>
          <line>302</line>
BigDecimal
d1d6277b
 
xqs authored 
850
 
          <properties />
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
851
 
          <option name="timeStamp" value="12" />
添加物料页面
2ebb5e32
 
mahuandong authored 
852
 
        </line-breakpoint>
添加商品、商品详情页面
b9abda20
 
mahuandong authored 
853
854
 
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url>
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
855
 
          <line>187</line>
BigDecimal
d1d6277b
 
xqs authored 
856
 
          <properties />
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
857
 
          <option name="timeStamp" value="16" />
添加商品、商品详情页面
b9abda20
 
mahuandong authored 
858
859
 
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
860
861
 
          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java</url>
          <line>66</line>
BigDecimal
d1d6277b
 
xqs authored 
862
 
          <properties />
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
863
 
          <option name="timeStamp" value="24" />
添加商品、商品详情页面
b9abda20
 
mahuandong authored 
864
 
        </line-breakpoint>
添加物料页面
2ebb5e32
 
mahuandong authored 
865
866
 
      </breakpoints>
    </breakpoint-manager>
添加userWarehouse
08918cf7
 
mahuandong authored 
867
 
  </component>
BigDecimal
d1d6277b
 
xqs authored 
868
 
  <component name="editorHistoryManager">
库存主单查询和页面
9e7efbc3
 
xqs authored 
869
 
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java">
BigDecimal
d1d6277b
 
xqs authored 
870
 
      <provider selected="true" editor-type-id="text-editor">
库存主单查询和页面
9e7efbc3
 
xqs authored 
871
872
 
        <state relative-caret-position="-356">
          <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" />
BigDecimal
d1d6277b
 
xqs authored 
873
874
875
 
        </state>
      </provider>
    </entry>
库存主单查询和页面
9e7efbc3
 
xqs authored 
876
 
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentCombinationModel.java">
BigDecimal
d1d6277b
 
xqs authored 
877
 
      <provider selected="true" editor-type-id="text-editor">
库存主单查询和页面
9e7efbc3
 
xqs authored 
878
879
 
        <state relative-caret-position="68">
          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
BigDecimal
d1d6277b
 
xqs authored 
880
881
882
 
        </state>
      </provider>
    </entry>
库存主单查询和页面
9e7efbc3
 
xqs authored 
883
 
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java">
BigDecimal
d1d6277b
 
xqs authored 
884
 
      <provider selected="true" editor-type-id="text-editor">
库存主单查询和页面
9e7efbc3
 
xqs authored 
885
886
 
        <state relative-caret-position="202">
          <caret line="76" column="16" lean-forward="true" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" />
BigDecimal
d1d6277b
 
xqs authored 
887
888
889
 
        </state>
      </provider>
    </entry>
库存主单查询和页面
9e7efbc3
 
xqs authored 
890
 
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java">
BigDecimal
d1d6277b
 
xqs authored 
891
 
      <provider selected="true" editor-type-id="text-editor">
库存主单查询和页面
9e7efbc3
 
xqs authored 
892
893
 
        <state relative-caret-position="1156">
          <caret line="81" column="11" lean-forward="true" selection-start-line="81" selection-start-column="11" selection-end-line="81" selection-end-column="11" />
BigDecimal
d1d6277b
 
xqs authored 
894
895
896
 
        </state>
      </provider>
    </entry>
库存主单查询和页面
9e7efbc3
 
xqs authored 
897
898
899
900
901
902
903
904
905
906
907
908
 
    <entry file="file://$PROJECT_DIR$/README.md">
      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
        <state split_layout="SPLIT">
          <first_editor relative-caret-position="40">
            <caret line="2" column="9" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="9" />
          </first_editor>
          <second_editor />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/pom.xml">
      <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
BigDecimal
d1d6277b
 
xqs authored 
909
 
      <provider selected="true" editor-type-id="text-editor">
库存主单查询和页面
9e7efbc3
 
xqs authored 
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
 
        <state relative-caret-position="-232">
          <caret line="73" column="33" selection-start-line="73" selection-start-column="33" selection-end-line="73" selection-end-column="33" />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.3.RELEASE/spring-boot-autoconfigure-2.1.3.RELEASE.jar!/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="44">
          <caret line="250" column="44" selection-start-line="250" selection-start-column="44" selection-end-line="250" selection-end-column="44" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/error/500.html">
      <provider selected="true" editor-type-id="text-editor" />
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/error/unauth.html">
      <provider selected="true" editor-type-id="text-editor" />
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/error/404.html">
      <provider selected="true" editor-type-id="text-editor" />
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail/inventoryDetail.html" />
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-1715">
          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="140">
BigDecimal
d1d6277b
 
xqs authored 
942
943
944
945
 
          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
        </state>
      </provider>
    </entry>
库存主单查询和页面
9e7efbc3
 
xqs authored 
946
 
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountAdjust/cyclecountAdjust.html">
BigDecimal
d1d6277b
 
xqs authored 
947
 
      <provider selected="true" editor-type-id="text-editor">
库存主单查询和页面
9e7efbc3
 
xqs authored 
948
949
950
951
952
953
954
955
 
        <state relative-caret-position="80">
          <caret line="206" column="33" selection-start-line="206" selection-start-column="33" selection-end-line="206" selection-end-column="33" />
          <folding>
            <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
            <element signature="e#3143#6956#0" />
            <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
            <element signature="e#7300#7959#0" />
          </folding>
BigDecimal
d1d6277b
 
xqs authored 
956
957
958
 
        </state>
      </provider>
    </entry>
库存主单查询和页面
9e7efbc3
 
xqs authored 
959
 
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html">
BigDecimal
d1d6277b
 
xqs authored 
960
 
      <provider selected="true" editor-type-id="text-editor">
库存主单查询和页面
9e7efbc3
 
xqs authored 
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
 
        <state relative-caret-position="302">
          <caret line="709" column="48" lean-forward="true" selection-start-line="709" selection-start-column="48" selection-end-line="709" selection-end-column="48" />
          <folding>
            <element signature="e#10179#16495#0" />
            <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
            <element signature="e#16591#20920#0" />
            <element signature="e#21391#24464#0" />
            <element signature="e#24661#25310#0" />
            <element signature="e#25357#25470#0" />
            <element signature="e#25521#25805#0" />
            <element signature="e#25857#26476#0" />
            <element signature="e#26529#27160#0" />
            <element signature="e#27216#27659#0" />
            <element signature="e#27707#28073#0" />
            <element signature="e#28654#28666#0" />
            <element signature="e#29244#29273#0" />
            <element signature="e#29533#29580#0" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE.jar!/org/thymeleaf/engine/TemplateManager.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="96">
          <caret line="236" selection-start-line="236" selection-end-line="236" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptContainerDetail/receiptContainerDetail.html">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="240">
          <caret line="12" column="44" lean-forward="true" selection-start-line="12" selection-start-column="44" selection-end-line="12" selection-end-column="44" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state>
          <caret column="28" selection-start-column="28" selection-end-column="28" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="94">
          <caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" />
          <folding>
            <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
            <element signature="e#2365#2371#0" expanded="true" />
            <element signature="e#3190#7361#0" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-608">
          <caret line="11" column="37" lean-forward="true" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="116">
          <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="499">
          <caret line="125" column="44" selection-start-line="125" selection-start-column="33" selection-end-line="125" selection-end-column="44" />
          <folding>
            <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="80">
          <caret line="5" column="49" selection-start-line="5" selection-start-column="49" selection-end-line="5" selection-end-column="49" />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.5.RELEASE/spring-core-5.1.5.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="132">
          <caret line="103" selection-start-line="103" selection-end-line="103" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-668">
          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="315">
          <caret line="32" column="30" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="30" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="79">
          <caret line="72" column="28" selection-start-line="72" selection-start-column="28" selection-end-line="72" selection-end-column="28" />
BigDecimal
d1d6277b
 
xqs authored 
1071
1072
1073
 
        </state>
      </provider>
    </entry>
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
1074
 
  </component>
初始化分支
db744b72
 
tangying authored 
1075
 
</project>