wms / wms_changshabiyadi · Files

Blame view

.idea/workspace.xml 45.5 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="合并信义源码">
移植PDA接口过来
99963e50
 
游杰 authored 
5
6
 
      <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/shipment/MobileShipmentController.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/shipment/Shipment.java" afterDir="false" />
新增丢失文件
8cf81d85
 
mahuandong authored 
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
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
88
89
90
91
92
93
94
95
96
97
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
 
      <change afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/application-prd.yml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/fonts/STSONG.TTF" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/fonts/fonts.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/jaspers/mypage.jasper" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/check/CheckDetailMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/check/CheckHeaderMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/check/CheckingRegisterMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/AlarmLevelMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/BomHeaderMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/CarrierMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ConfigValueMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ConfigWarningMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerCapacityMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/CustomerMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ExcelTemplateMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/FilterConfigDetailMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/LocationMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialMultipleMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialTypeMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ReceiptPreferenceMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ReceiptTypeMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/SendMailMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/StationMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/StatusFlowDetailMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/SupplierMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/WarehouseMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/WaveFlowDetailMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/WcsscanbarcodeMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/AdjustDetailMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountHeaderMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/monitor/JobLogMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/monitor/JobMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/receipt/ReceiptDetailHistoryMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/receipt/ReceiptHeaderHistoryMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/shipment/ShipmentCombinationMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/shipment/ShipmentDetailHistoryMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/shipment/ShipmentHeaderHistoryMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/shipment/WaveMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/system/SysUserWarehouseMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskPreferenceMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/xinyi/TokenMapper.xml" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/static/ajax/libs/bootstrap3-editable/img/loading.gif" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/static/ajax/libs/bootstrap3-editable/js/bootstrap-editable.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/static/ajax/libs/bootstrap3-editable/js/bootstrap-editable.min.js" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/alarmLevel/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/alarmLevel/alarmLevel.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/alarmLevel/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/bomDetail/bomDetail.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/bomDetail/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/bomHeader/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/bomHeader/bomHeader.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/bomHeader/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/carrier/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/carrier/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/company/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/company/company.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/company/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/configValue/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/configValue/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/configWarning/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/configWarning/configWarning.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/configWarning/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/container/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/container/container.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/container/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/customer/customer.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/customer/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/cycleCountPreference/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/excelTemplate/excelTemplate.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigDetail/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigDetail/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigHeader/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/location/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/location/addBatch.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/location/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/material/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/material/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/material/material.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialMultiple/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialMultiple/materialMultiple.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialType/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialType/materialType.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialUnit/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialUnit/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialUnit/materialUnit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/receiptPreference.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptType/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptType/receiptType.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentPreference/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentPreference/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentPreference/shipmentPreference.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentType/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentType/shipmentType.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowDetail/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowDetail/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowDetail/statusFlowDetail.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowHeader/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowHeader/statusFlowHeader.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/supplier/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/warehouse/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/warehouse/copy.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/warehouse/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/waveFlowHeader/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/waveFlowHeader/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/waveFlowHeader/waveFlowHeader.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/waveMaster/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/waveMaster/waveMaster.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/report.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyCheckOut.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyContainer.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyIn.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyOut.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentAnalyzeTemplate/shipmentAnalyzeTemplate.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentHeader/addWave.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/wave/add.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/wave/edit.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/test/java/com.huaheng.test/BatchCreated.java" afterDir="false" />
添加质检头表和明细页面
1747822c
 
mahuandong authored 
136
 
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
新增丢失文件
8cf81d85
 
mahuandong authored 
137
138
139
140
141
142
143
144
145
146
147
148
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/http/HttpUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/http/HttpUtils.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/general/CompanyInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/general/CompanyInfo.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/general/MobileUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/general/MobileUserController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventory.java" afterDir="false" />
      <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" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/ReceiptBill.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/ReceiptBill.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/company/service/CompanyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/company/service/CompanyService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/company/service/CompanyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/company/service/CompanyServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/domain/Location.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/domain/Location.java" afterDir="false" />
移植PDA接口过来
99963e50
 
游杰 authored 
149
150
151
152
153
154
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/mapper/MaterialMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/mapper/MaterialMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialServiceImpl.java" afterDir="false" />
新增丢失文件
8cf81d85
 
mahuandong authored 
155
156
157
158
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/wcsscanbarcode/mapper/WcsscanbarcodeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/wcsscanbarcode/mapper/WcsscanbarcodeMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/wcsscanbarcode/service/WcsscanbarcodeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/wcsscanbarcode/service/WcsscanbarcodeService.java" afterDir="false" />
移植PDA接口过来
99963e50
 
游杰 authored 
159
160
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" afterDir="false" />
新增丢失文件
8cf81d85
 
mahuandong authored 
161
162
163
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java" afterDir="false" />
移植PDA接口过来
99963e50
 
游杰 authored 
164
165
166
167
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java" afterDir="false" />
新增丢失文件
8cf81d85
 
mahuandong authored 
168
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" afterDir="false" />
移植PDA接口过来
99963e50
 
游杰 authored 
169
170
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/mapper/ReceiptHeaderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/mapper/ReceiptHeaderMapper.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java" afterDir="false" />
新增丢失文件
8cf81d85
 
mahuandong authored 
171
172
173
174
175
176
177
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dept/domain/Dept.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dept/domain/Dept.java" afterDir="false" />
      <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" />
移植PDA接口过来
99963e50
 
游杰 authored 
178
179
 
      <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" />
新增丢失文件
8cf81d85
 
mahuandong authored 
180
 
      <change beforePath="$PROJECT_DIR$/src/main/resources/application-druid.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-druid.properties" afterDir="false" />
移植PDA接口过来
99963e50
 
游杰 authored 
181
 
      <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml" afterDir="false" />
新增丢失文件
8cf81d85
 
mahuandong authored 
182
183
184
185
186
187
188
189
190
191
192
 
      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/monitor/locationstatus/locationstatus.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/monitor/locationstatus/locationstatus.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentDetail/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentDetail/edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentHeader/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentHeader/add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentHeader/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentHeader/edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/dept/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/dept/add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/dept/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/dept/edit.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/menu/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/menu/add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/user/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/user/add.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/test/java/com.huaheng.test/EncryptPassword.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com.huaheng.test/EncryptPassword.java" afterDir="false" />
初始化分支
db744b72
 
tangying authored 
193
194
195
196
197
198
 
    </list>
    <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 
199
 
  <component name="DatabaseView">
修改客户页面
0c8a451b
 
mahuandong authored 
200
 
    <option name="SHOW_INTERMEDIATE" value="false" />
maven
81c737f9
 
pengcheng authored 
201
202
203
204
205
 
    <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 
206
 
    <option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
maven
81c737f9
 
pengcheng authored 
207
208
209
 
    <option name="HIDDEN_KINDS">
      <set />
    </option>
修改接口文档扫描路径，修改图表显示
7d7e358f
 
mahuandong authored 
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
 
    <expand>
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
      </path>
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
      </path>
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
        <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
      </path>
修改客户页面
0c8a451b
 
mahuandong authored 
226
227
228
229
230
231
232
 
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
        <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
        <item name="location: table" type="285a2a93:MysqlImplModel$Table" />
      </path>
修改接口文档扫描路径，修改图表显示
7d7e358f
 
mahuandong authored 
233
 
    </expand>
maven
81c737f9
 
pengcheng authored 
234
235
 
    <select />
  </component>
库区设置编辑
69aa10ad
 
pengcheng authored 
236
237
238
 
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
      <list>
修改质检页面、添加完成质检
c022700a
 
mahuandong authored 
239
 
        <option value="Interface" />
d多种格式导出
9f6696cd
 
pengcheng authored 
240
 
        <option value="Enum" />
修改接口文档扫描路径，修改图表显示
7d7e358f
 
mahuandong authored 
241
 
        <option value="HTML File" />
修改WCS2接口
f4b06d89
 
pengcheng authored 
242
 
        <option value="Class" />
库区设置编辑
69aa10ad
 
pengcheng authored 
243
244
245
 
      </list>
    </option>
  </component>
初始化分支
db744b72
 
tangying authored 
246
 
  <component name="Git.Settings">
修复接口bug，新增库存同步物料同步用户同步接口
bb0fbc52
 
wangyanxiong authored 
247
 
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
修改WCS2接口
f4b06d89
 
pengcheng authored 
248
249
 
    <option name="RECENT_BRANCH_BY_REPOSITORY">
      <map>
修改客户页面
0c8a451b
 
mahuandong authored 
250
 
        <entry key="$PROJECT_DIR$" value="master" />
修改WCS2接口
f4b06d89
 
pengcheng authored 
251
252
 
      </map>
    </option>
修改客户页面
0c8a451b
 
mahuandong authored 
253
 
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
新增丢失文件
8cf81d85
 
mahuandong authored 
254
 
    <option name="UPDATE_TYPE" value="MERGE" />
修复接口bug，新增库存同步物料同步用户同步接口
bb0fbc52
 
wangyanxiong authored 
255
 
  </component>
maven
81c737f9
 
pengcheng authored 
256
257
258
 
  <component name="IgnoredFileRootStore">
    <option name="generatedRoots">
      <set>
修改客户页面
0c8a451b
 
mahuandong authored 
259
 
        <option value="E:\code\wms2\.idea" />
maven
81c737f9
 
pengcheng authored 
260
 
      </set>
移植PDA接口过来
99963e50
 
游杰 authored 
261
262
 
    </option>
  </component>
修改客户页面
0c8a451b
 
mahuandong authored 
263
 
  <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
修改入库单审核移动到入库单头表
6bd8f75e
 
mahuandong authored 
264
 
  <component name="ProjectLevelVcsManager">
修改客户页面
0c8a451b
 
mahuandong authored 
265
 
    <ConfirmationsSetting value="2" id="Add" />
修改入库单审核移动到入库单头表
6bd8f75e
 
mahuandong authored 
266
 
  </component>
合并信义前端页面
5c3b917e
 
mahuandong authored 
267
268
269
270
 
  <component name="ProjectViewState">
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showExcludedFiles" value="true" />
    <option name="showLibraryContents" value="true" />
修复接口bug，新增库存同步物料同步用户同步接口
bb0fbc52
 
wangyanxiong authored 
271
 
  </component>
初始化分支
db744b72
 
tangying authored 
272
 
  <component name="PropertiesComponent">
添加根据容器编码查找容器的方法
54104a15
 
mahuandong authored 
273
 
    <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
maven
81c737f9
 
pengcheng authored 
274
 
    <property name="DatabaseDriversLRU" value="mysql" />
新增丢失文件
8cf81d85
 
mahuandong authored 
275
 
    <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
添加质检头表和明细页面
1747822c
 
mahuandong authored 
276
277
278
279
 
    <property name="RequestMappingsPanelOrder0" value="0" />
    <property name="RequestMappingsPanelOrder1" value="1" />
    <property name="RequestMappingsPanelWidth0" value="75" />
    <property name="RequestMappingsPanelWidth1" value="75" />
合并信义源码
29a1ab31
 
mahuandong authored 
280
 
    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
初始化分支
db744b72
 
tangying authored 
281
282
283
 
    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
新增丢失文件
8cf81d85
 
mahuandong authored 
284
285
 
    <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 
286
 
    <property name="node.js.detected.package.eslint" value="true" />
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
287
 
    <property name="node.js.detected.package.tslint" value="true" />
修改客户页面
0c8a451b
 
mahuandong authored 
288
289
290
291
 
    <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 
292
293
294
 
    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
  </component>
  <component name="RecentsManager">
物料打印
2666a7d1
 
wangyanxiong authored 
295
 
    <key name="CopyFile.RECENT_KEYS">
新增丢失文件
8cf81d85
 
mahuandong authored 
296
297
 
      <recent name="E:\code\wms2\src\main\resources\templates\task\taskHeader" />
      <recent name="E:\code\wms2\src\main\resources\mybatis\monitor" />
新增盘点单接口，调整单接口，入库单取消接口
709fc605
 
wangyanxiong authored 
298
299
 
    </key>
    <key name="MoveFile.RECENT_KEYS">
修改客户页面
0c8a451b
 
mahuandong authored 
300
301
 
      <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
      <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
新增盘点单接口，调整单接口，入库单取消接口
709fc605
 
wangyanxiong authored 
302
 
    </key>
maven
81c737f9
 
pengcheng authored 
303
 
  </component>
修改客户页面
0c8a451b
 
mahuandong authored 
304
305
 
  <component name="RunManager">
    <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
修复接口bug，新增库存同步物料同步用户同步接口
bb0fbc52
 
wangyanxiong authored 
306
307
 
      <module name="wms2" />
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
修改客户页面
0c8a451b
 
mahuandong authored 
308
309
310
 
      <option name="ALTERNATIVE_JRE_PATH" />
      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
库区设置编辑
69aa10ad
 
pengcheng authored 
311
312
313
 
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
修复接口bug，新增库存同步物料同步用户同步接口
bb0fbc52
 
wangyanxiong authored 
314
 
    </configuration>
修改WCS2接口
f4b06d89
 
pengcheng authored 
315
 
    <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
修改接口文档扫描路径，修改图表显示
7d7e358f
 
mahuandong authored 
316
 
      <module name="huaheng" />
修改质检页面、添加完成质检
c022700a
 
mahuandong authored 
317
318
319
320
321
322
 
      <extension name="coverage">
        <pattern>
          <option name="PATTERN" value="com.huaheng.*" />
          <option name="ENABLED" value="true" />
        </pattern>
      </extension>
修改客户页面
0c8a451b
 
mahuandong authored 
323
 
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
添加质检头表和明细页面
1747822c
 
mahuandong authored 
324
 
      <option name="ALTERNATIVE_JRE_PATH" />
修改接口文档扫描路径，修改图表显示
7d7e358f
 
mahuandong authored 
325
 
      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateResources" />
修改质检页面、添加完成质检
c022700a
 
mahuandong authored 
326
 
      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
库区设置编辑
69aa10ad
 
pengcheng authored 
327
 
    </configuration>
添加质检头表和明细页面
1747822c
 
mahuandong authored 
328
329
 
  </component>
  <component name="ServiceViewManager">
合并信义前端页面
5c3b917e
 
mahuandong authored 
330
331
332
333
334
335
336
337
338
 
    <option name="viewStates">
      <list>
        <serviceView>
          <treeState>
            <expand />
            <select />
          </treeState>
        </serviceView>
      </list>
添加质检头表和明细页面
1747822c
 
mahuandong authored 
339
 
    </option>
maven
81c737f9
 
pengcheng authored 
340
 
  </component>
初始化分支
db744b72
 
tangying authored 
341
342
343
344
345
 
  <component name="SvnConfiguration">
    <configuration />
  </component>
  <component name="TaskManager">
    <task active="true" id="Default" summary="Default task">
修改客户页面
0c8a451b
 
mahuandong authored 
346
347
 
      <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" />
      <created>1565160110910</created>
初始化分支
db744b72
 
tangying authored 
348
349
 
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
修改客户页面
0c8a451b
 
mahuandong authored 
350
351
352
353
354
355
356
 
      <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 
357
 
      <workItem from="1578550781950" duration="1941000" />
删除信义接口
7a9a3f52
 
mahuandong authored 
358
 
      <workItem from="1578571901482" duration="717000" />
新增丢失文件
8cf81d85
 
mahuandong authored 
359
360
361
362
 
      <workItem from="1580799270581" duration="22000" />
      <workItem from="1580799464519" duration="19000" />
      <workItem from="1581986427727" duration="2807000" />
      <workItem from="1581990347840" duration="909000" />
初始化分支
db744b72
 
tangying authored 
363
 
    </task>
修改客户页面
0c8a451b
 
mahuandong authored 
364
365
 
    <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
      <created>1565226427512</created>
库区设置编辑
69aa10ad
 
pengcheng authored 
366
367
368
 
      <option name="number" value="00001" />
      <option name="presentableId" value="LOCAL-00001" />
      <option name="project" value="LOCAL" />
修改客户页面
0c8a451b
 
mahuandong authored 
369
 
      <updated>1565226427512</updated>
库区设置编辑
69aa10ad
 
pengcheng authored 
370
 
    </task>
修改客户页面
0c8a451b
 
mahuandong authored 
371
372
 
    <task id="LOCAL-00002" summary="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面">
      <created>1565256884822</created>
maven
81c737f9
 
pengcheng authored 
373
374
375
 
      <option name="number" value="00002" />
      <option name="presentableId" value="LOCAL-00002" />
      <option name="project" value="LOCAL" />
修改客户页面
0c8a451b
 
mahuandong authored 
376
 
      <updated>1565256884822</updated>
maven
81c737f9
 
pengcheng authored 
377
 
    </task>
修改客户页面
0c8a451b
 
mahuandong authored 
378
379
 
    <task id="LOCAL-00003" summary="修改库区service">
      <created>1565259481656</created>
maven
81c737f9
 
pengcheng authored 
380
381
382
 
      <option name="number" value="00003" />
      <option name="presentableId" value="LOCAL-00003" />
      <option name="project" value="LOCAL" />
修改客户页面
0c8a451b
 
mahuandong authored 
383
 
      <updated>1565259481656</updated>
maven
81c737f9
 
pengcheng authored 
384
 
    </task>
合并信义前端页面
5c3b917e
 
mahuandong authored 
385
 
    <option name="localTasksCounter" value="5" />
初始化分支
db744b72
 
tangying authored 
386
387
388
389
390
 
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="1" />
  </component>
库区设置编辑
69aa10ad
 
pengcheng authored 
391
392
393
394
395
396
 
  <component name="Vcs.Log.Tabs.Properties">
    <option name="TAB_STATES">
      <map>
        <entry key="MAIN">
          <value>
            <State>
修改接口文档扫描路径，修改图表显示
7d7e358f
 
mahuandong authored 
397
 
              <option name="COLUMN_ORDER" />
库区设置编辑
69aa10ad
 
pengcheng authored 
398
399
400
401
402
 
            </State>
          </value>
        </entry>
      </map>
    </option>
移植PDA接口过来
99963e50
 
游杰 authored 
403
 
  </component>
库区设置编辑
69aa10ad
 
pengcheng authored 
404
 
  <component name="VcsManagerConfiguration">
修改客户页面
0c8a451b
 
mahuandong authored 
405
406
407
408
 
    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
    <MESSAGE value="添加库位、库位类型增删改查接口" />
    <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
    <MESSAGE value="修改库区service" />
合并代码--待测试1
3ea66fdf
 
huhai authored 
409
合并信义前端页面
5c3b917e
 
mahuandong authored 
410
 
    <option name="LAST_COMMIT_MESSAGE" value="合并信义源码" />
maven
81c737f9
 
pengcheng authored 
411
 
  </component>
合并信义源码
29a1ab31
 
mahuandong authored 
412
 
  <component name="WindowStateProjectService">
新增丢失文件
8cf81d85
 
mahuandong authored 
413
 
    <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1581988248941">
合并信义前端页面
5c3b917e
 
mahuandong authored 
414
415
 
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
新增丢失文件
8cf81d85
 
mahuandong authored 
416
417
418
419
420
421
422
423
424
 
    <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581988248941" />
    <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1581987412294">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581987412294" />
    <state x="550" y="111" key="CommitChangelistDialog2" timestamp="1581991431575">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state x="550" y="111" key="CommitChangelistDialog2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991431575" />
删除信义接口
7a9a3f52
 
mahuandong authored 
425
426
 
    <state x="550" y="111" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1578572128713" />
    <state x="184" y="92" key="DiffContextDialog" timestamp="1578572140549">
合并信义源码
29a1ab31
 
mahuandong authored 
427
428
 
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
删除信义接口
7a9a3f52
 
mahuandong authored 
429
 
    <state x="184" y="92" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1578572140549" />
新增丢失文件
8cf81d85
 
mahuandong authored 
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
 
    <state width="1877" height="232" key="GridCell.Tab.0.bottom" timestamp="1581991356919">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state width="1877" height="232" key="GridCell.Tab.0.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356919" />
    <state width="1877" height="232" key="GridCell.Tab.0.center" timestamp="1581991356919">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state width="1877" height="232" key="GridCell.Tab.0.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356919" />
    <state width="1877" height="232" key="GridCell.Tab.0.left" timestamp="1581991356919">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state width="1877" height="232" key="GridCell.Tab.0.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356919" />
    <state width="1877" height="232" key="GridCell.Tab.0.right" timestamp="1581991356919">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state width="1877" height="232" key="GridCell.Tab.0.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356919" />
    <state width="1877" height="232" key="GridCell.Tab.1.bottom" timestamp="1581991356846">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state width="1877" height="232" key="GridCell.Tab.1.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" />
    <state width="1877" height="232" key="GridCell.Tab.1.center" timestamp="1581991356846">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state width="1877" height="232" key="GridCell.Tab.1.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" />
    <state width="1877" height="232" key="GridCell.Tab.1.left" timestamp="1581991356846">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state width="1877" height="232" key="GridCell.Tab.1.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" />
    <state width="1877" height="232" key="GridCell.Tab.1.right" timestamp="1581991356846">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state width="1877" height="232" key="GridCell.Tab.1.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" />
    <state width="1877" height="232" key="GridCell.Tab.2.bottom" timestamp="1581991356846">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state width="1877" height="232" key="GridCell.Tab.2.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" />
    <state width="1877" height="232" key="GridCell.Tab.2.center" timestamp="1581991356846">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state width="1877" height="232" key="GridCell.Tab.2.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" />
    <state width="1877" height="232" key="GridCell.Tab.2.left" timestamp="1581991356846">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state width="1877" height="232" key="GridCell.Tab.2.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" />
    <state width="1877" height="232" key="GridCell.Tab.2.right" timestamp="1581991356846">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state width="1877" height="232" key="GridCell.Tab.2.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" />
删除信义接口
7a9a3f52
 
mahuandong authored 
478
479
480
481
 
    <state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1578572617942">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1578572617942" />
新增丢失文件
8cf81d85
 
mahuandong authored 
482
483
484
485
486
487
488
489
 
    <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1581986457286">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <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" timestamp="1581986457286" />
    <state x="709" y="231" key="git4idea.branch.GitSmartOperationDialog" timestamp="1581987510895">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state x="709" y="231" key="git4idea.branch.GitSmartOperationDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581987510895" />
删除信义接口
7a9a3f52
 
mahuandong authored 
490
491
492
493
 
    <state x="647" y="310" key="git4idea.merge.GitPullDialog" timestamp="1578572305258">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state x="647" y="310" key="git4idea.merge.GitPullDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1578572305258" />
新增丢失文件
8cf81d85
 
mahuandong authored 
494
495
496
497
 
    <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1581987109995">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <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" timestamp="1581987109995" />
修复接口bug，新增库存同步物料同步用户同步接口
bb0fbc52
 
wangyanxiong authored 
498
 
  </component>
初始化分支
db744b72
 
tangying authored 
499
 
</project>