wms / wms_ningbohuazhang · Commits

Commit d0a045de708430731dfcf48c63d1b26913675360

Authored by pengcheng
2 parents 528cd7f1 502cf7a1

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 7 changed files with 459 additions and 139 deletions
.idea/compiler.xml
  View file @d0a045d
... ... @@ -6,8 +6,8 @@
6 6 <sourceOutputDir name="target/generated-sources/annotations" />
7 7 <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8 8 <outputRelativeToContentRoot value="true" />
9   - <module name="wms2" />
10 9 <module name="huaheng" />
  10 + <module name="wms2" />
11 11 </profile>
12 12 </annotationProcessing>
13 13 </component>
... ...
.idea/workspace.xml
  View file @d0a045d
... ... @@ -2,20 +2,15 @@
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4 4 <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="">
5   - <change afterPath="$PROJECT_DIR$/src/main/resources/templates/general/bomDetail/add.html" afterDir="false" />
6   - <change afterPath="$PROJECT_DIR$/src/main/resources/templates/general/bomDetail/bomDetail.html" afterDir="false" />
7   - <change afterPath="$PROJECT_DIR$/src/main/resources/templates/general/bomDetail/edit.html" afterDir="false" />
8   - <change afterPath="$PROJECT_DIR$/src/main/resources/templates/general/bomHeader/add.html" afterDir="false" />
9   - <change afterPath="$PROJECT_DIR$/src/main/resources/templates/general/bomHeader/edit.html" afterDir="false" />
  5 + <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
10 6 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
11   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/locationType/service/LocationTypeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/locationType/service/LocationTypeService.java" afterDir="false" />
12   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/locationType/service/LocationTypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/locationType/service/LocationTypeServiceImpl.java" afterDir="false" />
13   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/bom/controller/BomDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/bom/controller/BomDetailController.java" afterDir="false" />
14   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/bom/controller/BomHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/bom/controller/BomHeaderController.java" afterDir="false" />
15   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/service/LocationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/service/LocationServiceImpl.java" afterDir="false" />
16   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java" afterDir="false" />
17   - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/bomHeader/bomHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/bomHeader/bomHeader.html" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/src/main/resources/static/img/qr_code.png" beforeDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/index.html" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/login.html" afterDir="false" />
  11 + <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" />
18 12 </list>
  13 + <ignored path="$PROJECT_DIR$/target/" />
19 14 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
20 15 <option name="SHOW_DIALOG" value="false" />
21 16 <option name="HIGHLIGHT_CONFLICTS" value="true" />
... ... @@ -33,44 +28,36 @@
33 28 <option name="HIDDEN_KINDS">
34 29 <set />
35 30 </option>
36   - <expand>
37   - <path>
38   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
39   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
40   - </path>
41   - <path>
42   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
43   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
44   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
45   - </path>
46   - <path>
47   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
48   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
49   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
50   - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
51   - </path>
52   - <path>
53   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
54   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
55   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
56   - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
57   - <item name="bom_detail: table" type="285a2a93:MysqlImplModel$Table" />
58   - </path>
59   - <path>
60   - <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
61   - <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" />
62   - <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
63   - <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" />
64   - <item name="location_type: table" type="285a2a93:MysqlImplModel$Table" />
65   - </path>
66   - </expand>
  31 + <expand />
67 32 <select />
68 33 </component>
  34 + <component name="FileEditorManager">
  35 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  36 + <file pinned="false" current-in-tab="false">
  37 + <entry file="file://$PROJECT_DIR$/pom.xml">
  38 + <provider selected="true" editor-type-id="text-editor">
  39 + <state relative-caret-position="248">
  40 + <caret line="16" column="40" selection-start-line="16" selection-start-column="40" selection-end-line="16" selection-end-column="40" />
  41 + </state>
  42 + </provider>
  43 + <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
  44 + </entry>
  45 + </file>
  46 + <file pinned="false" current-in-tab="true">
  47 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html">
  48 + <provider selected="true" editor-type-id="text-editor">
  49 + <state relative-caret-position="289">
  50 + <caret line="40" column="24" selection-start-line="40" selection-start-column="24" selection-end-line="40" selection-end-column="24" />
  51 + </state>
  52 + </provider>
  53 + </entry>
  54 + </file>
  55 + </leaf>
  56 + </component>
69 57 <component name="FileTemplateManagerImpl">
70 58 <option name="RECENT_TEMPLATES">
71 59 <list>
72 60 <option value="Class" />
73   - <option value="HTML File" />
74 61 </list>
75 62 </option>
76 63 </component>
... ... @@ -82,6 +69,21 @@
82 69 </map>
83 70 </option>
84 71 </component>
  72 + <component name="IdeDocumentHistory">
  73 + <option name="CHANGED_PATHS">
  74 + <list>
  75 + <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
  76 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" />
  77 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" />
  78 + <option value="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html" />
  79 + <option value="$PROJECT_DIR$/src/main/resources/application-druid.properties" />
  80 + <option value="$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java" />
  81 + <option value="$PROJECT_DIR$/pom.xml" />
  82 + <option value="$PROJECT_DIR$/src/main/resources/templates/index.html" />
  83 + <option value="$PROJECT_DIR$/src/main/resources/templates/login.html" />
  84 + </list>
  85 + </option>
  86 + </component>
85 87 <component name="IgnoredFileRootStore">
86 88 <option name="generatedRoots">
87 89 <set>
... ... @@ -89,14 +91,201 @@
89 91 </set>
90 92 </option>
91 93 </component>
  94 + <component name="MavenImportPreferences">
  95 + <option name="importingSettings">
  96 + <MavenImportingSettings>
  97 + <option name="importAutomatically" value="true" />
  98 + </MavenImportingSettings>
  99 + </option>
  100 + </component>
  101 + <component name="MavenProjectNavigator">
  102 + <treeState>
  103 + <expand>
  104 + <path>
  105 + <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
  106 + <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
  107 + </path>
  108 + <path>
  109 + <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
  110 + <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
  111 + <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
  112 + </path>
  113 + </expand>
  114 + <select />
  115 + </treeState>
  116 + </component>
  117 + <component name="MavenRunner">
  118 + <option name="skipTests" value="true" />
  119 + </component>
  120 + <component name="ProjectFrameBounds" extendedState="6">
  121 + <option name="x" value="-10" />
  122 + <option name="y" value="-10" />
  123 + <option name="width" value="1940" />
  124 + <option name="height" value="1100" />
  125 + </component>
92 126 <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
93 127 <component name="ProjectLevelVcsManager">
94 128 <ConfirmationsSetting value="2" id="Add" />
95 129 </component>
  130 + <component name="ProjectView">
  131 + <navigator proportions="" version="1">
  132 + <foldersAlwaysOnTop value="true" />
  133 + </navigator>
  134 + <panes>
  135 + <pane id="Scope" />
  136 + <pane id="ProjectPane">
  137 + <subPane>
  138 + <expand>
  139 + <path>
  140 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  141 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  142 + </path>
  143 + <path>
  144 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  145 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  146 + <item name="src" type="462c0819:PsiDirectoryNode" />
  147 + </path>
  148 + <path>
  149 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  150 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  151 + <item name="src" type="462c0819:PsiDirectoryNode" />
  152 + <item name="main" type="462c0819:PsiDirectoryNode" />
  153 + </path>
  154 + <path>
  155 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  156 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  157 + <item name="src" type="462c0819:PsiDirectoryNode" />
  158 + <item name="main" type="462c0819:PsiDirectoryNode" />
  159 + <item name="java" type="462c0819:PsiDirectoryNode" />
  160 + </path>
  161 + <path>
  162 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  163 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  164 + <item name="src" type="462c0819:PsiDirectoryNode" />
  165 + <item name="main" type="462c0819:PsiDirectoryNode" />
  166 + <item name="java" type="462c0819:PsiDirectoryNode" />
  167 + <item name="com" type="462c0819:PsiDirectoryNode" />
  168 + </path>
  169 + <path>
  170 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  171 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  172 + <item name="src" type="462c0819:PsiDirectoryNode" />
  173 + <item name="main" type="462c0819:PsiDirectoryNode" />
  174 + <item name="java" type="462c0819:PsiDirectoryNode" />
  175 + <item name="com" type="462c0819:PsiDirectoryNode" />
  176 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  177 + </path>
  178 + <path>
  179 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  180 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  181 + <item name="src" type="462c0819:PsiDirectoryNode" />
  182 + <item name="main" type="462c0819:PsiDirectoryNode" />
  183 + <item name="java" type="462c0819:PsiDirectoryNode" />
  184 + <item name="com" type="462c0819:PsiDirectoryNode" />
  185 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  186 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  187 + </path>
  188 + <path>
  189 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  190 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  191 + <item name="src" type="462c0819:PsiDirectoryNode" />
  192 + <item name="main" type="462c0819:PsiDirectoryNode" />
  193 + <item name="java" type="462c0819:PsiDirectoryNode" />
  194 + <item name="com" type="462c0819:PsiDirectoryNode" />
  195 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  196 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  197 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  198 + </path>
  199 + <path>
  200 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  201 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  202 + <item name="src" type="462c0819:PsiDirectoryNode" />
  203 + <item name="main" type="462c0819:PsiDirectoryNode" />
  204 + <item name="java" type="462c0819:PsiDirectoryNode" />
  205 + <item name="com" type="462c0819:PsiDirectoryNode" />
  206 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  207 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  208 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  209 + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
  210 + </path>
  211 + <path>
  212 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  213 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  214 + <item name="src" type="462c0819:PsiDirectoryNode" />
  215 + <item name="main" type="462c0819:PsiDirectoryNode" />
  216 + <item name="java" type="462c0819:PsiDirectoryNode" />
  217 + <item name="com" type="462c0819:PsiDirectoryNode" />
  218 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  219 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  220 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  221 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  222 + </path>
  223 + <path>
  224 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  225 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  226 + <item name="src" type="462c0819:PsiDirectoryNode" />
  227 + <item name="main" type="462c0819:PsiDirectoryNode" />
  228 + <item name="java" type="462c0819:PsiDirectoryNode" />
  229 + <item name="com" type="462c0819:PsiDirectoryNode" />
  230 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  231 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  232 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  233 + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
  234 + </path>
  235 + <path>
  236 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  237 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  238 + <item name="src" type="462c0819:PsiDirectoryNode" />
  239 + <item name="main" type="462c0819:PsiDirectoryNode" />
  240 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  241 + </path>
  242 + <path>
  243 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  244 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  245 + <item name="src" type="462c0819:PsiDirectoryNode" />
  246 + <item name="main" type="462c0819:PsiDirectoryNode" />
  247 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  248 + <item name="static" type="462c0819:PsiDirectoryNode" />
  249 + </path>
  250 + <path>
  251 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  252 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  253 + <item name="src" type="462c0819:PsiDirectoryNode" />
  254 + <item name="main" type="462c0819:PsiDirectoryNode" />
  255 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  256 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  257 + </path>
  258 + <path>
  259 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  260 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  261 + <item name="src" type="462c0819:PsiDirectoryNode" />
  262 + <item name="test" type="462c0819:PsiDirectoryNode" />
  263 + </path>
  264 + <path>
  265 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  266 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  267 + <item name="src" type="462c0819:PsiDirectoryNode" />
  268 + <item name="test" type="462c0819:PsiDirectoryNode" />
  269 + <item name="java" type="462c0819:PsiDirectoryNode" />
  270 + </path>
  271 + <path>
  272 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  273 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  274 + <item name="src" type="462c0819:PsiDirectoryNode" />
  275 + <item name="test" type="462c0819:PsiDirectoryNode" />
  276 + <item name="java" type="462c0819:PsiDirectoryNode" />
  277 + <item name="com.huaheng.test" type="462c0819:PsiDirectoryNode" />
  278 + </path>
  279 + </expand>
  280 + <select />
  281 + </subPane>
  282 + </pane>
  283 + <pane id="PackagesPane" />
  284 + </panes>
  285 + </component>
96 286 <component name="PropertiesComponent">
97 287 <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
98 288 <property name="DatabaseDriversLRU" value="mysql" />
99   - <property name="DefaultHtmlFileTemplate" value="HTML File" />
100 289 <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
101 290 <property name="RequestMappingsPanelOrder0" value="0" />
102 291 <property name="RequestMappingsPanelOrder1" value="1" />
... ... @@ -112,7 +301,6 @@
112 301 <property name="node.js.path.for.package.tslint" value="project" />
113 302 <property name="node.js.selected.package.eslint" value="(autodetect)" />
114 303 <property name="node.js.selected.package.tslint" value="(autodetect)" />
115   - <property name="nodejs_package_manager_path" value="npm" />
116 304 <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
117 305 </component>
118 306 <component name="RecentsManager">
... ... @@ -122,11 +310,6 @@
122 310 </key>
123 311 </component>
124 312 <component name="RunDashboard">
125   - <option name="configurationTypes">
126   - <set>
127   - <option value="SpringBootApplicationConfigurationType" />
128   - </set>
129   - </option>
130 313 <option name="ruleStates">
131 314 <list>
132 315 <RuleState>
... ... @@ -140,9 +323,10 @@
140 323 </component>
141 324 <component name="RunManager">
142 325 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
143   - <module name="huaheng" />
  326 + <module name="wms2" />
144 327 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
145   - <option name="ALTERNATIVE_JRE_PATH" />
  328 + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
  329 + <option name="ALTERNATIVE_JRE_PATH" value="C:\Program Files\Java\jdk1.8.0_202\jre" />
146 330 <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
147 331 <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
148 332 <method v="2">
... ... @@ -161,14 +345,8 @@
161 345 <component name="ServiceViewManager">
162 346 <option name="allServicesViewState">
163 347 <serviceView>
164   - <option name="contentProportion" value="0.18875067" />
165 348 <treeState>
166   - <expand>
167   - <path>
168   - <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
169   - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@6299c693" type="7427dc5b:ServiceModel$ServiceGroupNode" />
170   - </path>
171   - </expand>
  349 + <expand />
172 350 <select />
173 351 </treeState>
174 352 </serviceView>
... ... @@ -191,11 +369,7 @@
191 369 <workItem from="1565311988064" duration="7176000" />
192 370 <workItem from="1565328536669" duration="797000" />
193 371 <workItem from="1565345715376" duration="452000" />
194   - <workItem from="1565570424829" duration="11663000" />
195   - <workItem from="1565587737758" duration="12961000" />
196   - <workItem from="1565657307503" duration="115000" />
197   - <workItem from="1565657439247" duration="2447000" />
198   - <workItem from="1565662229227" duration="19207000" />
  372 + <workItem from="1565570424829" duration="697000" />
199 373 </task>
200 374 <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
201 375 <created>1565226427512</created>
... ... @@ -225,51 +399,49 @@
225 399 <option name="project" value="LOCAL" />
226 400 <updated>1565342188814</updated>
227 401 </task>
228   - <task id="LOCAL-00005" summary="添加userWarehouse">
229   - <created>1565571202923</created>
230   - <option name="number" value="00005" />
231   - <option name="presentableId" value="LOCAL-00005" />
232   - <option name="project" value="LOCAL" />
233   - <updated>1565571202923</updated>
234   - </task>
235   - <task id="LOCAL-00006" summary="添加containerCapacity">
236   - <created>1565578920011</created>
237   - <option name="number" value="00006" />
238   - <option name="presentableId" value="LOCAL-00006" />
239   - <option name="project" value="LOCAL" />
240   - <updated>1565578920011</updated>
241   - </task>
242   - <task id="LOCAL-00007" summary="添加物料页面">
243   - <created>1565593159103</created>
244   - <option name="number" value="00007" />
245   - <option name="presentableId" value="LOCAL-00007" />
246   - <option name="project" value="LOCAL" />
247   - <updated>1565593159103</updated>
248   - </task>
249   - <task id="LOCAL-00008" summary="添加商品详情">
250   - <created>1565598117104</created>
251   - <option name="number" value="00008" />
252   - <option name="presentableId" value="LOCAL-00008" />
253   - <option name="project" value="LOCAL" />
254   - <updated>1565598117104</updated>
255   - </task>
256   - <task id="LOCAL-00009" summary="添加物料时判断单位是否存在，不存在则添加物料单位">
257   - <created>1565659672152</created>
258   - <option name="number" value="00009" />
259   - <option name="presentableId" value="LOCAL-00009" />
260   - <option name="project" value="LOCAL" />
261   - <updated>1565659672152</updated>
262   - </task>
263   - <task id="LOCAL-00010" summary="添加task实体类">
264   - <created>1565665525508</created>
265   - <option name="number" value="00010" />
266   - <option name="presentableId" value="LOCAL-00010" />
267   - <option name="project" value="LOCAL" />
268   - <updated>1565665525508</updated>
269   - </task>
270   - <option name="localTasksCounter" value="11" />
  402 + <option name="localTasksCounter" value="5" />
271 403 <servers />
272 404 </component>
  405 + <component name="ToolWindowManager">
  406 + <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
  407 + <editor active="true" />
  408 + <layout>
  409 + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4967462" visible="true" weight="0.28820375" />
  410 + <window_info id="Structure" order="1" sideWeight="0.5032538" side_tool="true" weight="0.1673774" />
  411 + <window_info id="Designer" order="2" />
  412 + <window_info id="UI Designer" order="3" />
  413 + <window_info id="Favorites" order="4" side_tool="true" />
  414 + <window_info id="Capture Tool" order="5" />
  415 + <window_info id="Web" order="6" side_tool="true" />
  416 + <window_info id="Image Layers" order="7" />
  417 + <window_info anchor="bottom" id="Message" order="0" />
  418 + <window_info anchor="bottom" id="Find" order="1" />
  419 + <window_info anchor="bottom" id="Run" order="2" />
  420 + <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.2407932" />
  421 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  422 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  423 + <window_info anchor="bottom" id="TODO" order="6" />
  424 + <window_info anchor="bottom" id="Spring" order="7" />
  425 + <window_info anchor="bottom" id="Terminal" order="8" />
  426 + <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
  427 + <window_info anchor="bottom" id="Java Enterprise" order="10" weight="0.3286119" />
  428 + <window_info anchor="bottom" id="Database Changes" order="11" />
  429 + <window_info anchor="bottom" id="Version Control" order="12" weight="0.8427762" />
  430 + <window_info anchor="bottom" id="Docker" order="13" show_stripe_button="false" />
  431 + <window_info anchor="bottom" id="Messages" order="14" weight="0.329718" />
  432 + <window_info anchor="bottom" id="MyBatis Log" order="15" />
  433 + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
  434 + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
  435 + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  436 + <window_info anchor="right" id="Maven" order="3" weight="0.22334754" />
  437 + <window_info anchor="right" id="Palette" order="4" />
  438 + <window_info anchor="right" id="Capture Analysis" order="5" />
  439 + <window_info anchor="right" id="Database" order="6" weight="0.32995737" />
  440 + <window_info anchor="right" id="Palette&#9;" order="7" />
  441 + <window_info anchor="right" id="Theme Preview" order="8" />
  442 + <window_info anchor="right" id="Bean Validation" order="9" weight="0.32995737" />
  443 + </layout>
  444 + </component>
273 445 <component name="TypeScriptGeneratedFilesManager">
274 446 <option name="version" value="1" />
275 447 </component>
... ... @@ -279,7 +451,20 @@
279 451 <entry key="MAIN">
280 452 <value>
281 453 <State>
282   - <option name="COLUMN_ORDER" />
  454 + <option name="RECENTLY_FILTERED_USER_GROUPS">
  455 + <collection />
  456 + </option>
  457 + <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
  458 + <collection />
  459 + </option>
  460 + <option name="COLUMN_ORDER">
  461 + <list>
  462 + <option value="0" />
  463 + <option value="1" />
  464 + <option value="2" />
  465 + <option value="3" />
  466 + </list>
  467 + </option>
283 468 </State>
284 469 </value>
285 470 </entry>
... ... @@ -305,33 +490,168 @@
305 490 <MESSAGE value="添加入库、出库表实体类&#10;添加客户、供应商增删改查接口&#10;添加库位、容器、供应商页面" />
306 491 <MESSAGE value="修改库区service" />
307 492 <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" />
308   - <MESSAGE value="添加userWarehouse" />
309   - <MESSAGE value="添加containerCapacity" />
310   - <MESSAGE value="添加物料页面" />
311   - <MESSAGE value="添加商品详情" />
312   - <MESSAGE value="添加物料时判断单位是否存在，不存在则添加物料单位" />
313   - <MESSAGE value="添加task实体类" />
314   - <option name="LAST_COMMIT_MESSAGE" value="添加task实体类" />
  493 + <MESSAGE value="配置文件更新修改" />
  494 + <MESSAGE value="修复页面字典明细报错" />
  495 + <MESSAGE value="更新json库和druid的jar包" />
  496 + <option name="LAST_COMMIT_MESSAGE" value="更新json库和druid的jar包" />
315 497 </component>
316 498 <component name="XDebuggerManager">
317 499 <breakpoint-manager>
318 500 <breakpoints>
319 501 <line-breakpoint enabled="true" type="java-line">
320   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java</url>
321   - <line>88</line>
322   - <option name="timeStamp" value="3" />
323   - </line-breakpoint>
324   - <line-breakpoint enabled="true" type="java-line">
325 502 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url>
326   - <line>69</line>
327   - <option name="timeStamp" value="6" />
328   - </line-breakpoint>
329   - <line-breakpoint enabled="true" type="java-line">
330   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url>
331   - <line>123</line>
332   - <option name="timeStamp" value="7" />
  503 + <line>78</line>
  504 + <properties />
  505 + <option name="timeStamp" value="1" />
333 506 </line-breakpoint>
334 507 </breakpoints>
335 508 </breakpoint-manager>
336 509 </component>
  510 + <component name="editorHistoryManager">
  511 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/redis/RedisConfig.java" />
  512 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengServletInitializer.java">
  513 + <provider selected="true" editor-type-id="text-editor">
  514 + <state relative-caret-position="180">
  515 + <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
  516 + </state>
  517 + </provider>
  518 + </entry>
  519 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/redis/serviceimpl/RedisServiceImpl.java" />
  520 + <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
  521 + <provider selected="true" editor-type-id="text-editor">
  522 + <state relative-caret-position="-272">
  523 + <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
  524 + </state>
  525 + </provider>
  526 + </entry>
  527 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/report/excelReport/service/ExcelReportService.java">
  528 + <provider selected="true" editor-type-id="text-editor" />
  529 + </entry>
  530 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java">
  531 + <provider selected="true" editor-type-id="text-editor">
  532 + <state relative-caret-position="113">
  533 + <caret line="147" column="39" selection-start-line="147" selection-start-column="39" selection-end-line="147" selection-end-column="39" />
  534 + <folding>
  535 + <element signature="e#3376#3377#0" expanded="true" />
  536 + <element signature="e#3415#3416#0" expanded="true" />
  537 + </folding>
  538 + </state>
  539 + </provider>
  540 + </entry>
  541 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java">
  542 + <provider selected="true" editor-type-id="text-editor">
  543 + <state relative-caret-position="372">
  544 + <caret line="311" column="16" selection-start-line="311" selection-start-column="16" selection-end-line="311" selection-end-column="16" />
  545 + <folding>
  546 + <element signature="imports" expanded="true" />
  547 + </folding>
  548 + </state>
  549 + </provider>
  550 + </entry>
  551 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html">
  552 + <provider selected="true" editor-type-id="text-editor">
  553 + <state relative-caret-position="2980">
  554 + <caret line="149" column="10" selection-start-line="149" selection-start-column="10" selection-end-line="149" selection-end-column="10" />
  555 + </state>
  556 + </provider>
  557 + </entry>
  558 + <entry file="file://$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java">
  559 + <provider selected="true" editor-type-id="text-editor">
  560 + <state relative-caret-position="368">
  561 + <caret line="1054" column="29" lean-forward="true" selection-start-line="1054" selection-start-column="29" selection-end-line="1054" selection-end-column="29" />
  562 + </state>
  563 + </provider>
  564 + </entry>
  565 + <entry file="file://$PROJECT_DIR$/src/test/java/com.huaheng.test/EncryptPassword.java">
  566 + <provider selected="true" editor-type-id="text-editor">
  567 + <state relative-caret-position="240">
  568 + <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
  569 + </state>
  570 + </provider>
  571 + </entry>
  572 + <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
  573 + <provider selected="true" editor-type-id="text-editor">
  574 + <state relative-caret-position="160">
  575 + <caret line="8" column="70" selection-start-line="8" selection-start-column="70" selection-end-line="8" selection-end-column="70" />
  576 + </state>
  577 + </provider>
  578 + </entry>
  579 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
  580 + <provider selected="true" editor-type-id="text-editor">
  581 + <state relative-caret-position="88">
  582 + <caret line="11" column="3" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
  583 + </state>
  584 + </provider>
  585 + </entry>
  586 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java">
  587 + <provider selected="true" editor-type-id="text-editor">
  588 + <state relative-caret-position="120">
  589 + <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
  590 + </state>
  591 + </provider>
  592 + </entry>
  593 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/include.html">
  594 + <provider selected="true" editor-type-id="text-editor" />
  595 + </entry>
  596 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/main.html">
  597 + <provider selected="true" editor-type-id="text-editor">
  598 + <state relative-caret-position="-1548" />
  599 + </provider>
  600 + </entry>
  601 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/index.html">
  602 + <provider selected="true" editor-type-id="text-editor">
  603 + <state relative-caret-position="-526">
  604 + <caret line="8" column="43" selection-start-line="8" selection-start-column="43" selection-end-line="8" selection-end-column="43" />
  605 + </state>
  606 + </provider>
  607 + </entry>
  608 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/favicon.ico">
  609 + <provider selected="true" editor-type-id="images" />
  610 + </entry>
  611 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng.png">
  612 + <provider selected="true" editor-type-id="images" />
  613 + </entry>
  614 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/user.png">
  615 + <provider selected="true" editor-type-id="images" />
  616 + </entry>
  617 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/locked.png">
  618 + <provider selected="true" editor-type-id="images" />
  619 + </entry>
  620 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/progress.png">
  621 + <provider selected="true" editor-type-id="images" />
  622 + </entry>
  623 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/loading.gif">
  624 + <provider selected="true" editor-type-id="images" />
  625 + </entry>
  626 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/sprite-skin-flat.png">
  627 + <provider selected="true" editor-type-id="images" />
  628 + </entry>
  629 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/qr_code.png">
  630 + <provider selected="true" editor-type-id="images" />
  631 + </entry>
  632 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/profile.jpg">
  633 + <provider selected="true" editor-type-id="images" />
  634 + </entry>
  635 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/bg.png">
  636 + <provider selected="true" editor-type-id="images" />
  637 + </entry>
  638 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/webuploader.png">
  639 + <provider selected="true" editor-type-id="images" />
  640 + </entry>
  641 + <entry file="file://$PROJECT_DIR$/pom.xml">
  642 + <provider selected="true" editor-type-id="text-editor">
  643 + <state relative-caret-position="248">
  644 + <caret line="16" column="40" selection-start-line="16" selection-start-column="40" selection-end-line="16" selection-end-column="40" />
  645 + </state>
  646 + </provider>
  647 + <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
  648 + </entry>
  649 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html">
  650 + <provider selected="true" editor-type-id="text-editor">
  651 + <state relative-caret-position="289">
  652 + <caret line="40" column="24" selection-start-line="40" selection-start-column="24" selection-end-line="40" selection-end-column="24" />
  653 + </state>
  654 + </provider>
  655 + </entry>
  656 + </component>
337 657 </project>
338 658 \ No newline at end of file
... ...
... ... @@ -9,7 +9,7 @@
9 9 <packaging>jar</packaging>
10 10  
11 11 <name>huaheng</name>
12   - <description>华恒WMS管理系统</description>
  12 + <description>华恒WMS管理系统_v2</description>
13 13  
14 14 <parent>
15 15 <groupId>org.springframework.boot</groupId>
... ...
src/main/resources/static/img/qr_code.png deleted
View file @528cd7f

8.4 KB
src/main/resources/templates/index.html
  View file @d0a045d
... ... @@ -4,9 +4,9 @@
4 4 <meta charset="utf-8">
5 5 <meta name="viewport" content="width=device-width, initial-scale=1.0">
6 6 <meta name="renderer" content="webkit">
7   - <title>华恒管理系统首页</title>
8   - <meta name="keywords" content="华恒管理系统首页">
9   - <meta name="description" content="华恒管理系统首页">
  7 + <title>华恒WMS管理系统首页</title>
  8 + <meta name="keywords" content="华恒WMS管理系统首页">
  9 + <meta name="description" content="华恒WMS管理系统首页">
10 10 <!--[if lt IE 9]>
11 11 <meta http-equiv="refresh" content="0;ie.html"/>
12 12 <![endif]-->
... ...
src/main/resources/templates/login.html
  View file @d0a045d
... ... @@ -4,8 +4,8 @@
4 4 <meta charset="utf-8">
5 5 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
6 6  
7   - <title>华恒仓库管理系统 - 登录</title>
8   - <meta name="keywords" content="华恒仓库管理系统">
  7 + <title>华恒WMS仓库管理系统 - 登录</title>
  8 + <meta name="keywords" content="华恒WMS管理系统">
9 9 <meta name="description" content="huaheng">
10 10 <link href="../static/css/bootstrap.min.css" th:href="@{css/bootstrap.min.css}" rel="stylesheet"/>
11 11 <link href="../static/css/font-awesome.css" th:href="@{css/font-awesome.css}" rel="stylesheet"/>
... ... @@ -38,7 +38,7 @@
38 38 <h1><img alt="[ 华恒 ]" src="../static/huaheng.png" th:src="@{/huaheng.png}"></h1>
39 39 </div>
40 40 <div class="m-b"></div>
41   - <h4>欢迎使用 <strong>华恒WMS仓库管理系统v1.0</strong></h4>
  41 + <h4>欢迎使用华恒WMS仓库管理系统_v2.0</h4>
42 42 <!--<ul class="m-b">-->
43 43 <!--<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> SpringBoot</li>-->
44 44 <!--<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Mybatis</li>-->
... ...
src/test/java/com.huaheng.test/CreateCode.java
  View file @d0a045d
... ... @@ -15,10 +15,10 @@ public class CreateCode {
15 15 {
16 16 try {
17 17 //language=SQL
18   - String sql = "select TABLE_NAME, TABLE_COMMENT from information_schema.tables where table_schema = 'huahengtest'";
  18 + String sql = "select TABLE_NAME, TABLE_COMMENT from information_schema.tables where table_schema = 'wms_v2'";
19 19 List<Map<String, Object>> tableList = getDataList(sql);
20 20 //language=SQL
21   - sql = "SELECT TABLE_NAME, COLUMN_NAME, DATA_TYPE, IS_NULLABLE, COLUMN_DEFAULT, COLUMN_COMMENT FROM information_schema.columns WHERE table_schema = 'huahengtest'";
  21 + sql = "SELECT TABLE_NAME, COLUMN_NAME, DATA_TYPE, IS_NULLABLE, COLUMN_DEFAULT, COLUMN_COMMENT FROM information_schema.columns WHERE table_schema = 'wms_v2'";
22 22 List<Map<String, Object>> columnList = getDataList(sql);
23 23 // sql = "SELECT * FROM config_header WHERE deleted = FALSE and enable = TRUE";
24 24 // List<Map<String, Object>> configHeadeCcolumnList = getDataList(sql);
... ... @@ -830,7 +830,7 @@ public class CreateCode {
830 830  
831 831  
832 832 // 数据库的URL、用户名、密码，需要根据自己的设置
833   - String DB_URL = "jdbc:mysql://172.16.29.45:3306/huahengtest?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&autoReconnect=true&failOverReadOnly=false";
  833 + String DB_URL = "jdbc:mysql://172.16.29.45:3306/wms_v2?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&autoReconnect=true&failOverReadOnly=false";
834 834 String USER = "softhuaheng";
835 835 String PASS = "HHrobot123.";
836 836  
... ...