wms / hhwms · Files

Blame view

.idea/workspace.xml 58.2 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">
删除信义接口
7a9a3f52
 
mahuandong authored 
4
 
    <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="合并信义源码">
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
5
 
      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
添加质检头表和明细页面
1747822c
 
mahuandong authored 
6
 
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
7
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/emptyOutHandle/EmptyOutHandleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/emptyOutHandle/EmptyOutHandleServiceImpl.java" afterDir="false" />
新增丢失文件
8cf81d85
 
mahuandong authored 
8
9
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventoryController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventoryController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java" afterDir="false" />
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
10
11
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/shipment/MobileShipmentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/shipment/MobileShipmentController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/MobileTaskController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/MobileTaskController.java" afterDir="false" />
移植PDA接口过来
99963e50
 
游杰 authored 
12
13
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" afterDir="false" />
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
14
15
16
 
      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/add.html" afterDir="false" />
初始化分支
db744b72
 
tangying authored 
17
 
    </list>
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
18
19
20
 
    <ignored path="$PROJECT_DIR$/target/" />
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="TRACKING_ENABLED" value="true" />
初始化分支
db744b72
 
tangying authored 
21
22
23
24
25
 
    <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 
26
 
  <component name="DatabaseView">
修改客户页面
0c8a451b
 
mahuandong authored 
27
 
    <option name="SHOW_INTERMEDIATE" value="false" />
maven
81c737f9
 
pengcheng authored 
28
29
30
31
32
 
    <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 
33
 
    <option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
maven
81c737f9
 
pengcheng authored 
34
35
36
 
    <option name="HIDDEN_KINDS">
      <set />
    </option>
修改接口文档扫描路径，修改图表显示
7d7e358f
 
mahuandong authored 
37
38
39
40
41
42
 
    <expand>
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
      </path>
    </expand>
maven
81c737f9
 
pengcheng authored 
43
44
 
    <select />
  </component>
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
 
  <component name="FileEditorManager">
    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
      <file leaf-file-name="MobileInventoryController.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventoryController.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="269">
              <caret line="464" column="5" selection-start-line="441" selection-start-column="3" selection-end-line="464" selection-end-column="5" />
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="MobileBatchReceiptController.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="164">
              <caret line="532" column="4" selection-start-line="532" selection-start-column="4" selection-end-line="553" selection-end-column="5" />
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="MobileTaskController.java" pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/MobileTaskController.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="211">
              <caret line="74" column="43" selection-start-line="74" selection-start-column="22" selection-end-line="74" selection-end-column="43" />
              <folding>
                <element signature="imports" expanded="true" />
              </folding>
            </state>
          </provider>
        </entry>
      </file>
      <file leaf-file-name="MobileShipmentController.java" pinned="false" current-in-tab="false">
        <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/shipment/MobileShipmentController.java">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="230">
              <caret line="209" column="5" selection-start-line="188" selection-start-column="4" selection-end-line="209" selection-end-column="5" />
            </state>
          </provider>
        </entry>
      </file>
    </leaf>
  </component>
库区设置编辑
69aa10ad
 
pengcheng authored 
88
89
90
 
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
      <list>
修改质检页面、添加完成质检
c022700a
 
mahuandong authored 
91
 
        <option value="Interface" />
d多种格式导出
9f6696cd
 
pengcheng authored 
92
 
        <option value="Enum" />
修改接口文档扫描路径，修改图表显示
7d7e358f
 
mahuandong authored 
93
 
        <option value="HTML File" />
修改WCS2接口
f4b06d89
 
pengcheng authored 
94
 
        <option value="Class" />
库区设置编辑
69aa10ad
 
pengcheng authored 
95
96
97
 
      </list>
    </option>
  </component>
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
 
  <component name="FindInProjectRecents">
    <findStrings>
      <find>search</find>
      <find>receiptTypeService</find>
      <find>LocationInfo</find>
      <find>getLocationInfo</find>
      <find>LK</find>
      <find>findShipment</find>
      <find>没有对应的出库单类型</find>
      <find>createShipmentTask</find>
      <find>getEmptyContainerInLocation</find>
      <find>findlast</find>
      <find>searchTask</find>
      <find>COMPLETE</find>
      <find>complete</find>
      <find>findTask</find>
      <find>inventoryDetailLook</find>
      <find>inventoryDetailId</find>
      <find>containerCode</find>
      <find>materialName</find>
      <find />
      <find>定位</find>
      <find>setLocation</find>
      <find>setLocationCode</find>
      <find>getLocationCode</find>
      <find>weight</find>
      <find>location</find>
      <find>locationService</find>
      <find>getOne</find>
      <find>locationLambdaQueryWrapper</find>
      <find>receiptDetailList</find>
      <find>searchShipmentInCondition</find>
    </findStrings>
    <replaceStrings>
      <replace />
    </replaceStrings>
    <dirStrings>
      <dir>E:\web\wms2\src\main\java\com\huaheng\pc\receipt</dir>
    </dirStrings>
  </component>
初始化分支
db744b72
 
tangying authored 
138
 
  <component name="Git.Settings">
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
139
 
    <option name="UPDATE_TYPE" value="MERGE" />
修复接口bug，新增库存同步物料同步用户同步接口
bb0fbc52
 
wangyanxiong authored 
140
 
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
修改WCS2接口
f4b06d89
 
pengcheng authored 
141
142
 
    <option name="RECENT_BRANCH_BY_REPOSITORY">
      <map>
修改客户页面
0c8a451b
 
mahuandong authored 
143
 
        <entry key="$PROJECT_DIR$" value="master" />
修改WCS2接口
f4b06d89
 
pengcheng authored 
144
145
 
      </map>
    </option>
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
 
  </component>
  <component name="IdeDocumentHistory">
    <option name="CHANGED_PATHS">
      <list>
        <option value="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobilePutawayController.java" />
        <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/LocationMapper.xml" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/mapper/ReceiptHeaderMapper.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/mapper/ShipmentHeaderMapper.java" />
        <option value="$PROJECT_DIR$/src/main/resources/mybatis/shipment/ShipmentHeaderMapper.xml" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java" />
        <option value="$PROJECT_DIR$/src/main/resources/templates/monitor/locationstatus/locationstatus.html" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeService.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java" />
        <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml" />
        <option value="$PROJECT_DIR$/src/main/resources/templates/task/task/task.html" />
        <option value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/TaskDomain.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/InventoryDomain.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/TaskInfo.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/TodayInfo.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventoryController.java" />
        <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
        <option value="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/add.html" />
        <option value="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/add.html" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/emptyOutHandle/EmptyOutHandleServiceImpl.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/shipment/MobileShipmentController.java" />
        <option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/MobileTaskController.java" />
      </list>
    </option>
修复接口bug，新增库存同步物料同步用户同步接口
bb0fbc52
 
wangyanxiong authored 
184
 
  </component>
maven
81c737f9
 
pengcheng authored 
185
186
187
 
  <component name="IgnoredFileRootStore">
    <option name="generatedRoots">
      <set>
修改客户页面
0c8a451b
 
mahuandong authored 
188
 
        <option value="E:\code\wms2\.idea" />
maven
81c737f9
 
pengcheng authored 
189
 
      </set>
移植PDA接口过来
99963e50
 
游杰 authored 
190
191
 
    </option>
  </component>
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
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
 
  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
  <component name="JsGulpfileManager">
    <detection-done>true</detection-done>
    <sorting>DEFINITION_ORDER</sorting>
  </component>
  <component name="MavenImportPreferences">
    <option name="importingSettings">
      <MavenImportingSettings>
        <option name="importAutomatically" value="true" />
      </MavenImportingSettings>
    </option>
  </component>
  <component name="MavenProjectNavigator">
    <treeState>
      <expand>
        <path>
          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
          <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
        </path>
      </expand>
      <select />
    </treeState>
  </component>
  <component name="NodePackageJsonFileManager">
    <packageJsonPaths />
  </component>
  <component name="ProjectFrameBounds" extendedState="6">
    <option name="x" value="-10" />
    <option name="y" value="-10" />
    <option name="width" value="1400" />
    <option name="height" value="780" />
  </component>
修改客户页面
0c8a451b
 
mahuandong authored 
225
 
  <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
修改入库单审核移动到入库单头表
6bd8f75e
 
mahuandong authored 
226
 
  <component name="ProjectLevelVcsManager">
修改客户页面
0c8a451b
 
mahuandong authored 
227
 
    <ConfirmationsSetting value="2" id="Add" />
修改入库单审核移动到入库单头表
6bd8f75e
 
mahuandong authored 
228
 
  </component>
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
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
293
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
342
 
  <component name="ProjectView">
    <navigator proportions="" version="1">
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
      <pane id="AndroidView" />
      <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="api" 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="api" type="462c0819:PsiDirectoryNode" />
              <item name="general" 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="mobile" 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="mobile" type="462c0819:PsiDirectoryNode" />
              <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="mobile" type="462c0819:PsiDirectoryNode" />
              <item name="task" type="462c0819:PsiDirectoryNode" />
            </path>
            <path>
              <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
              <item name="wms2" type="462c0819:PsiDirectoryNode" />
              <item name="target" type="462c0819:PsiDirectoryNode" />
            </path>
          </expand>
          <select />
        </subPane>
      </pane>
      <pane id="PackagesPane" />
      <pane id="Scope" />
    </panes>
  </component>
合并信义前端页面
5c3b917e
 
mahuandong authored 
343
344
345
346
 
  <component name="ProjectViewState">
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showExcludedFiles" value="true" />
    <option name="showLibraryContents" value="true" />
修复接口bug，新增库存同步物料同步用户同步接口
bb0fbc52
 
wangyanxiong authored 
347
 
  </component>
初始化分支
db744b72
 
tangying authored 
348
 
  <component name="PropertiesComponent">
添加根据容器编码查找容器的方法
54104a15
 
mahuandong authored 
349
 
    <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
maven
81c737f9
 
pengcheng authored 
350
 
    <property name="DatabaseDriversLRU" value="mysql" />
新增丢失文件
8cf81d85
 
mahuandong authored 
351
 
    <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
添加质检头表和明细页面
1747822c
 
mahuandong authored 
352
353
354
355
 
    <property name="RequestMappingsPanelOrder0" value="0" />
    <property name="RequestMappingsPanelOrder1" value="1" />
    <property name="RequestMappingsPanelWidth0" value="75" />
    <property name="RequestMappingsPanelWidth1" value="75" />
合并信义源码
29a1ab31
 
mahuandong authored 
356
 
    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
初始化分支
db744b72
 
tangying authored 
357
 
    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
358
 
    <property name="SearchEverywhereHistoryKey" value="ShipmentType&#9;PSI&#9;JAVA://com.huaheng.pc.config.shipmentType.domain.ShipmentType&#10;ShipmentHeaderM&#9;PSI&#9;JAVA://com.huaheng.pc.shipment.shipmentHeader.mapper.ShipmentHeaderMapper&#10;ReceiptType&#9;FILE&#9;file://E:/web/wms2/src/main/java/com/huaheng/pc/config/receiptType/domain/ReceiptType.java&#10;companyServiceimpl&#9;PSI&#9;JAVA://com.huaheng.pc.config.company.service.CompanyServiceImpl&#10;receipt&#9;FILE&#9;file://E:/web/wms2/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html&#10;Receipt&#9;FILE&#9;file://E:/web/wms2/src/main/resources/templates/receipt/receiptDetail/receiptDetail.html&#10;receiptHeader&#9;FILE&#9;file://E:/web/wms2/src/main/resources/templates/admin/receiptHeader/receiptHeader.html&#10;TaskContr&#9;PSI&#9;JAVA://com.huaheng.pc.task.taskHeader.controller.TaskHeaderController&#10;Task&#9;FILE&#9;file://E:/web/wms2/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
初始化分支
db744b72
 
tangying authored 
359
360
 
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
新增丢失文件
8cf81d85
 
mahuandong authored 
361
362
 
    <property name="ignore_missing_gitignore" value="true" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader" />
修改客户页面
0c8a451b
 
mahuandong authored 
363
 
    <property name="node.js.detected.package.eslint" value="true" />
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
364
 
    <property name="node.js.detected.package.tslint" value="true" />
修改客户页面
0c8a451b
 
mahuandong authored 
365
366
367
368
 
    <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)" />
添加根据容器编码查找容器的方法
54104a15
 
mahuandong authored 
369
370
371
 
    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
  </component>
  <component name="RecentsManager">
物料打印
2666a7d1
 
wangyanxiong authored 
372
 
    <key name="CopyFile.RECENT_KEYS">
新增丢失文件
8cf81d85
 
mahuandong authored 
373
374
 
      <recent name="E:\code\wms2\src\main\resources\templates\task\taskHeader" />
      <recent name="E:\code\wms2\src\main\resources\mybatis\monitor" />
新增盘点单接口，调整单接口，入库单取消接口
709fc605
 
wangyanxiong authored 
375
376
 
    </key>
    <key name="MoveFile.RECENT_KEYS">
修改客户页面
0c8a451b
 
mahuandong authored 
377
378
 
      <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
      <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
新增盘点单接口，调整单接口，入库单取消接口
709fc605
 
wangyanxiong authored 
379
 
    </key>
maven
81c737f9
 
pengcheng authored 
380
 
  </component>
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
381
382
383
384
385
386
387
388
389
390
391
392
 
  <component name="RunDashboard">
    <option name="ruleStates">
      <list>
        <RuleState>
          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
        </RuleState>
        <RuleState>
          <option name="name" value="StatusDashboardGroupingRule" />
        </RuleState>
      </list>
    </option>
  </component>
修改客户页面
0c8a451b
 
mahuandong authored 
393
394
 
  <component name="RunManager">
    <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
395
 
      <module name="huaheng" />
修复接口bug，新增库存同步物料同步用户同步接口
bb0fbc52
 
wangyanxiong authored 
396
 
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
修改客户页面
0c8a451b
 
mahuandong authored 
397
398
399
 
      <option name="ALTERNATIVE_JRE_PATH" />
      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
400
401
402
403
404
405
406
 
      <additionalParameters>
        <param>
          <option name="enabled" value="true" />
          <option name="name" value="" />
          <option name="value" value="" />
        </param>
      </additionalParameters>
修复接口bug，新增库存同步物料同步用户同步接口
bb0fbc52
 
wangyanxiong authored 
407
 
    </configuration>
修改WCS2接口
f4b06d89
 
pengcheng authored 
408
 
    <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
修改接口文档扫描路径，修改图表显示
7d7e358f
 
mahuandong authored 
409
 
      <module name="huaheng" />
修改质检页面、添加完成质检
c022700a
 
mahuandong authored 
410
411
412
413
414
415
 
      <extension name="coverage">
        <pattern>
          <option name="PATTERN" value="com.huaheng.*" />
          <option name="ENABLED" value="true" />
        </pattern>
      </extension>
修改客户页面
0c8a451b
 
mahuandong authored 
416
 
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
添加质检头表和明细页面
1747822c
 
mahuandong authored 
417
 
      <option name="ALTERNATIVE_JRE_PATH" />
修改接口文档扫描路径，修改图表显示
7d7e358f
 
mahuandong authored 
418
 
      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateResources" />
修改质检页面、添加完成质检
c022700a
 
mahuandong authored 
419
 
      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
库区设置编辑
69aa10ad
 
pengcheng authored 
420
 
    </configuration>
添加质检头表和明细页面
1747822c
 
mahuandong authored 
421
422
 
  </component>
  <component name="ServiceViewManager">
合并信义前端页面
5c3b917e
 
mahuandong authored 
423
424
425
426
427
428
429
430
431
 
    <option name="viewStates">
      <list>
        <serviceView>
          <treeState>
            <expand />
            <select />
          </treeState>
        </serviceView>
      </list>
添加质检头表和明细页面
1747822c
 
mahuandong authored 
432
 
    </option>
maven
81c737f9
 
pengcheng authored 
433
 
  </component>
初始化分支
db744b72
 
tangying authored 
434
435
436
437
438
 
  <component name="SvnConfiguration">
    <configuration />
  </component>
  <component name="TaskManager">
    <task active="true" id="Default" summary="Default task">
修改客户页面
0c8a451b
 
mahuandong authored 
439
440
 
      <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" />
      <created>1565160110910</created>
初始化分支
db744b72
 
tangying authored 
441
442
 
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
修改客户页面
0c8a451b
 
mahuandong authored 
443
444
445
446
447
448
449
 
      <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" />
合并信义前端页面
5c3b917e
 
mahuandong authored 
450
 
      <workItem from="1578550781950" duration="1941000" />
删除信义接口
7a9a3f52
 
mahuandong authored 
451
 
      <workItem from="1578571901482" duration="717000" />
新增丢失文件
8cf81d85
 
mahuandong authored 
452
453
454
455
 
      <workItem from="1580799270581" duration="22000" />
      <workItem from="1580799464519" duration="19000" />
      <workItem from="1581986427727" duration="2807000" />
      <workItem from="1581990347840" duration="909000" />
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
456
457
458
459
460
 
      <workItem from="1587602309059" duration="16806000" />
      <workItem from="1587687832557" duration="31176000" />
      <workItem from="1588033862630" duration="20020000" />
      <workItem from="1588120660621" duration="25576000" />
      <workItem from="1588551696599" duration="51867000" />
初始化分支
db744b72
 
tangying authored 
461
 
    </task>
修改客户页面
0c8a451b
 
mahuandong authored 
462
463
 
    <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
      <created>1565226427512</created>
库区设置编辑
69aa10ad
 
pengcheng authored 
464
465
466
 
      <option name="number" value="00001" />
      <option name="presentableId" value="LOCAL-00001" />
      <option name="project" value="LOCAL" />
修改客户页面
0c8a451b
 
mahuandong authored 
467
 
      <updated>1565226427512</updated>
库区设置编辑
69aa10ad
 
pengcheng authored 
468
 
    </task>
修改客户页面
0c8a451b
 
mahuandong authored 
469
470
 
    <task id="LOCAL-00002" summary="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面">
      <created>1565256884822</created>
maven
81c737f9
 
pengcheng authored 
471
472
473
 
      <option name="number" value="00002" />
      <option name="presentableId" value="LOCAL-00002" />
      <option name="project" value="LOCAL" />
修改客户页面
0c8a451b
 
mahuandong authored 
474
 
      <updated>1565256884822</updated>
maven
81c737f9
 
pengcheng authored 
475
 
    </task>
修改客户页面
0c8a451b
 
mahuandong authored 
476
477
 
    <task id="LOCAL-00003" summary="修改库区service">
      <created>1565259481656</created>
maven
81c737f9
 
pengcheng authored 
478
479
480
 
      <option name="number" value="00003" />
      <option name="presentableId" value="LOCAL-00003" />
      <option name="project" value="LOCAL" />
修改客户页面
0c8a451b
 
mahuandong authored 
481
 
      <updated>1565259481656</updated>
maven
81c737f9
 
pengcheng authored 
482
 
    </task>
合并信义前端页面
5c3b917e
 
mahuandong authored 
483
 
    <option name="localTasksCounter" value="5" />
初始化分支
db744b72
 
tangying authored 
484
485
 
    <servers />
  </component>
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
 
  <component name="TimeTrackingManager">
    <option name="totallyTimeSpent" value="150611000" />
  </component>
  <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">
    <frame x="-7" y="-7" width="1550" height="838" extended-state="7" />
    <editor active="true" />
    <layout>
      <window_info anchor="right" id="Palette" order="3" />
      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.50067025" side_tool="true" weight="0.4807418" />
      <window_info anchor="right" id="Maven Projects" order="9" weight="0.3297587" />
      <window_info anchor="bottom" id="Database Changes" order="7" />
      <window_info id="Capture Tool" order="2" />
      <window_info id="Designer" order="2" />
      <window_info anchor="bottom" id="Statistic" order="7" />
      <window_info anchor="right" id="Database" order="6" weight="0.3297587" />
      <window_info id="Structure" order="1" sideWeight="0.5011442" side_tool="true" weight="0.27680966" />
      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
      <window_info id="UI Designer" order="2" />
      <window_info anchor="bottom" id="Debug" order="3" weight="0.37660486" />
      <window_info anchor="bottom" id="TODO" order="6" weight="0.32952926" />
      <window_info anchor="bottom" id="Messages" order="8" sideWeight="0.49865952" weight="0.32952926" />
      <window_info anchor="right" id="Palette&#9;" order="4" />
      <window_info id="Image Layers" order="2" />
      <window_info anchor="bottom" id="Java Enterprise" order="7" weight="0.32952926" />
      <window_info anchor="right" id="Capture Analysis" order="5" />
      <window_info anchor="bottom" id="Version Control" order="7" weight="0.3352354" />
      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.49932975" visible="true" weight="0.38944367" />
      <window_info anchor="bottom" id="Spring" order="7" weight="0.32952926" />
      <window_info anchor="bottom" id="Terminal" order="7" weight="0.32952926" />
      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49885583" visible="true" weight="0.288874" />
      <window_info anchor="right" id="Bean Validation" order="7" weight="0.3297587" />
      <window_info id="Web" order="2" side_tool="true" />
      <window_info anchor="bottom" id="Find" order="1" weight="0.32952926" />
      <window_info anchor="right" id="Theme Preview" order="8" />
      <window_info id="Favorites" order="2" side_tool="true" />
      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
      <window_info anchor="bottom" id="Message" order="0" />
      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
    </layout>
  </component>
初始化分支
db744b72
 
tangying authored 
537
538
539
 
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="1" />
  </component>
库区设置编辑
69aa10ad
 
pengcheng authored 
540
541
542
543
544
545
 
  <component name="Vcs.Log.Tabs.Properties">
    <option name="TAB_STATES">
      <map>
        <entry key="MAIN">
          <value>
            <State>
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
546
547
548
549
550
551
552
553
554
555
556
557
558
559
 
              <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 
560
561
562
563
564
 
            </State>
          </value>
        </entry>
      </map>
    </option>
移植PDA接口过来
99963e50
 
游杰 authored 
565
 
  </component>
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
566
567
568
 
  <component name="VcsContentAnnotationSettings">
    <option name="myLimit" value="2678400000" />
  </component>
库区设置编辑
69aa10ad
 
pengcheng authored 
569
 
  <component name="VcsManagerConfiguration">
修改客户页面
0c8a451b
 
mahuandong authored 
570
571
572
 
    <MESSAGE value="添加库位、库位类型增删改查接口" />
    <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
    <MESSAGE value="修改库区service" />
合并信义前端页面
5c3b917e
 
mahuandong authored 
573
 
    <option name="LAST_COMMIT_MESSAGE" value="合并信义源码" />
maven
81c737f9
 
pengcheng authored 
574
 
  </component>
合并信义源码
29a1ab31
 
mahuandong authored 
575
 
  <component name="WindowStateProjectService">
增加任务、入库单、出库单 按条件查询
b549a417
 
游杰 authored 
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
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
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
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
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
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
 
    <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog" />
    <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" />
    <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state x="550" y="111" key="CommitChangelistDialog2" />
    <state x="550" y="111" key="CommitChangelistDialog2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state x="550" y="111" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" />
    <state x="184" y="92" key="DiffContextDialog" />
    <state x="184" y="92" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" />
    <state width="1877" height="232" key="GridCell.Tab.0.bottom" />
    <state width="1877" height="232" key="GridCell.Tab.0.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state width="1877" height="232" key="GridCell.Tab.0.center" />
    <state width="1877" height="232" key="GridCell.Tab.0.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state width="1877" height="232" key="GridCell.Tab.0.left" />
    <state width="1877" height="232" key="GridCell.Tab.0.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state width="1877" height="232" key="GridCell.Tab.0.right" />
    <state width="1877" height="232" key="GridCell.Tab.0.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state width="1877" height="232" key="GridCell.Tab.1.bottom" />
    <state width="1877" height="232" key="GridCell.Tab.1.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state width="1877" height="232" key="GridCell.Tab.1.center" />
    <state width="1877" height="232" key="GridCell.Tab.1.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state width="1877" height="232" key="GridCell.Tab.1.left" />
    <state width="1877" height="232" key="GridCell.Tab.1.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state width="1877" height="232" key="GridCell.Tab.1.right" />
    <state width="1877" height="232" key="GridCell.Tab.1.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state width="1877" height="232" key="GridCell.Tab.2.bottom" />
    <state width="1877" height="232" key="GridCell.Tab.2.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state width="1877" height="232" key="GridCell.Tab.2.center" />
    <state width="1877" height="232" key="GridCell.Tab.2.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state width="1877" height="232" key="GridCell.Tab.2.left" />
    <state width="1877" height="232" key="GridCell.Tab.2.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state width="1877" height="232" key="GridCell.Tab.2.right" />
    <state width="1877" height="232" key="GridCell.Tab.2.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state x="552" y="253" key="Vcs.Push.Dialog.v2" />
    <state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" />
    <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" />
    <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state x="709" y="231" key="git4idea.branch.GitSmartOperationDialog" />
    <state x="709" y="231" key="git4idea.branch.GitSmartOperationDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
    <state x="647" y="310" key="git4idea.merge.GitPullDialog" />
    <state x="647" y="310" key="git4idea.merge.GitPullDialog/0.0.1920.1040@0.0.1920.1040" />
    <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" />
    <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <breakpoints>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java</url>
          <line>462</line>
          <properties />
          <option name="timeStamp" value="41" />
        </line-breakpoint>
      </breakpoints>
      <breakpoints-dialog>
        <breakpoints-dialog />
      </breakpoints-dialog>
      <option name="time" value="61" />
    </breakpoint-manager>
  </component>
  <component name="antWorkspaceConfiguration">
    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
    <option name="FILTER_TARGETS" value="false" />
  </component>
  <component name="editorHistoryManager">
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="190">
          <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="152">
          <caret line="124" column="43" lean-forward="true" selection-start-line="124" selection-start-column="43" selection-end-line="124" selection-end-column="43" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="133">
          <caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
        </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="148">
          <caret line="57" column="6" selection-start-line="57" selection-start-column="6" selection-end-line="57" selection-end-column="142" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="912">
          <caret line="48" column="54" selection-start-line="48" selection-start-column="54" selection-end-line="48" selection-end-column="54" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="3097">
          <caret line="163" column="52" selection-start-line="163" selection-start-column="52" selection-end-line="163" selection-end-column="52" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/TaskIds.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="112">
          <caret line="11" column="15" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="15" />
        </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="2907">
          <caret line="153" column="17" selection-start-line="153" selection-start-column="17" selection-end-line="153" selection-end-column="17" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/TaskDomain.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="249">
          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventory.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="133">
          <caret line="9" column="19" selection-start-line="9" selection-start-column="19" selection-end-line="9" selection-end-column="19" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ShipmentDomain.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="76">
          <caret line="8" selection-start-line="8" selection-end-line="8" selection-end-column="5" />
        </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">
        <state relative-caret-position="266">
          <caret line="23" selection-start-line="23" selection-end-line="23" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/InventoryDomain.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="133">
          <caret line="10" column="51" selection-start-line="10" selection-start-column="51" selection-end-line="10" selection-end-column="51" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/TodayInfo.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="38">
          <caret line="2" column="22" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="22" />
          <folding>
            <element signature="e#197#198#0" expanded="true" />
            <element signature="e#230#231#0" expanded="true" />
            <element signature="e#283#284#0" expanded="true" />
            <element signature="e#327#328#0" expanded="true" />
            <element signature="e#367#368#0" expanded="true" />
            <element signature="e#402#403#0" expanded="true" />
            <element signature="e#459#460#0" expanded="true" />
            <element signature="e#507#508#0" expanded="true" />
            <element signature="e#548#549#0" expanded="true" />
            <element signature="e#584#585#0" expanded="true" />
            <element signature="e#643#644#0" expanded="true" />
            <element signature="e#693#694#0" expanded="true" />
          </folding>
        </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="112">
          <caret line="111" column="48" selection-start-line="111" selection-start-column="29" selection-end-line="111" selection-end-column="48" />
        </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="-2">
          <caret line="66" column="18" selection-start-line="66" selection-start-column="18" selection-end-line="66" selection-end-column="18" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="197">
          <caret line="29" column="22" lean-forward="true" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
      <provider selected="true" editor-type-id="text-editor" />
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/framework/config/ShiroConfig.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="327">
          <caret line="264" column="19" lean-forward="true" selection-start-line="264" selection-start-column="19" selection-end-line="264" selection-end-column="19" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="161">
          <caret line="3350" column="18" selection-start-line="3350" selection-start-column="18" selection-end-line="3350" selection-end-column="18" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptDetail/add.html">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="152">
          <caret line="134" column="32" lean-forward="true" selection-start-line="134" selection-start-column="32" selection-end-line="134" selection-end-column="32" />
          <folding>
            <element signature="n#style#0;n#button#0;n#div#0;n#div#14;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
            <element signature="n#style#0;n#button#1;n#div#0;n#div#14;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/add.html">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="114">
          <caret line="6" column="68" lean-forward="true" selection-start-line="6" selection-start-column="68" selection-end-line="6" selection-end-column="68" />
          <folding>
            <element signature="n#style#0;n#button#0;n#div#0;n#div#5;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
            <element signature="n#style#0;n#button#1;n#div#0;n#div#5;n#form#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/edit.html">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="118">
          <caret line="31" column="32" lean-forward="true" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="353">
          <caret line="90" column="9" lean-forward="true" selection-start-line="90" selection-start-column="9" selection-end-line="90" selection-end-column="9" />
        </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="9" column="66" lean-forward="true" selection-start-line="9" selection-start-column="66" selection-end-line="9" selection-end-column="66" />
        </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="106">
          <caret line="90" column="55" lean-forward="true" selection-start-line="90" selection-start-column="55" selection-end-line="90" selection-end-column="55" />
        </state>
      </provider>
    </entry>
    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2-sources.jar!/com/baomidou/mybatisplus/extension/service/IService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="337">
          <caret line="390" column="39" lean-forward="true" selection-start-line="390" selection-start-column="39" selection-end-line="390" selection-end-column="39" />
          <folding>
            <element signature="e#5062#5063#0" expanded="true" />
            <element signature="e#5111#5112#0" 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="216">
          <caret line="162" column="33" selection-start-line="162" selection-start-column="33" selection-end-line="162" selection-end-column="33" />
        </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="339">
          <caret line="651" column="39" lean-forward="true" selection-start-line="651" selection-start-column="39" selection-end-line="651" selection-end-column="39" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/OverrideHandle.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="348">
          <caret line="33" column="44" lean-forward="true" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="133">
          <caret line="9" column="15" selection-start-line="9" selection-start-column="15" selection-end-line="9" selection-end-column="15" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/EmptyOutHandle.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="224">
          <caret line="35" column="59" lean-forward="true" selection-start-line="35" selection-start-column="59" selection-end-line="35" selection-end-column="59" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/emptyOutHandle/EmptyOutHandleService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="114">
          <caret line="7" selection-start-line="7" selection-end-line="7" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/emptyOutHandle/EmptyOutHandleServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="302">
          <caret line="51" column="5" lean-forward="true" selection-start-line="51" selection-start-column="5" selection-end-line="51" selection-end-column="5" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="133">
          <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="-70">
          <caret line="27" column="22" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/TaskFinish.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="367">
          <caret line="35" column="56" selection-start-line="35" selection-start-column="56" selection-end-line="35" selection-end-column="56" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/TaskInfoController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="167">
          <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/api/wcs/controller/WarecellAllocation.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="424">
          <caret line="56" column="50" lean-forward="true" selection-start-line="56" selection-start-column="50" selection-end-line="56" selection-end-column="50" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="228">
          <caret line="14" column="15" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="197">
          <caret line="309" column="39" selection-start-line="309" selection-start-column="39" selection-end-line="309" selection-end-column="39" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/overrideHandle/OverrideHandleServiceImpl.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="330">
          <caret line="140" column="9" lean-forward="true" selection-start-line="140" selection-start-column="9" selection-end-line="140" selection-end-column="9" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/WcsLoginController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="116">
          <caret line="30" column="53" selection-start-line="30" selection-start-column="53" selection-end-line="30" selection-end-column="53" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/acs/controller/TaskConfirm.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="186">
          <caret line="20" column="34" lean-forward="true" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ReceiptDomain.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="95">
          <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/java/com/huaheng/api/general/controller/ReceiptApi.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="230">
          <caret line="35" column="53" lean-forward="true" selection-start-line="35" selection-start-column="53" selection-end-line="35" selection-end-column="53" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="243">
          <caret line="71" column="66" selection-start-line="71" selection-start-column="66" selection-end-line="71" selection-end-column="66" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventoryController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="269">
          <caret line="464" column="5" selection-start-line="441" selection-start-column="3" selection-end-line="464" selection-end-column="5" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="164">
          <caret line="532" column="4" selection-start-line="532" selection-start-column="4" selection-end-line="553" selection-end-column="5" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/shipment/MobileShipmentController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="230">
          <caret line="209" column="5" selection-start-line="188" selection-start-column="4" selection-end-line="209" selection-end-column="5" />
        </state>
      </provider>
    </entry>
    <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/MobileTaskController.java">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="211">
          <caret line="74" column="43" selection-start-line="74" selection-start-column="22" selection-end-line="74" selection-end-column="43" />
          <folding>
            <element signature="imports" expanded="true" />
          </folding>
        </state>
      </provider>
    </entry>
修复接口bug，新增库存同步物料同步用户同步接口
bb0fbc52
 
wangyanxiong authored 
1029
 
  </component>
初始化分支
db744b72
 
tangying authored 
1030
 
</project>