wms / wms_xianyangming · Files

Blame view

.idea/workspace.xml 13.3 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">
修复入库历史controller冲突
542f1efb
 
mahuandong authored 
4
 
    <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="">
自动生成盘点首选项表
938918e8
 
mahuandong authored 
5
6
7
8
 
      <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/cycleCountPreference/domain/CycleCountPreference.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/cycleCountPreference/mapper/CycleCountPreferenceMapper.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/cycleCountPreference/service/CycleCountPreferenceService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/CycleCountPreferenceMapper.xml" afterDir="false" />
库区设置编辑
69aa10ad
 
pengcheng authored 
9
 
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
自动生成盘点首选项表
938918e8
 
mahuandong authored 
10
11
12
13
 
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.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" />
初始化分支
db744b72
 
tangying authored 
14
15
16
17
18
19
20
 
    </list>
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
maven
81c737f9
 
pengcheng authored 
21
 
  <component name="DatabaseView">
修改客户页面
0c8a451b
 
mahuandong authored 
22
 
    <option name="SHOW_INTERMEDIATE" value="false" />
maven
81c737f9
 
pengcheng authored 
23
24
25
26
27
 
    <option name="GROUP_DATA_SOURCES" value="true" />
    <option name="GROUP_SCHEMA" value="true" />
    <option name="GROUP_CONTENTS" value="false" />
    <option name="SORT_POSITIONED" value="false" />
    <option name="SHOW_EMPTY_GROUPS" value="false" />
修改客户页面
0c8a451b
 
mahuandong authored 
28
 
    <option name="AUTO_SCROLL_FROM_SOURCE" value="true" />
maven
81c737f9
 
pengcheng authored 
29
30
31
32
33
34
 
    <option name="HIDDEN_KINDS">
      <set />
    </option>
    <expand>
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
修改客户页面
0c8a451b
 
mahuandong authored 
35
 
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
maven
81c737f9
 
pengcheng authored 
36
37
38
 
      </path>
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
修改客户页面
0c8a451b
 
mahuandong authored 
39
 
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
maven
81c737f9
 
pengcheng authored 
40
41
42
43
 
        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
      </path>
      <path>
        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
修改客户页面
0c8a451b
 
mahuandong authored 
44
 
        <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
maven
81c737f9
 
pengcheng authored 
45
46
47
48
49
50
 
        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
        <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
      </path>
    </expand>
    <select />
  </component>
库区设置编辑
69aa10ad
 
pengcheng authored 
51
52
53
 
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
      <list>
添加物料类别
926d40c0
 
mahuandong authored 
54
 
        <option value="CSS File" />
删除入库单
329bc3c8
 
mahuandong authored 
55
 
        <option value="Class" />
添加物料类别
926d40c0
 
mahuandong authored 
56
 
        <option value="HTML File" />
库区设置编辑
69aa10ad
 
pengcheng authored 
57
58
59
 
      </list>
    </option>
  </component>
初始化分支
db744b72
 
tangying authored 
60
 
  <component name="Git.Settings">
新增和编辑bug
f1da3eec
 
wangyanxiong authored 
61
 
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
maven
81c737f9
 
pengcheng authored 
62
 
  </component>
上架任务查询
cb63bfd6
 
wangyanxiong authored 
63
64
65
66
67
68
69
 
  <component name="MavenImportPreferences">
    <option name="importingSettings">
      <MavenImportingSettings>
        <option name="importAutomatically" value="true" />
      </MavenImportingSettings>
    </option>
  </component>
修复入库历史controller冲突
542f1efb
 
mahuandong authored 
70
 
  <component name="ProjectId" id="1Q2nhRM7LRz3yFWhpclOKgTjxn0" />
修改客户页面
0c8a451b
 
mahuandong authored 
71
72
 
  <component name="ProjectLevelVcsManager">
    <ConfirmationsSetting value="2" id="Add" />
初始化分支
db744b72
 
tangying authored 
73
74
 
  </component>
  <component name="PropertiesComponent">
修改客户页面
0c8a451b
 
mahuandong authored 
75
 
    <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
添加物料类别
926d40c0
 
mahuandong authored 
76
 
    <property name="DefaultHtmlFileTemplate" value="HTML File" />
修复入库历史controller冲突
542f1efb
 
mahuandong authored 
77
 
    <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
库区设置编辑
69aa10ad
 
pengcheng authored 
78
79
80
81
 
    <property name="RequestMappingsPanelOrder0" value="0" />
    <property name="RequestMappingsPanelOrder1" value="1" />
    <property name="RequestMappingsPanelWidth0" value="75" />
    <property name="RequestMappingsPanelWidth1" value="75" />
初始化分支
db744b72
 
tangying authored 
82
83
84
 
    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
添加物料类别
926d40c0
 
mahuandong authored 
85
 
    <property name="list.type.of.created.stylesheet" value="CSS" />
修改客户页面
0c8a451b
 
mahuandong authored 
86
87
88
89
90
 
    <property name="node.js.detected.package.eslint" value="true" />
    <property name="node.js.path.for.package.eslint" value="project" />
    <property name="node.js.path.for.package.tslint" value="project" />
    <property name="node.js.selected.package.eslint" value="(autodetect)" />
    <property name="node.js.selected.package.tslint" value="(autodetect)" />
添加物料类别
926d40c0
 
mahuandong authored 
91
 
    <property name="nodejs_package_manager_path" value="npm" />
修复入库历史controller冲突
542f1efb
 
mahuandong authored 
92
 
    <property name="settings.editor.selected.configurable" value="preferences.fileTypes" />
maven
81c737f9
 
pengcheng authored 
93
 
  </component>
初始化分支
db744b72
 
tangying authored 
94
 
  <component name="RunDashboard">
添加物料类别
926d40c0
 
mahuandong authored 
95
96
97
98
99
 
    <option name="configurationTypes">
      <set>
        <option value="SpringBootApplicationConfigurationType" />
      </set>
    </option>
初始化分支
db744b72
 
tangying authored 
100
101
102
103
104
105
106
107
108
109
110
 
    <option name="ruleStates">
      <list>
        <RuleState>
          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
        </RuleState>
        <RuleState>
          <option name="name" value="StatusDashboardGroupingRule" />
        </RuleState>
      </list>
    </option>
  </component>
库存交易搜索
939ac258
 
xqs authored 
111
 
  <component name="RunManager">
修改客户页面
0c8a451b
 
mahuandong authored 
112
 
    <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
xml
8538d30c
 
xqs authored 
113
 
      <module name="huaheng" />
修改客户页面
0c8a451b
 
mahuandong authored 
114
 
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
xml
8538d30c
 
xqs authored 
115
 
      <option name="ALTERNATIVE_JRE_PATH" />
修改客户页面
0c8a451b
 
mahuandong authored 
116
117
 
      <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
      <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
库区设置编辑
69aa10ad
 
pengcheng authored 
118
119
120
121
 
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
初始化分支
db744b72
 
tangying authored 
122
 
  </component>
maven
81c737f9
 
pengcheng authored 
123
124
125
 
  <component name="ServiceViewManager">
    <option name="allServicesViewState">
      <serviceView>
删除入库单
329bc3c8
 
mahuandong authored 
126
 
        <option name="contentProportion" value="0.17857143" />
maven
81c737f9
 
pengcheng authored 
127
 
        <treeState>
添加物料类别
926d40c0
 
mahuandong authored 
128
129
130
 
          <expand>
            <path>
              <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
删除入库单
329bc3c8
 
mahuandong authored 
131
 
              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@38017b80" type="7427dc5b:ServiceModel$ServiceGroupNode" />
添加物料类别
926d40c0
 
mahuandong authored 
132
133
134
 
            </path>
            <path>
              <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
删除入库单
329bc3c8
 
mahuandong authored 
135
136
 
              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@38017b80" type="7427dc5b:ServiceModel$ServiceGroupNode" />
              <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@84e6ec8e" type="7427dc5b:ServiceModel$ServiceGroupNode" />
添加物料类别
926d40c0
 
mahuandong authored 
137
138
 
            </path>
          </expand>
maven
81c737f9
 
pengcheng authored 
139
140
141
142
143
 
          <select />
        </treeState>
      </serviceView>
    </option>
  </component>
初始化分支
db744b72
 
tangying authored 
144
145
146
147
148
 
  <component name="SvnConfiguration">
    <configuration />
  </component>
  <component name="TaskManager">
    <task active="true" id="Default" summary="Default task">
修复入库历史controller冲突
542f1efb
 
mahuandong authored 
149
150
 
      <changelist id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="" />
      <created>1566977677142</created>
初始化分支
db744b72
 
tangying authored 
151
152
 
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
修复入库历史controller冲突
542f1efb
 
mahuandong authored 
153
154
155
 
      <updated>1566977677142</updated>
      <workItem from="1566977678336" duration="306000" />
      <workItem from="1566978429560" duration="9246000" />
删除入库单
329bc3c8
 
mahuandong authored 
156
 
      <workItem from="1567038752582" duration="12361000" />
自动生成盘点首选项表
938918e8
 
mahuandong authored 
157
 
      <workItem from="1567057373550" duration="9107000" />
初始化分支
db744b72
 
tangying authored 
158
 
    </task>
修复入库历史controller冲突
542f1efb
 
mahuandong authored 
159
160
 
    <task id="LOCAL-00001" summary="入库单添加时添加流程标记，审核入库单">
      <created>1566983055587</created>
库区设置编辑
69aa10ad
 
pengcheng authored 
161
162
163
 
      <option name="number" value="00001" />
      <option name="presentableId" value="LOCAL-00001" />
      <option name="project" value="LOCAL" />
修复入库历史controller冲突
542f1efb
 
mahuandong authored 
164
 
      <updated>1566983055587</updated>
库区设置编辑
69aa10ad
 
pengcheng authored 
165
 
    </task>
修复入库历史controller冲突
542f1efb
 
mahuandong authored 
166
167
 
    <task id="LOCAL-00002" summary="添加入库单历史">
      <created>1566987011007</created>
maven
81c737f9
 
pengcheng authored 
168
169
170
 
      <option name="number" value="00002" />
      <option name="presentableId" value="LOCAL-00002" />
      <option name="project" value="LOCAL" />
修复入库历史controller冲突
542f1efb
 
mahuandong authored 
171
 
      <updated>1566987011007</updated>
xml文件
e51310e8
 
wangyanxiong authored 
172
 
    </task>
添加物料类别
926d40c0
 
mahuandong authored 
173
174
175
176
177
178
179
 
    <task id="LOCAL-00003" summary="修复入库历史controller冲突">
      <created>1567039165473</created>
      <option name="number" value="00003" />
      <option name="presentableId" value="LOCAL-00003" />
      <option name="project" value="LOCAL" />
      <updated>1567039165473</updated>
    </task>
删除入库单
329bc3c8
 
mahuandong authored 
180
181
182
183
184
185
186
187
188
189
190
191
192
193
 
    <task id="LOCAL-00004" summary="添加物料类别">
      <created>1567047135508</created>
      <option name="number" value="00004" />
      <option name="presentableId" value="LOCAL-00004" />
      <option name="project" value="LOCAL" />
      <updated>1567047135508</updated>
    </task>
    <task id="LOCAL-00005" summary="添加系统参数配置">
      <created>1567065008303</created>
      <option name="number" value="00005" />
      <option name="presentableId" value="LOCAL-00005" />
      <option name="project" value="LOCAL" />
      <updated>1567065008303</updated>
    </task>
自动生成盘点首选项表
938918e8
 
mahuandong authored 
194
195
196
197
198
199
200
201
 
    <task id="LOCAL-00006" summary="删除入库单">
      <created>1567065196899</created>
      <option name="number" value="00006" />
      <option name="presentableId" value="LOCAL-00006" />
      <option name="project" value="LOCAL" />
      <updated>1567065196899</updated>
    </task>
    <option name="localTasksCounter" value="7" />
初始化分支
db744b72
 
tangying authored 
202
203
204
205
206
 
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="1" />
  </component>
库区设置编辑
69aa10ad
 
pengcheng authored 
207
208
209
210
211
212
 
  <component name="Vcs.Log.Tabs.Properties">
    <option name="TAB_STATES">
      <map>
        <entry key="MAIN">
          <value>
            <State>
修复入库历史controller冲突
542f1efb
 
mahuandong authored 
213
 
              <option name="COLUMN_ORDER" />
库区设置编辑
69aa10ad
 
pengcheng authored 
214
215
216
217
218
 
            </State>
          </value>
        </entry>
      </map>
    </option>
新增和编辑bug
f1da3eec
 
wangyanxiong authored 
219
220
221
222
223
224
225
226
227
228
229
230
231
232
 
    <option name="RECENT_FILTERS">
      <map>
        <entry key="Branch">
          <value>
            <list />
          </value>
        </entry>
        <entry key="User">
          <value>
            <list />
          </value>
        </entry>
      </map>
    </option>
库区设置编辑
69aa10ad
 
pengcheng authored 
233
234
 
  </component>
  <component name="VcsManagerConfiguration">
修复入库历史controller冲突
542f1efb
 
mahuandong authored 
235
236
237
238
 
    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
    <MESSAGE value="盘点明细页面" />
    <MESSAGE value="入库单添加时添加流程标记，审核入库单" />
    <MESSAGE value="添加入库单历史" />
添加物料类别
926d40c0
 
mahuandong authored 
239
 
    <MESSAGE value="修复入库历史controller冲突" />
删除入库单
329bc3c8
 
mahuandong authored 
240
241
 
    <MESSAGE value="添加物料类别" />
    <MESSAGE value="添加系统参数配置" />
自动生成盘点首选项表
938918e8
 
mahuandong authored 
242
243
 
    <MESSAGE value="删除入库单" />
    <option name="LAST_COMMIT_MESSAGE" value="删除入库单" />
添加物料页面
2ebb5e32
 
mahuandong authored 
244
245
246
247
 
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <breakpoints>
修复入库历史controller冲突
542f1efb
 
mahuandong authored 
248
249
250
251
 
        <line-breakpoint type="java-line">
          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/mapper/CycleCountHeaderMapper.java</url>
          <line>5</line>
          <option name="timeStamp" value="1" />
添加物料页面
2ebb5e32
 
mahuandong authored 
252
 
        </line-breakpoint>
添加商品、商品详情页面
b9abda20
 
mahuandong authored 
253
 
        <line-breakpoint enabled="true" type="java-line">
添加物料类别
926d40c0
 
mahuandong authored 
254
255
256
257
 
          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java</url>
          <line>60</line>
          <option name="timeStamp" value="4" />
        </line-breakpoint>
删除入库单
329bc3c8
 
mahuandong authored 
258
259
260
261
262
263
264
265
266
267
 
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java</url>
          <line>80</line>
          <option name="timeStamp" value="7" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java</url>
          <line>171</line>
          <option name="timeStamp" value="8" />
        </line-breakpoint>
自动生成盘点首选项表
938918e8
 
mahuandong authored 
268
269
270
271
272
273
 
        <line-breakpoint enabled="true" type="java-line">
          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
          <line>84</line>
          <option name="timeStamp" value="10" />
        </line-breakpoint>
        <line-breakpoint enabled="true" type="java-line">
修复入库历史controller冲突
542f1efb
 
mahuandong authored 
274
 
          <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java</url>
自动生成盘点首选项表
938918e8
 
mahuandong authored 
275
276
 
          <line>150</line>
          <option name="timeStamp" value="11" />
添加物料单位，重新生成库存主表和库存明细表
35c1e10f
 
mahuandong authored 
277
 
        </line-breakpoint>
添加物料页面
2ebb5e32
 
mahuandong authored 
278
279
 
      </breakpoints>
    </breakpoint-manager>
代码错误，导包
751bd7c0
 
xqs authored 
280
 
  </component>
初始化分支
db744b72
 
tangying authored 
281
 
</project>