wms / sanyizhongka · Files

Blame view

.idea/workspace.xml 64 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">
任务模块
d8cb88b4
 
wangyanxiong authored 
4
5
 
    <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java" afterDir="false" />
库区设置编辑
69aa10ad
 
pengcheng authored 
6
 
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
任务模块
d8cb88b4
 
wangyanxiong authored 
7
8
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" afterDir="false" />
初始化分支
db744b72
 
tangying authored 
9
 
    </list>
代码错误，导包
751bd7c0
 
xqs authored 
10
 
    <ignored path="$PROJECT_DIR$/target/" />
初始化分支
db744b72
 
tangying authored 
11
12
13
14
15
16
 
    <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 
17
 
  <component name="DatabaseView">
修改客户页面
0c8a451b
 
mahuandong authored 
18
 
    <option name="SHOW_INTERMEDIATE" value="false" />
maven
81c737f9
 
pengcheng authored 
19
20
21
22
23
 
    <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 
24
 
    <option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
maven
81c737f9
 
pengcheng authored 
25
26
27
28
29
30
 
    <option name="HIDDEN_KINDS">
      <set />
    </option>
    <expand>
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
修改客户页面
0c8a451b
 
mahuandong authored 
31
 
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
maven
81c737f9
 
pengcheng authored 
32
33
34
 
      </path>
      <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
39
 
        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
      </path>
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
修改客户页面
0c8a451b
 
mahuandong authored 
40
 
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
maven
81c737f9
 
pengcheng authored 
41
42
43
44
45
46
 
        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
        <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
      </path>
    </expand>
    <select />
  </component>
代码错误，导包
751bd7c0
 
xqs authored 
47
 
  <component name="FileEditorManager">
上架任务查询
cb63bfd6
 
wangyanxiong authored 
48
 
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
代码错误，导包
751bd7c0
 
xqs authored 
49
 
      <file pinned="false" current-in-tab="false">
任务模块
d8cb88b4
 
wangyanxiong authored 
50
 
        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
代码错误，导包
751bd7c0
 
xqs authored 
51
 
          <provider selected="true" editor-type-id="text-editor">
任务模块
d8cb88b4
 
wangyanxiong authored 
52
53
 
            <state relative-caret-position="248">
              <caret line="43" column="123" lean-forward="true" selection-start-line="43" selection-start-column="123" selection-end-line="43" selection-end-column="123" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
54
 
              <folding>
任务模块
d8cb88b4
 
wangyanxiong authored 
55
56
 
                <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
                <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
57
 
              </folding>
代码错误，导包
751bd7c0
 
xqs authored 
58
59
60
61
62
 
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="false">
任务模块
d8cb88b4
 
wangyanxiong authored 
63
 
        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java">
代码错误，导包
751bd7c0
 
xqs authored 
64
 
          <provider selected="true" editor-type-id="text-editor">
任务模块
d8cb88b4
 
wangyanxiong authored 
65
66
67
68
69
 
            <state relative-caret-position="-185">
              <caret line="43" column="48" lean-forward="true" selection-start-line="43" selection-start-column="48" selection-end-line="43" selection-end-column="48" />
              <folding>
                <element signature="imports" expanded="true" />
              </folding>
代码错误，导包
751bd7c0
 
xqs authored 
70
71
72
73
74
 
            </state>
          </provider>
        </entry>
      </file>
      <file pinned="false" current-in-tab="true">
任务模块
d8cb88b4
 
wangyanxiong authored 
75
 
        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
代码错误，导包
751bd7c0
 
xqs authored 
76
 
          <provider selected="true" editor-type-id="text-editor">
任务模块
d8cb88b4
 
wangyanxiong authored 
77
78
 
            <state relative-caret-position="40">
              <caret line="55" column="48" lean-forward="true" selection-start-line="55" selection-start-column="48" selection-end-line="55" selection-end-column="48" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
79
 
              <folding>
任务模块
d8cb88b4
 
wangyanxiong authored 
80
 
                <element signature="imports" expanded="true" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
81
 
              </folding>
代码错误，导包
751bd7c0
 
xqs authored 
82
83
84
85
86
87
 
            </state>
          </provider>
        </entry>
      </file>
    </leaf>
  </component>
库区设置编辑
69aa10ad
 
pengcheng authored 
88
89
90
 
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
      <list>
添加承运商
859ce700
 
mahuandong authored 
91
 
        <option value="FxmlFile" />
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
92
 
        <option value="Interface" />
添加承运商页面，入库单类型
57897606
 
mahuandong authored 
93
 
        <option value="HTML File" />
添加物料单位，重新生成库存主表和库存明细表
35c1e10f
 
mahuandong authored 
94
 
        <option value="Class" />
库区设置编辑
69aa10ad
 
pengcheng authored 
95
96
97
 
      </list>
    </option>
  </component>
代码错误，导包
751bd7c0
 
xqs authored 
98
99
100
101
102
 
  <component name="FindInProjectRecents">
    <findStrings>
      <find>configuration</find>
    </findStrings>
  </component>
初始化分支
db744b72
 
tangying authored 
103
 
  <component name="Git.Settings">
新增和编辑bug
f1da3eec
 
wangyanxiong authored 
104
 
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
库区设置编辑
69aa10ad
 
pengcheng authored 
105
106
 
    <option name="RECENT_BRANCH_BY_REPOSITORY">
      <map>
修改客户页面
0c8a451b
 
mahuandong authored 
107
 
        <entry key="$PROJECT_DIR$" value="master" />
库区设置编辑
69aa10ad
 
pengcheng authored 
108
109
 
      </map>
    </option>
代码错误，导包
751bd7c0
 
xqs authored 
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
 
    <option name="RESET_MODE" value="HARD" />
  </component>
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java" />
        <option value="$PROJECT_DIR$/pom.xml" />
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
127
128
129
130
131
 
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" />
        <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" />
        <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/inventoryDetail/controller/InventoryDetailController.java" />
        <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
132
133
 
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" />
        <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/task.html" />
任务模块
d8cb88b4
 
wangyanxiong authored 
134
 
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
135
 
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" />
任务模块
d8cb88b4
 
wangyanxiong authored 
136
 
        <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" />
代码错误，导包
751bd7c0
 
xqs authored 
137
138
 
      </list>
    </option>
新增和编辑bug
f1da3eec
 
wangyanxiong authored 
139
 
  </component>
maven
81c737f9
 
pengcheng authored 
140
141
142
 
  <component name="IgnoredFileRootStore">
    <option name="generatedRoots">
      <set>
修改客户页面
0c8a451b
 
mahuandong authored 
143
 
        <option value="E:\code\wms2\.idea" />
maven
81c737f9
 
pengcheng authored 
144
145
146
 
      </set>
    </option>
  </component>
上架任务查询
cb63bfd6
 
wangyanxiong authored 
147
148
149
150
151
152
153
 
  <component name="MavenImportPreferences">
    <option name="importingSettings">
      <MavenImportingSettings>
        <option name="importAutomatically" value="true" />
      </MavenImportingSettings>
    </option>
  </component>
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
154
 
  <component name="ProjectFrameBounds" extendedState="6">
上架任务查询
cb63bfd6
 
wangyanxiong authored 
155
156
157
 
    <option name="x" value="470" />
    <option name="width" value="980" />
    <option name="height" value="1030" />
代码错误，导包
751bd7c0
 
xqs authored 
158
 
  </component>
修改客户页面
0c8a451b
 
mahuandong authored 
159
160
161
 
  <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
  <component name="ProjectLevelVcsManager">
    <ConfirmationsSetting value="2" id="Add" />
初始化分支
db744b72
 
tangying authored 
162
 
  </component>
代码错误，导包
751bd7c0
 
xqs authored 
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
 
  <component name="ProjectView">
    <navigator proportions="" version="1">
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
      <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" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
178
 
              <item name="sql" type="462c0819:PsiDirectoryNode" />
代码错误，导包
751bd7c0
 
xqs authored 
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
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
 
            </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" />
任务模块
d8cb88b4
 
wangyanxiong authored 
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
 
              <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" />
              <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="system" type="462c0819:PsiDirectoryNode" />
代码错误，导包
751bd7c0
 
xqs authored 
271
272
273
274
275
276
277
278
279
280
 
            </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" />
任务模块
d8cb88b4
 
wangyanxiong authored 
281
282
 
              <item name="system" type="462c0819:PsiDirectoryNode" />
              <item name="dict" type="462c0819:PsiDirectoryNode" />
代码错误，导包
751bd7c0
 
xqs authored 
283
284
285
286
287
288
289
290
291
292
 
            </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" />
任务模块
d8cb88b4
 
wangyanxiong authored 
293
294
 
              <item name="system" type="462c0819:PsiDirectoryNode" />
              <item name="dict" type="462c0819:PsiDirectoryNode" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
295
 
              <item name="controller" type="462c0819:PsiDirectoryNode" />
代码错误，导包
751bd7c0
 
xqs authored 
296
297
298
299
300
301
302
303
304
305
 
            </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" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
306
 
              <item name="task" type="462c0819:PsiDirectoryNode" />
代码错误，导包
751bd7c0
 
xqs authored 
307
308
309
310
311
312
313
314
315
316
 
            </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" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
317
 
              <item name="task" type="462c0819:PsiDirectoryNode" />
任务模块
d8cb88b4
 
wangyanxiong authored 
318
319
320
321
322
323
324
325
326
327
328
329
330
331
 
              <item name="taskDetail" 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="task" type="462c0819:PsiDirectoryNode" />
              <item name="taskDetail" type="462c0819:PsiDirectoryNode" />
              <item name="controller" type="462c0819:PsiDirectoryNode" />
代码错误，导包
751bd7c0
 
xqs authored 
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" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
342
343
 
              <item name="task" type="462c0819:PsiDirectoryNode" />
              <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
代码错误，导包
751bd7c0
 
xqs authored 
344
345
346
347
348
349
350
351
352
353
 
            </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" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
354
355
 
              <item name="task" type="462c0819:PsiDirectoryNode" />
              <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
任务模块
d8cb88b4
 
wangyanxiong authored 
356
 
              <item name="controller" type="462c0819:PsiDirectoryNode" />
代码错误，导包
751bd7c0
 
xqs authored 
357
358
359
360
361
362
 
            </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" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
363
 
              <item name="resources" type="462c0819:PsiDirectoryNode" />
代码错误，导包
751bd7c0
 
xqs authored 
364
 
            </path>
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
365
366
367
368
369
370
 
            <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" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
371
 
              <item name="templates" type="462c0819:PsiDirectoryNode" />
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
372
373
374
375
376
377
378
379
 
            </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" />
任务模块
d8cb88b4
 
wangyanxiong authored 
380
 
              <item name="system" type="462c0819:PsiDirectoryNode" />
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
381
382
383
384
385
386
387
388
 
            </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" />
任务模块
d8cb88b4
 
wangyanxiong authored 
389
390
391
392
393
394
395
396
397
398
399
400
401
 
              <item name="system" type="462c0819:PsiDirectoryNode" />
              <item name="dict" 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="system" type="462c0819:PsiDirectoryNode" />
              <item name="dict" type="462c0819:PsiDirectoryNode" />
              <item name="data" type="462c0819:PsiDirectoryNode" />
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
402
403
404
405
406
407
408
409
 
            </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" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
410
 
              <item name="task" type="462c0819:PsiDirectoryNode" />
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
411
412
413
414
415
416
417
418
 
            </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" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
419
420
 
              <item name="task" type="462c0819:PsiDirectoryNode" />
              <item name="taskHeader" type="462c0819:PsiDirectoryNode" />
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
421
 
            </path>
代码错误，导包
751bd7c0
 
xqs authored 
422
423
424
425
 
          </expand>
          <select />
        </subPane>
      </pane>
任务模块
d8cb88b4
 
wangyanxiong authored 
426
427
 
      <pane id="PackagesPane" />
      <pane id="Scope" />
代码错误，导包
751bd7c0
 
xqs authored 
428
429
 
    </panes>
  </component>
初始化分支
db744b72
 
tangying authored 
430
 
  <component name="PropertiesComponent">
修改客户页面
0c8a451b
 
mahuandong authored 
431
 
    <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
maven
81c737f9
 
pengcheng authored 
432
 
    <property name="DatabaseDriversLRU" value="mysql" />
添加物料时判断单位是否存在，不存在则添加物料单位
a3149609
 
mahuandong authored 
433
 
    <property name="DefaultHtmlFileTemplate" value="HTML File" />
添加userWarehouse
08918cf7
 
mahuandong authored 
434
 
    <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
库区设置编辑
69aa10ad
 
pengcheng authored 
435
436
437
438
 
    <property name="RequestMappingsPanelOrder0" value="0" />
    <property name="RequestMappingsPanelOrder1" value="1" />
    <property name="RequestMappingsPanelWidth0" value="75" />
    <property name="RequestMappingsPanelWidth1" value="75" />
初始化分支
db744b72
 
tangying authored 
439
440
441
 
    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
任务模块
d8cb88b4
 
wangyanxiong authored 
442
 
    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1566462677598" />
添加物料单位，重新生成库存主表和库存明细表
35c1e10f
 
mahuandong authored 
443
 
    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis/config" />
修改客户页面
0c8a451b
 
mahuandong authored 
444
445
446
447
448
449
 
    <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 
450
 
    <property name="nodejs_package_manager_path" value="npm" />
添加承运商页面，入库单类型
57897606
 
mahuandong authored 
451
452
453
 
    <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" />
添加物料单位，重新生成库存主表和库存明细表
35c1e10f
 
mahuandong authored 
454
 
    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
初始化分支
db744b72
 
tangying authored 
455
 
  </component>
maven
81c737f9
 
pengcheng authored 
456
 
  <component name="RecentsManager">
任务模块
d8cb88b4
 
wangyanxiong authored 
457
458
459
460
461
462
463
464
 
    <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" />
    </key>
    <key name="CopyClassDialog.RECENTS_KEY">
      <recent name="com.huaheng.pc.task.taskDetail.controller" />
    </key>
添加承运商页面，入库单类型
57897606
 
mahuandong authored 
465
 
    <key name="CopyFile.RECENT_KEYS">
上架任务查询
cb63bfd6
 
wangyanxiong authored 
466
 
      <recent name="F:\wms2\src\main\resources\templates\task\taskHeader" />
添加承运商页面，入库单类型
57897606
 
mahuandong authored 
467
468
469
 
      <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" />
添加物料单位，重新生成库存主表和库存明细表
35c1e10f
 
mahuandong authored 
470
 
      <recent name="E:\code\wms2\target\classes\static\file" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
471
 
    </key>
maven
81c737f9
 
pengcheng authored 
472
 
  </component>
初始化分支
db744b72
 
tangying authored 
473
 
  <component name="RunDashboard">
添加containerCapacity
dbd79ed5
 
mahuandong authored 
474
475
476
477
478
 
    <option name="configurationTypes">
      <set>
        <option value="SpringBootApplicationConfigurationType" />
      </set>
    </option>
初始化分支
db744b72
 
tangying authored 
479
480
481
482
483
484
485
486
487
488
 
    <option name="ruleStates">
      <list>
        <RuleState>
          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
        </RuleState>
        <RuleState>
          <option name="name" value="StatusDashboardGroupingRule" />
        </RuleState>
      </list>
    </option>
上架任务查询
cb63bfd6
 
wangyanxiong authored 
489
 
    <option name="contentProportion" value="0.012987013" />
初始化分支
db744b72
 
tangying authored 
490
 
  </component>
上架任务查询
cb63bfd6
 
wangyanxiong authored 
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
 
  <component name="RunManager" selected="Spring Boot.HuaHengApplication (1)">
    <configuration name="HuaHengApplication (1)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
      <module name="huaheng" />
      <extension name="coverage">
        <pattern>
          <option name="PATTERN" value="com.huaheng.*" />
          <option name="ENABLED" value="true" />
        </pattern>
      </extension>
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
      <option name="ALTERNATIVE_JRE_PATH" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
修改客户页面
0c8a451b
 
mahuandong authored 
506
 
    <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
代码错误，导包
751bd7c0
 
xqs authored 
507
 
      <module name="wms2" />
修改客户页面
0c8a451b
 
mahuandong authored 
508
 
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
代码错误，导包
751bd7c0
 
xqs authored 
509
510
 
      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
      <option name="ALTERNATIVE_JRE_PATH" value="C:\Program Files\Java\jdk1.8.0_202\jre" />
修改客户页面
0c8a451b
 
mahuandong authored 
511
512
 
      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
库区设置编辑
69aa10ad
 
pengcheng authored 
513
514
515
516
 
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
修改客户页面
0c8a451b
 
mahuandong authored 
517
 
    <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
初始化分支
db744b72
 
tangying authored 
518
519
 
      <module name="WMSV1" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
修改客户页面
0c8a451b
 
mahuandong authored 
520
 
      <option name="ALTERNATIVE_JRE_PATH" />
初始化分支
db744b72
 
tangying authored 
521
522
523
524
 
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
上架任务查询
cb63bfd6
 
wangyanxiong authored 
525
526
527
528
529
 
    <recent_temporary>
      <list>
        <item itemvalue="Spring Boot.HuaHengApplication (1)" />
      </list>
    </recent_temporary>
初始化分支
db744b72
 
tangying authored 
530
 
  </component>
maven
81c737f9
 
pengcheng authored 
531
532
533
 
  <component name="ServiceViewManager">
    <option name="allServicesViewState">
      <serviceView>
添加物料页面
2ebb5e32
 
mahuandong authored 
534
 
        <option name="contentProportion" value="0.18875067" />
maven
81c737f9
 
pengcheng authored 
535
 
        <treeState>
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
536
537
538
 
          <expand>
            <path>
              <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
添加物料单位，重新生成库存主表和库存明细表
35c1e10f
 
mahuandong authored 
539
 
              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@dbb4d4b" type="7427dc5b:ServiceModel$ServiceGroupNode" />
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
540
541
 
            </path>
          </expand>
maven
81c737f9
 
pengcheng authored 
542
543
544
545
546
 
          <select />
        </treeState>
      </serviceView>
    </option>
  </component>
初始化分支
db744b72
 
tangying authored 
547
548
549
550
551
 
  <component name="SvnConfiguration">
    <configuration />
  </component>
  <component name="TaskManager">
    <task active="true" id="Default" summary="Default task">
添加userWarehouse
08918cf7
 
mahuandong authored 
552
 
      <changelist id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="" />
修改客户页面
0c8a451b
 
mahuandong authored 
553
 
      <created>1565160110910</created>
初始化分支
db744b72
 
tangying authored 
554
555
 
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
修改客户页面
0c8a451b
 
mahuandong authored 
556
557
558
559
560
561
562
 
      <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 
563
 
      <workItem from="1565345715376" duration="452000" />
添加物料页面
2ebb5e32
 
mahuandong authored 
564
 
      <workItem from="1565570424829" duration="11663000" />
添加物料时判断单位是否存在，不存在则添加物料单位
a3149609
 
mahuandong authored 
565
566
 
      <workItem from="1565587737758" duration="12961000" />
      <workItem from="1565657307503" duration="115000" />
添加task实体类
81f151cc
 
mahuandong authored 
567
 
      <workItem from="1565657439247" duration="2447000" />
添加承运商
859ce700
 
mahuandong authored 
568
569
 
      <workItem from="1565662229227" duration="20296000" />
      <workItem from="1565691345079" duration="6000" />
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
570
571
572
573
574
575
576
577
 
      <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 
578
 
      <workItem from="1565833039573" duration="288000" />
BigDecimal
d1d6277b
 
xqs authored 
579
 
      <workItem from="1565833342181" duration="13946000" />
添加物料单位，重新生成库存主表和库存明细表
35c1e10f
 
mahuandong authored 
580
581
582
 
      <workItem from="1565936336169" duration="3845000" />
      <workItem from="1565941296716" duration="6217000" />
      <workItem from="1566175534262" duration="11146000" />
任务模块
d8cb88b4
 
wangyanxiong authored 
583
584
 
      <workItem from="1566433893313" duration="21834000" />
      <workItem from="1566463230092" duration="4987000" />
初始化分支
db744b72
 
tangying authored 
585
 
    </task>
修改客户页面
0c8a451b
 
mahuandong authored 
586
587
 
    <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
      <created>1565226427512</created>
库区设置编辑
69aa10ad
 
pengcheng authored 
588
589
590
 
      <option name="number" value="00001" />
      <option name="presentableId" value="LOCAL-00001" />
      <option name="project" value="LOCAL" />
修改客户页面
0c8a451b
 
mahuandong authored 
591
 
      <updated>1565226427512</updated>
库区设置编辑
69aa10ad
 
pengcheng authored 
592
 
    </task>
修改客户页面
0c8a451b
 
mahuandong authored 
593
594
 
    <task id="LOCAL-00002" summary="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面">
      <created>1565256884822</created>
maven
81c737f9
 
pengcheng authored 
595
596
597
 
      <option name="number" value="00002" />
      <option name="presentableId" value="LOCAL-00002" />
      <option name="project" value="LOCAL" />
修改客户页面
0c8a451b
 
mahuandong authored 
598
 
      <updated>1565256884822</updated>
maven
81c737f9
 
pengcheng authored 
599
 
    </task>
修改客户页面
0c8a451b
 
mahuandong authored 
600
601
 
    <task id="LOCAL-00003" summary="修改库区service">
      <created>1565259481656</created>
maven
81c737f9
 
pengcheng authored 
602
603
604
 
      <option name="number" value="00003" />
      <option name="presentableId" value="LOCAL-00003" />
      <option name="project" value="LOCAL" />
修改客户页面
0c8a451b
 
mahuandong authored 
605
 
      <updated>1565259481656</updated>
maven
81c737f9
 
pengcheng authored 
606
 
    </task>
Merge branch 'develop' of http:/...
d9319430
 
wangyanxiong authored 
607
608
609
610
611
612
613
 
    <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 
614
615
616
617
618
619
620
 
    <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 
621
622
623
624
625
626
627
 
    <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 
628
629
630
631
632
633
634
635
636
637
638
639
640
641
 
    <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 
642
643
644
645
646
647
648
 
    <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 
649
650
651
652
653
654
655
 
    <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 
656
657
658
659
660
661
662
 
    <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 
663
664
665
666
667
668
669
 
    <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 
670
671
672
673
674
675
676
 
    <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>
添加物料单位，重新生成库存主表和库存明细表
35c1e10f
 
mahuandong authored 
677
678
679
680
681
682
683
 
    <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>
任务模块
d8cb88b4
 
wangyanxiong authored 
684
685
686
687
688
689
690
691
 
    <task id="LOCAL-00015" summary="上架任务查询">
      <created>1566439482539</created>
      <option name="number" value="00015" />
      <option name="presentableId" value="LOCAL-00015" />
      <option name="project" value="LOCAL" />
      <updated>1566439482539</updated>
    </task>
    <option name="localTasksCounter" value="16" />
初始化分支
db744b72
 
tangying authored 
692
693
 
    <servers />
  </component>
上架任务查询
cb63bfd6
 
wangyanxiong authored 
694
 
  <component name="TimeTrackingManager">
任务模块
d8cb88b4
 
wangyanxiong authored 
695
 
    <option name="totallyTimeSpent" value="38616000" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
696
 
  </component>
代码错误，导包
751bd7c0
 
xqs authored 
697
698
699
700
701
702
703
704
705
706
 
  <component name="TodoView">
    <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>
  <component name="ToolWindowManager">
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
707
 
    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
代码错误，导包
751bd7c0
 
xqs authored 
708
709
 
    <editor active="true" />
    <layout>
任务模块
d8cb88b4
 
wangyanxiong authored 
710
 
      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.2627346" />
代码错误，导包
751bd7c0
 
xqs authored 
711
712
713
714
715
 
      <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" />
      <window_info id="Designer" order="3" />
      <window_info id="UI Designer" order="4" />
      <window_info id="Favorites" order="5" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
任务模块
d8cb88b4
 
wangyanxiong authored 
716
717
 
      <window_info id="Image Layers" order="6" />
      <window_info id="Capture Tool" order="7" />
代码错误，导包
751bd7c0
 
xqs authored 
718
 
      <window_info anchor="bottom" id="Message" order="0" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
719
 
      <window_info anchor="bottom" id="Find" order="1" weight="0.3286119" />
代码错误，导包
751bd7c0
 
xqs authored 
720
721
722
723
724
725
 
      <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" />
      <window_info anchor="bottom" id="TODO" order="6" weight="0.3275488" />
      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
726
 
      <window_info anchor="bottom" id="Version Control" order="8" weight="0.43342775" />
任务模块
d8cb88b4
 
wangyanxiong authored 
727
 
      <window_info active="true" anchor="bottom" id="Run Dashboard" order="9" sideWeight="0.91152817" visible="true" weight="0.3555241" />
代码错误，导包
751bd7c0
 
xqs authored 
728
729
 
      <window_info anchor="bottom" id="Spring" order="10" weight="0.3286119" />
      <window_info anchor="bottom" id="Database Changes" order="11" weight="0.3275488" />
任务模块
d8cb88b4
 
wangyanxiong authored 
730
 
      <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.08847185" side_tool="true" weight="0.34560907" />
代码错误，导包
751bd7c0
 
xqs authored 
731
 
      <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.3275488" />
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
732
 
      <window_info anchor="bottom" id="Messages" order="14" weight="0.3186969" />
代码错误，导包
751bd7c0
 
xqs authored 
733
 
      <window_info anchor="bottom" id="MyBatis Log" order="15" />
任务模块
d8cb88b4
 
wangyanxiong authored 
734
 
      <window_info anchor="bottom" id="Terminal" order="16" />
代码错误，导包
751bd7c0
 
xqs authored 
735
736
737
738
739
740
741
742
 
      <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" />
任务模块
d8cb88b4
 
wangyanxiong authored 
743
744
 
      <window_info anchor="right" id="Capture Analysis" order="8" />
      <window_info anchor="right" id="Theme Preview" order="9" />
代码错误，导包
751bd7c0
 
xqs authored 
745
746
 
    </layout>
  </component>
初始化分支
db744b72
 
tangying authored 
747
748
749
 
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="1" />
  </component>
库区设置编辑
69aa10ad
 
pengcheng authored 
750
751
752
753
754
755
 
  <component name="Vcs.Log.Tabs.Properties">
    <option name="TAB_STATES">
      <map>
        <entry key="MAIN">
          <value>
            <State>
代码错误，导包
751bd7c0
 
xqs authored 
756
757
758
759
760
761
762
763
764
765
766
767
768
769
 
              <option name="RECENTLY_FILTERED_USER_GROUPS">
                <collection />
              </option>
              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
                <collection />
              </option>
              <option name="COLUMN_ORDER">
                <list>
                  <option value="0" />
                  <option value="1" />
                  <option value="2" />
                  <option value="3" />
                </list>
              </option>
库区设置编辑
69aa10ad
 
pengcheng authored 
770
771
772
773
774
 
            </State>
          </value>
        </entry>
      </map>
    </option>
新增和编辑bug
f1da3eec
 
wangyanxiong authored 
775
776
777
778
779
780
781
782
783
784
785
786
787
788
 
    <option name="RECENT_FILTERS">
      <map>
        <entry key="Branch">
          <value>
            <list />
          </value>
        </entry>
        <entry key="User">
          <value>
            <list />
          </value>
        </entry>
      </map>
    </option>
库区设置编辑
69aa10ad
 
pengcheng authored 
789
790
 
  </component>
  <component name="VcsManagerConfiguration">
修改客户页面
0c8a451b
 
mahuandong authored 
791
792
793
 
    <MESSAGE value="添加库位、库位类型增删改查接口" />
    <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
    <MESSAGE value="修改库区service" />
Merge branch 'develop' of http:/...
d9319430
 
wangyanxiong authored 
794
 
    <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 
795
 
    <MESSAGE value="添加userWarehouse" />
添加物料页面
2ebb5e32
 
mahuandong authored 
796
 
    <MESSAGE value="添加containerCapacity" />
添加物料时判断单位是否存在，不存在则添加物料单位
a3149609
 
mahuandong authored 
797
798
 
    <MESSAGE value="添加物料页面" />
    <MESSAGE value="添加商品详情" />
添加task实体类
81f151cc
 
mahuandong authored 
799
 
    <MESSAGE value="添加物料时判断单位是否存在，不存在则添加物料单位" />
添加商品、商品详情页面
b9abda20
 
mahuandong authored 
800
 
    <MESSAGE value="添加task实体类" />
添加承运商
859ce700
 
mahuandong authored 
801
 
    <MESSAGE value="添加商品、商品详情页面" />
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
802
 
    <MESSAGE value="添加承运商" />
添加承运商页面，入库单类型
57897606
 
mahuandong authored 
803
 
    <MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" />
添加物料单位，重新生成库存主表和库存明细表
35c1e10f
 
mahuandong authored 
804
 
    <MESSAGE value="添加仓库配置" />
代码错误，导包
751bd7c0
 
xqs authored 
805
 
    <MESSAGE value="代码错误，库存导包" />
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
806
 
    <MESSAGE value="代码错误，导包" />
任务模块
d8cb88b4
 
wangyanxiong authored 
807
808
 
    <MESSAGE value="上架任务查询" />
    <option name="LAST_COMMIT_MESSAGE" value="上架任务查询" />
添加物料页面
2ebb5e32
 
mahuandong authored 
809
810
811
812
813
 
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <breakpoints>
        <line-breakpoint enabled="true" type="java-line">
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
814
815
 
          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/poi/ExcelUtil.java</url>
          <line>302</line>
代码错误，导包
751bd7c0
 
xqs authored 
816
 
          <properties />
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
817
 
          <option name="timeStamp" value="12" />
添加物料页面
2ebb5e32
 
mahuandong authored 
818
 
        </line-breakpoint>
添加商品、商品详情页面
b9abda20
 
mahuandong authored 
819
 
        <line-breakpoint enabled="true" type="java-line">
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
820
821
 
          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java</url>
          <line>66</line>
代码错误，导包
751bd7c0
 
xqs authored 
822
 
          <properties />
添加物料导入、导出模板，添加Excel导入导出配置文件
8ac9ed02
 
mahuandong authored 
823
 
          <option name="timeStamp" value="24" />
添加商品、商品详情页面
b9abda20
 
mahuandong authored 
824
 
        </line-breakpoint>
添加物料单位，重新生成库存主表和库存明细表
35c1e10f
 
mahuandong authored 
825
826
827
 
        <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>
代码错误，导包
751bd7c0
 
xqs authored 
828
 
          <properties />
添加物料单位，重新生成库存主表和库存明细表
35c1e10f
 
mahuandong authored 
829
830
 
          <option name="timeStamp" value="25" />
        </line-breakpoint>
添加物料页面
2ebb5e32
 
mahuandong authored 
831
832
 
      </breakpoints>
    </breakpoint-manager>
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
833
834
835
836
837
838
839
 
    <watches-manager>
      <configuration name="SpringBootApplicationConfigurationType">
        <watch expression="receiptTotal" />
        <watch expression="this.h" custom="java.lang.reflect.Proxy" />
        <watch expression="((MybatisMapperProxy)this.h).methodCache" custom="java.lang.reflect.Proxy,com.baomidou.mybatisplus.core.override.MybatisMapperProxy" />
      </configuration>
    </watches-manager>
添加userWarehouse
08918cf7
 
mahuandong authored 
840
 
  </component>
代码错误，导包
751bd7c0
 
xqs authored 
841
842
843
 
  <component name="editorHistoryManager">
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java">
      <provider selected="true" editor-type-id="text-editor">
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
 
        <state relative-caret-position="-1032">
          <caret line="15" column="35" lean-forward="true" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.5.RELEASE/spring-aop-5.1.5.RELEASE.jar!/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="68">
          <caret line="38" selection-start-line="38" selection-end-line="38" />
        </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="100">
          <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.5.RELEASE/spring-web-5.1.5.RELEASE.jar!/org/springframework/web/method/support/InvocableHandlerMethod.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="126">
          <caret line="107" selection-start-line="107" selection-end-line="107" />
        </state>
      </provider>
    </entry>
上架任务查询
cb63bfd6
 
wangyanxiong authored 
870
 
    <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/LinkedHashMap.java" />
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
871
872
873
874
875
876
877
878
879
880
881
 
    <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1.jar!/org/apache/ibatis/builder/xml/mybatis-3-mapper.dtd">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="124">
          <caret line="172" column="27" lean-forward="true" selection-start-line="172" selection-start-column="27" selection-end-line="172" selection-end-column="27" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/report/ExcelReportMapper.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="300">
          <caret line="94" column="16" lean-forward="true" selection-start-line="94" selection-start-column="16" selection-end-line="94" selection-end-column="16" />
代码错误，导包
751bd7c0
 
xqs authored 
882
883
884
885
886
 
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java">
      <provider selected="true" editor-type-id="text-editor">
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
 
        <state relative-caret-position="253">
          <caret line="106" column="22" selection-start-line="106" selection-start-column="22" selection-end-line="106" selection-end-column="22" />
        </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="-220">
          <caret line="114" column="7" lean-forward="true" selection-start-line="114" selection-start-column="7" selection-end-line="114" selection-end-column="7" />
        </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="580">
          <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
代码错误，导包
751bd7c0
 
xqs authored 
903
904
905
906
907
 
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java">
      <provider selected="true" editor-type-id="text-editor">
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
908
909
 
        <state relative-caret-position="275">
          <caret line="302" column="20" selection-start-line="302" selection-start-column="20" selection-end-line="302" selection-end-column="20" />
代码错误，导包
751bd7c0
 
xqs authored 
910
911
912
 
        </state>
      </provider>
    </entry>
修复首页报错，库存页面和搜索条件修改
46138120
 
xqs authored 
913
914
915
916
917
918
919
920
921
922
923
924
925
926
 
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/report/excelReport/mapper/ExcelReportMapper.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="100">
          <caret line="9" column="40" selection-start-line="9" selection-start-column="40" selection-end-line="9" selection-end-column="40" />
        </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="51">
          <caret line="72" selection-start-line="72" selection-end-line="72" />
        </state>
      </provider>
    </entry>
上架任务查询
cb63bfd6
 
wangyanxiong authored 
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
 
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/bom/service/BomDetailServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="95">
          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/BomHeaderMapper.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="177">
          <caret line="37" column="25" lean-forward="true" selection-start-line="37" selection-start-column="25" selection-end-line="37" selection-end-column="25" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/bom/controller/BomHeaderController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="285">
          <caret line="50" column="31" lean-forward="true" selection-start-line="50" selection-start-column="31" selection-end-line="50" selection-end-column="31" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/bom/service/BomHeaderServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="95">
          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="232">
          <caret line="26" column="42" selection-start-line="26" selection-start-column="42" selection-end-line="26" selection-end-column="42" />
        </state>
      </provider>
    </entry>
任务模块
d8cb88b4
 
wangyanxiong authored 
962
 
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller.java" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
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
 
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="300">
          <caret line="36" column="22" selection-start-line="36" selection-start-column="22" selection-end-line="36" selection-end-column="22" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="209">
          <caret line="14" column="22" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="76">
          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="48">
          <caret line="3" column="30" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="30" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/mapper/TaskHeaderMapper.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="76">
          <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-114">
          <caret line="38" selection-start-line="38" selection-end-line="41" selection-end-column="44" />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/IService.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="226">
          <caret line="92" column="12" selection-start-line="92" selection-start-column="12" selection-end-line="92" selection-end-column="12" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="57">
          <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/warehouse/controller/WareHouseController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="38">
          <caret line="61" column="49" selection-start-line="61" selection-start-column="40" selection-end-line="61" selection-end-column="49" />
        </state>
      </provider>
    </entry>
任务模块
d8cb88b4
 
wangyanxiong authored 
1029
1030
1031
1032
1033
1034
1035
 
    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.5.RELEASE/spring-aop-5.1.5.RELEASE.jar!/org/springframework/aop/framework/CglibAopProxy.class">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="145">
          <caret line="472" selection-start-line="472" selection-end-line="472" />
        </state>
      </provider>
    </entry>
上架任务查询
cb63bfd6
 
wangyanxiong authored 
1036
1037
 
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/container.html">
      <provider selected="true" editor-type-id="text-editor">
任务模块
d8cb88b4
 
wangyanxiong authored 
1038
1039
 
        <state relative-caret-position="965">
          <caret line="69" column="29" selection-start-line="69" selection-start-column="28" selection-end-line="69" selection-end-column="29" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
1040
1041
1042
1043
1044
 
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java">
      <provider selected="true" editor-type-id="text-editor">
任务模块
d8cb88b4
 
wangyanxiong authored 
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
 
        <state relative-caret-position="-332">
          <caret line="114" column="27" selection-start-line="114" selection-start-column="23" selection-end-line="114" selection-end-column="27" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/bomDetail/bomDetail.html">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="266">
          <caret line="32" column="52" lean-forward="true" selection-start-line="32" selection-start-column="11" selection-end-line="32" selection-end-column="52" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/bom/controller/BomDetailController.java">
      <provider selected="true" editor-type-id="text-editor">
上架任务查询
cb63bfd6
 
wangyanxiong authored 
1059
 
        <state relative-caret-position="304">
任务模块
d8cb88b4
 
wangyanxiong authored 
1060
 
          <caret line="58" column="80" lean-forward="true" selection-start-line="58" selection-start-column="30" selection-end-line="58" selection-end-column="80" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
1061
1062
1063
 
        </state>
      </provider>
    </entry>
任务模块
d8cb88b4
 
wangyanxiong authored 
1064
 
    <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js">
上架任务查询
cb63bfd6
 
wangyanxiong authored 
1065
 
      <provider selected="true" editor-type-id="text-editor">
任务模块
d8cb88b4
 
wangyanxiong authored 
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
 
        <state relative-caret-position="235">
          <caret line="123" column="81" selection-start-line="123" selection-start-column="72" selection-end-line="123" selection-end-column="81" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-2332">
          <caret line="108" column="30" lean-forward="true" selection-start-line="108" selection-start-column="30" selection-end-line="108" selection-end-column="30" />
        </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="-2523">
          <caret line="84" column="27" selection-start-line="84" selection-start-column="24" selection-end-line="84" selection-end-column="27" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/controller/DictDataController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-1435">
          <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
        </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 relative-caret-position="118">
          <caret line="33" column="43" selection-start-line="33" selection-start-column="28" selection-end-line="33" selection-end-column="43" />
        </state>
      </provider>
    </entry>
    <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.dom.d.ts">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="161">
          <caret line="10712" column="13" selection-start-line="10712" selection-start-column="13" selection-end-line="10712" selection-end-column="13" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/mapper/DictTypeMapper.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="161">
          <caret line="29" column="26" selection-start-line="29" selection-start-column="26" selection-end-line="29" selection-end-column="26" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/DictTypeServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="199">
          <caret line="52" column="41" selection-start-line="52" selection-start-column="41" selection-end-line="52" selection-end-column="41" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/service/IDictTypeService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="161">
          <caret line="28" column="26" selection-start-line="28" selection-start-column="26" selection-end-line="28" selection-end-column="26" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/task/task.html">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="19">
          <caret line="141" column="36" selection-start-line="141" selection-start-column="32" selection-end-line="141" selection-end-column="36" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/DictTypeMapper.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="931">
          <caret line="49" column="43" selection-start-line="49" selection-start-column="43" selection-end-line="49" selection-end-column="43" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="1653">
          <caret line="87" column="31" selection-start-line="87" selection-start-column="23" selection-end-line="87" selection-end-column="31" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dict/controller/DictTypeController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="243">
          <caret line="144" column="55" selection-start-line="144" selection-start-column="55" selection-end-line="144" selection-end-column="55" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/type/type.html">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="153">
          <caret line="218" column="15" selection-start-line="218" selection-start-column="12" selection-end-line="218" selection-end-column="15" />
        </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="67">
          <caret line="102" selection-start-line="102" selection-end-line="102" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
1166
1167
1168
1169
1170
 
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
      <provider selected="true" editor-type-id="text-editor">
任务模块
d8cb88b4
 
wangyanxiong authored 
1171
1172
 
        <state relative-caret-position="248">
          <caret line="43" column="123" lean-forward="true" selection-start-line="43" selection-start-column="123" selection-end-line="43" selection-end-column="123" />
上架任务查询
cb63bfd6
 
wangyanxiong authored 
1173
1174
1175
1176
1177
1178
1179
 
          <folding>
            <element signature="n#style#0;n#i#0;n#a#0;n#!!top" expanded="true" />
            <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
任务模块
d8cb88b4
 
wangyanxiong authored 
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
 
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskDetail/controller/TaskDetailController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-185">
          <caret line="43" column="48" lean-forward="true" selection-start-line="43" selection-start-column="48" selection-end-line="43" selection-end-column="48" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="40">
          <caret line="55" column="48" lean-forward="true" selection-start-line="55" selection-start-column="48" selection-end-line="55" selection-end-column="48" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
代码错误，导包
751bd7c0
 
xqs authored 
1200
 
  </component>
初始化分支
db744b72
 
tangying authored 
1201
 
</project>