wms / wms_changshabiyadi · Files

Blame view

.idea/workspace.xml 9.16 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">
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
4
5
6
7
8
9
10
11
12
13
 
    <list default="true" id="3867f38d-4974-4f05-bf81-523c6ebdb1d3" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/sendMail/domain/SendMailText.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/sendMail/service/MailService.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/sendMail/service/MailServiceImpl.java" afterDir="false" />
      <change afterPath="$PROJECT_DIR$/src/test/java/com.huaheng.test/ServiceTest.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/alarmLevel/controller/AlarmLevelController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/alarmLevel/controller/AlarmLevelController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/domain/ReceiptContainerDetail.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" />
      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" 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">
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
22
 
    <option name="SHOW_INTERMEDIATE" value="true" />
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" />
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
28
 
    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
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
 
        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
        <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
      </path>
修改任务类型
d4984ac3
 
mahuandong authored 
48
49
50
51
52
53
54
 
      <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="task_detail: table" type="285a2a93:MysqlImplModel$Table" />
      </path>
maven
81c737f9
 
pengcheng authored 
55
56
57
 
    </expand>
    <select />
  </component>
库区设置编辑
69aa10ad
 
pengcheng authored 
58
59
60
 
  <component name="FileTemplateManagerImpl">
    <option name="RECENT_TEMPLATES">
      <list>
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
61
 
        <option value="Interface" />
删除入库单
329bc3c8
 
mahuandong authored 
62
 
        <option value="Class" />
库区设置编辑
69aa10ad
 
pengcheng authored 
63
64
65
 
      </list>
    </option>
  </component>
初始化分支
db744b72
 
tangying authored 
66
 
  <component name="Git.Settings">
新增和编辑bug
f1da3eec
 
wangyanxiong authored 
67
 
    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
maven
81c737f9
 
pengcheng authored 
68
 
  </component>
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
69
 
  <component name="ProjectId" id="1QOzUtfkdeRmYuw3MIDHXXMLsFH" />
初始化分支
db744b72
 
tangying authored 
70
71
72
 
  <component name="PropertiesComponent">
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
73
74
 
    <property name="full.screen.before.presentation.mode" value="false" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" />
修改客户页面
0c8a451b
 
mahuandong authored 
75
 
    <property name="node.js.detected.package.eslint" value="true" />
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
76
 
    <property name="node.js.detected.package.tslint" value="true" />
修改客户页面
0c8a451b
 
mahuandong authored 
77
78
79
80
 
    <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)" />
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
81
82
 
    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
    <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors.Color Scheme Font" />
maven
81c737f9
 
pengcheng authored 
83
 
  </component>
初始化分支
db744b72
 
tangying authored 
84
85
86
87
88
89
90
91
92
93
94
95
 
  <component name="RunDashboard">
    <option name="ruleStates">
      <list>
        <RuleState>
          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
        </RuleState>
        <RuleState>
          <option name="name" value="StatusDashboardGroupingRule" />
        </RuleState>
      </list>
    </option>
  </component>
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
 
  <component name="RunManager" selected="JUnit.ServiceTest.sendSimpleMail">
    <configuration name="ServiceTest.sendSimpleMail" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
      <module name="huaheng" />
      <extension name="coverage">
        <pattern>
          <option name="PATTERN" value="com.huaheng.test.*" />
          <option name="ENABLED" value="true" />
        </pattern>
      </extension>
      <option name="PACKAGE_NAME" value="com.huaheng.test" />
      <option name="MAIN_CLASS_NAME" value="com.huaheng.test.ServiceTest" />
      <option name="METHOD_NAME" value="sendSimpleMail" />
      <option name="TEST_OBJECT" value="method" />
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
    <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" temporary="true" nameIsGenerated="true">
修改任务类型
d4984ac3
 
mahuandong authored 
114
 
      <module name="huaheng" />
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
115
116
117
118
119
120
 
      <extension name="coverage">
        <pattern>
          <option name="PATTERN" value="com.huaheng.*" />
          <option name="ENABLED" value="true" />
        </pattern>
      </extension>
修改客户页面
0c8a451b
 
mahuandong authored 
121
 
      <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
库区设置编辑
69aa10ad
 
pengcheng authored 
122
123
124
125
 
      <method v="2">
        <option name="Make" enabled="true" />
      </method>
    </configuration>
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
126
127
128
129
130
131
 
    <recent_temporary>
      <list>
        <item itemvalue="JUnit.ServiceTest.sendSimpleMail" />
        <item itemvalue="Spring Boot.HuaHengApplication" />
      </list>
    </recent_temporary>
maven
81c737f9
 
pengcheng authored 
132
 
  </component>
初始化分支
db744b72
 
tangying authored 
133
134
135
136
137
 
  <component name="SvnConfiguration">
    <configuration />
  </component>
  <component name="TaskManager">
    <task active="true" id="Default" summary="Default task">
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
138
139
 
      <changelist id="3867f38d-4974-4f05-bf81-523c6ebdb1d3" name="Default Changelist" comment="" />
      <created>1567656449978</created>
初始化分支
db744b72
 
tangying authored 
140
141
 
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
142
143
144
145
146
147
148
149
150
 
      <updated>1567656449978</updated>
      <workItem from="1567656451211" duration="5104000" />
      <workItem from="1567668214629" duration="1168000" />
      <workItem from="1567669746535" duration="268000" />
      <workItem from="1567670126125" duration="31000" />
      <workItem from="1567670171788" duration="46000" />
      <workItem from="1567670233410" duration="1528000" />
      <workItem from="1567730330932" duration="8838000" />
      <workItem from="1567741769966" duration="1528000" />
初始化分支
db744b72
 
tangying authored 
151
 
    </task>
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
152
153
 
    <task id="LOCAL-00001" summary="修改添加物料时使用物料类别生成物料编码">
      <created>1567664306836</created>
库区设置编辑
69aa10ad
 
pengcheng authored 
154
155
156
 
      <option name="number" value="00001" />
      <option name="presentableId" value="LOCAL-00001" />
      <option name="project" value="LOCAL" />
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
157
 
      <updated>1567664306836</updated>
入库预约与入库到货
4ca0078a
 
mahuandong authored 
158
 
    </task>
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
159
 
    <option name="localTasksCounter" value="2" />
初始化分支
db744b72
 
tangying authored 
160
161
162
163
164
 
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="1" />
  </component>
库区设置编辑
69aa10ad
 
pengcheng authored 
165
166
167
168
169
170
 
  <component name="Vcs.Log.Tabs.Properties">
    <option name="TAB_STATES">
      <map>
        <entry key="MAIN">
          <value>
            <State>
修改任务类型
d4984ac3
 
mahuandong authored 
171
 
              <option name="COLUMN_ORDER" />
库区设置编辑
69aa10ad
 
pengcheng authored 
172
173
174
175
176
177
178
 
            </State>
          </value>
        </entry>
      </map>
    </option>
  </component>
  <component name="VcsManagerConfiguration">
Merge branch 'develop' of E:\cod...
9db923df
 
mahuandong authored 
179
180
 
    <MESSAGE value="修改添加物料时使用物料类别生成物料编码" />
    <option name="LAST_COMMIT_MESSAGE" value="修改添加物料时使用物料类别生成物料编码" />
代码错误，导包
751bd7c0
 
xqs authored 
181
 
  </component>
初始化分支
db744b72
 
tangying authored 
182
 
</project>