diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 0bcc71b..5f0c02f 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,8 +6,8 @@
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
- <module name="wms2" />
<module name="huaheng" />
+ <module name="wms2" />
</profile>
</annotationProcessing>
</component>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d9d9ec3..99ed580 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,20 +2,15 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="">
- <change afterPath="$PROJECT_DIR$/src/main/resources/templates/general/bomDetail/add.html" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/resources/templates/general/bomDetail/bomDetail.html" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/resources/templates/general/bomDetail/edit.html" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/resources/templates/general/bomHeader/add.html" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/src/main/resources/templates/general/bomHeader/edit.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <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" />
- <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" />
- <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" />
- <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" />
- <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" />
- <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" />
- <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" />
+ <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/static/img/qr_code.png" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/index.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/templates/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/login.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" />
</list>
+ <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -33,44 +28,36 @@
<option name="HIDDEN_KINDS">
<set />
</option>
- <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>
- <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="bom_detail: table" type="285a2a93:MysqlImplModel$Table" />
- </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" />
- <item name="location_type: table" type="285a2a93:MysqlImplModel$Table" />
- </path>
- </expand>
+ <expand />
<select />
</component>
+ <component name="FileEditorManager">
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+ <file pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="248">
+ <caret line="16" column="40" selection-start-line="16" selection-start-column="40" selection-end-line="16" selection-end-column="40" />
+ </state>
+ </provider>
+ <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
+ </entry>
+ </file>
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="289">
+ <caret line="40" column="24" selection-start-line="40" selection-start-column="24" selection-end-line="40" selection-end-column="24" />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
+ </component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
- <option value="HTML File" />
</list>
</option>
</component>
@@ -82,6 +69,21 @@
</map>
</option>
</component>
+ <component name="IdeDocumentHistory">
+ <option name="CHANGED_PATHS">
+ <list>
+ <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" />
+ <option value="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html" />
+ <option value="$PROJECT_DIR$/src/main/resources/application-druid.properties" />
+ <option value="$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java" />
+ <option value="$PROJECT_DIR$/pom.xml" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/index.html" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/login.html" />
+ </list>
+ </option>
+ </component>
<component name="IgnoredFileRootStore">
<option name="generatedRoots">
<set>
@@ -89,14 +91,201 @@
</set>
</option>
</component>
+ <component name="MavenImportPreferences">
+ <option name="importingSettings">
+ <MavenImportingSettings>
+ <option name="importAutomatically" value="true" />
+ </MavenImportingSettings>
+ </option>
+ </component>
+ <component name="MavenProjectNavigator">
+ <treeState>
+ <expand>
+ <path>
+ <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+ <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+ </path>
+ <path>
+ <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
+ <item name="huaheng" type="9519ce18:MavenProjectsStructure$ProjectNode" />
+ <item name="Lifecycle" type="58874e2:MavenProjectsStructure$LifecycleNode" />
+ </path>
+ </expand>
+ <select />
+ </treeState>
+ </component>
+ <component name="MavenRunner">
+ <option name="skipTests" value="true" />
+ </component>
+ <component name="ProjectFrameBounds" extendedState="6">
+ <option name="x" value="-10" />
+ <option name="y" value="-10" />
+ <option name="width" value="1940" />
+ <option name="height" value="1100" />
+ </component>
<component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
</component>
+ <component name="ProjectView">
+ <navigator proportions="" version="1">
+ <foldersAlwaysOnTop value="true" />
+ </navigator>
+ <panes>
+ <pane id="Scope" />
+ <pane id="ProjectPane">
+ <subPane>
+ <expand>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="huaheng" type="462c0819:PsiDirectoryNode" />
+ <item name="pc" type="462c0819:PsiDirectoryNode" />
+ <item name="inventory" type="462c0819:PsiDirectoryNode" />
+ <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="static" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="test" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="test" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="test" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com.huaheng.test" type="462c0819:PsiDirectoryNode" />
+ </path>
+ </expand>
+ <select />
+ </subPane>
+ </pane>
+ <pane id="PackagesPane" />
+ </panes>
+ </component>
<component name="PropertiesComponent">
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="DatabaseDriversLRU" value="mysql" />
- <property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="ExpandSpringBootJavaOptionsPanel" value="true" />
<property name="RequestMappingsPanelOrder0" value="0" />
<property name="RequestMappingsPanelOrder1" value="1" />
@@ -112,7 +301,6 @@
<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)" />
- <property name="nodejs_package_manager_path" value="npm" />
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
</component>
<component name="RecentsManager">
@@ -122,11 +310,6 @@
</key>
</component>
<component name="RunDashboard">
- <option name="configurationTypes">
- <set>
- <option value="SpringBootApplicationConfigurationType" />
- </set>
- </option>
<option name="ruleStates">
<list>
<RuleState>
@@ -140,9 +323,10 @@
</component>
<component name="RunManager">
<configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
- <module name="huaheng" />
+ <module name="wms2" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
- <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
+ <option name="ALTERNATIVE_JRE_PATH" value="C:\Program Files\Java\jdk1.8.0_202\jre" />
<option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
<option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
<method v="2">
@@ -161,14 +345,8 @@
<component name="ServiceViewManager">
<option name="allServicesViewState">
<serviceView>
- <option name="contentProportion" value="0.18875067" />
<treeState>
- <expand>
- <path>
- <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
- <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@6299c693" type="7427dc5b:ServiceModel$ServiceGroupNode" />
- </path>
- </expand>
+ <expand />
<select />
</treeState>
</serviceView>
@@ -191,11 +369,7 @@
<workItem from="1565311988064" duration="7176000" />
<workItem from="1565328536669" duration="797000" />
<workItem from="1565345715376" duration="452000" />
- <workItem from="1565570424829" duration="11663000" />
- <workItem from="1565587737758" duration="12961000" />
- <workItem from="1565657307503" duration="115000" />
- <workItem from="1565657439247" duration="2447000" />
- <workItem from="1565662229227" duration="19207000" />
+ <workItem from="1565570424829" duration="697000" />
</task>
<task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
<created>1565226427512</created>
@@ -225,51 +399,49 @@
<option name="project" value="LOCAL" />
<updated>1565342188814</updated>
</task>
- <task id="LOCAL-00005" summary="添加userWarehouse">
- <created>1565571202923</created>
- <option name="number" value="00005" />
- <option name="presentableId" value="LOCAL-00005" />
- <option name="project" value="LOCAL" />
- <updated>1565571202923</updated>
- </task>
- <task id="LOCAL-00006" summary="添加containerCapacity">
- <created>1565578920011</created>
- <option name="number" value="00006" />
- <option name="presentableId" value="LOCAL-00006" />
- <option name="project" value="LOCAL" />
- <updated>1565578920011</updated>
- </task>
- <task id="LOCAL-00007" summary="添加物料页面">
- <created>1565593159103</created>
- <option name="number" value="00007" />
- <option name="presentableId" value="LOCAL-00007" />
- <option name="project" value="LOCAL" />
- <updated>1565593159103</updated>
- </task>
- <task id="LOCAL-00008" summary="添加商品详情">
- <created>1565598117104</created>
- <option name="number" value="00008" />
- <option name="presentableId" value="LOCAL-00008" />
- <option name="project" value="LOCAL" />
- <updated>1565598117104</updated>
- </task>
- <task id="LOCAL-00009" summary="添加物料时判断单位是否存在，不存在则添加物料单位">
- <created>1565659672152</created>
- <option name="number" value="00009" />
- <option name="presentableId" value="LOCAL-00009" />
- <option name="project" value="LOCAL" />
- <updated>1565659672152</updated>
- </task>
- <task id="LOCAL-00010" summary="添加task实体类">
- <created>1565665525508</created>
- <option name="number" value="00010" />
- <option name="presentableId" value="LOCAL-00010" />
- <option name="project" value="LOCAL" />
- <updated>1565665525508</updated>
- </task>
- <option name="localTasksCounter" value="11" />
+ <option name="localTasksCounter" value="5" />
<servers />
</component>
+ <component name="ToolWindowManager">
+ <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
+ <editor active="true" />
+ <layout>
+ <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4967462" visible="true" weight="0.28820375" />
+ <window_info id="Structure" order="1" sideWeight="0.5032538" side_tool="true" weight="0.1673774" />
+ <window_info id="Designer" order="2" />
+ <window_info id="UI Designer" order="3" />
+ <window_info id="Favorites" order="4" side_tool="true" />
+ <window_info id="Capture Tool" order="5" />
+ <window_info id="Web" order="6" side_tool="true" />
+ <window_info id="Image Layers" order="7" />
+ <window_info anchor="bottom" id="Message" order="0" />
+ <window_info anchor="bottom" id="Find" order="1" />
+ <window_info anchor="bottom" id="Run" order="2" />
+ <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.2407932" />
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+ <window_info anchor="bottom" id="TODO" order="6" />
+ <window_info anchor="bottom" id="Spring" order="7" />
+ <window_info anchor="bottom" id="Terminal" order="8" />
+ <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
+ <window_info anchor="bottom" id="Java Enterprise" order="10" weight="0.3286119" />
+ <window_info anchor="bottom" id="Database Changes" order="11" />
+ <window_info anchor="bottom" id="Version Control" order="12" weight="0.8427762" />
+ <window_info anchor="bottom" id="Docker" order="13" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Messages" order="14" weight="0.329718" />
+ <window_info anchor="bottom" id="MyBatis Log" order="15" />
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+ <window_info anchor="right" id="Maven" order="3" weight="0.22334754" />
+ <window_info anchor="right" id="Palette" order="4" />
+ <window_info anchor="right" id="Capture Analysis" order="5" />
+ <window_info anchor="right" id="Database" order="6" weight="0.32995737" />
+ <window_info anchor="right" id="Palette	" order="7" />
+ <window_info anchor="right" id="Theme Preview" order="8" />
+ <window_info anchor="right" id="Bean Validation" order="9" weight="0.32995737" />
+ </layout>
+ </component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
@@ -279,7 +451,20 @@
<entry key="MAIN">
<value>
<State>
- <option name="COLUMN_ORDER" />
+ <option name="RECENTLY_FILTERED_USER_GROUPS">
+ <collection />
+ </option>
+ <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+ <collection />
+ </option>
+ <option name="COLUMN_ORDER">
+ <list>
+ <option value="0" />
+ <option value="1" />
+ <option value="2" />
+ <option value="3" />
+ </list>
+ </option>
</State>
</value>
</entry>
@@ -305,33 +490,168 @@
<MESSAGE value="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面" />
<MESSAGE value="修改库区service" />
<MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml" />
- <MESSAGE value="添加userWarehouse" />
- <MESSAGE value="添加containerCapacity" />
- <MESSAGE value="添加物料页面" />
- <MESSAGE value="添加商品详情" />
- <MESSAGE value="添加物料时判断单位是否存在，不存在则添加物料单位" />
- <MESSAGE value="添加task实体类" />
- <option name="LAST_COMMIT_MESSAGE" value="添加task实体类" />
+ <MESSAGE value="配置文件更新修改" />
+ <MESSAGE value="修复页面字典明细报错" />
+ <MESSAGE value="更新json库和druid的jar包" />
+ <option name="LAST_COMMIT_MESSAGE" value="更新json库和druid的jar包" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java</url>
- <line>88</line>
- <option name="timeStamp" value="3" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url>
- <line>69</line>
- <option name="timeStamp" value="6" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url>
- <line>123</line>
- <option name="timeStamp" value="7" />
+ <line>78</line>
+ <properties />
+ <option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
+ <component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/redis/RedisConfig.java" />
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengServletInitializer.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="180">
+ <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/redis/serviceimpl/RedisServiceImpl.java" />
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-272">
+ <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/report/excelReport/service/ExcelReportService.java">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="113">
+ <caret line="147" column="39" selection-start-line="147" selection-start-column="39" selection-end-line="147" selection-end-column="39" />
+ <folding>
+ <element signature="e#3376#3377#0" expanded="true" />
+ <element signature="e#3415#3416#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="372">
+ <caret line="311" column="16" selection-start-line="311" selection-start-column="16" selection-end-line="311" selection-end-column="16" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/dict/data/data.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2980">
+ <caret line="149" column="10" selection-start-line="149" selection-start-column="10" selection-end-line="149" selection-end-column="10" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="368">
+ <caret line="1054" column="29" lean-forward="true" selection-start-line="1054" selection-start-column="29" selection-end-line="1054" selection-end-column="29" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/test/java/com.huaheng.test/EncryptPassword.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="240">
+ <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="160">
+ <caret line="8" column="70" selection-start-line="8" selection-start-column="70" selection-end-line="8" selection-end-column="70" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="88">
+ <caret line="11" column="3" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="120">
+ <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/include.html">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/main.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-1548" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/index.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-526">
+ <caret line="8" column="43" selection-start-line="8" selection-start-column="43" selection-end-line="8" selection-end-column="43" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/favicon.ico">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/user.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/locked.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/progress.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/loading.gif">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/sprite-skin-flat.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/qr_code.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/profile.jpg">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/bg.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/img/webuploader.png">
+ <provider selected="true" editor-type-id="images" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pom.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="248">
+ <caret line="16" column="40" selection-start-line="16" selection-start-column="40" selection-end-line="16" selection-end-column="40" />
+ </state>
+ </provider>
+ <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/login.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="289">
+ <caret line="40" column="24" selection-start-line="40" selection-start-column="24" selection-end-line="40" selection-end-column="24" />
+ </state>
+ </provider>
+ </entry>
+ </component>
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5e3deb0..7e66c16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<packaging>jar</packaging>
<name>huaheng</name>
- <description>华恒WMS管理系统</description>
+ <description>华恒WMS管理系统_v2</description>
<parent>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/resources/static/img/qr_code.png b/src/main/resources/static/img/qr_code.png
deleted file mode 100644
index ecba6d6..0000000
--- a/src/main/resources/static/img/qr_code.png
+++ /dev/null
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 9d0009d..44a297d 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -4,9 +4,9 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="renderer" content="webkit">
- <title>华恒管理系统首页</title>
- <meta name="keywords" content="华恒管理系统首页">
- <meta name="description" content="华恒管理系统首页">
+ <title>华恒WMS管理系统首页</title>
+ <meta name="keywords" content="华恒WMS管理系统首页">
+ <meta name="description" content="华恒WMS管理系统首页">
<!--[if lt IE 9]>
<meta http-equiv="refresh" content="0;ie.html"/>
<![endif]-->
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index 0c7ebb7..43628af 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -4,8 +4,8 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
- <title>华恒仓库管理系统 - 登录</title>
- <meta name="keywords" content="华恒仓库管理系统">
+ <title>华恒WMS仓库管理系统 - 登录</title>
+ <meta name="keywords" content="华恒WMS管理系统">
<meta name="description" content="huaheng">
<link href="../static/css/bootstrap.min.css" th:href="@{css/bootstrap.min.css}" rel="stylesheet"/>
<link href="../static/css/font-awesome.css" th:href="@{css/font-awesome.css}" rel="stylesheet"/>
@@ -38,7 +38,7 @@
<h1><img alt="[ 华恒 ]" src="../static/huaheng.png" th:src="@{/huaheng.png}"></h1>
</div>
<div class="m-b"></div>
- <h4>欢迎使用 <strong>华恒WMS仓库管理系统v1.0</strong></h4>
+ <h4>欢迎使用华恒WMS仓库管理系统_v2.0</h4>
<!--<ul class="m-b">-->
<!--<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> SpringBoot</li>-->
<!--<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Mybatis</li>-->
diff --git a/src/test/java/com.huaheng.test/CreateCode.java b/src/test/java/com.huaheng.test/CreateCode.java
index 3a707a4..c1cad0e 100644
--- a/src/test/java/com.huaheng.test/CreateCode.java
+++ b/src/test/java/com.huaheng.test/CreateCode.java
@@ -15,10 +15,10 @@ public class CreateCode {
{
try {
//language=SQL
- String sql = "select TABLE_NAME, TABLE_COMMENT from information_schema.tables where table_schema = 'huahengtest'";
+ String sql = "select TABLE_NAME, TABLE_COMMENT from information_schema.tables where table_schema = 'wms_v2'";
List<Map<String, Object>> tableList = getDataList(sql);
//language=SQL
- sql = "SELECT TABLE_NAME, COLUMN_NAME, DATA_TYPE, IS_NULLABLE, COLUMN_DEFAULT, COLUMN_COMMENT FROM information_schema.columns WHERE table_schema = 'huahengtest'";
+ sql = "SELECT TABLE_NAME, COLUMN_NAME, DATA_TYPE, IS_NULLABLE, COLUMN_DEFAULT, COLUMN_COMMENT FROM information_schema.columns WHERE table_schema = 'wms_v2'";
List<Map<String, Object>> columnList = getDataList(sql);
// sql = "SELECT * FROM config_header WHERE deleted = FALSE and enable = TRUE";
// List<Map<String, Object>> configHeadeCcolumnList = getDataList(sql);
@@ -830,7 +830,7 @@ public class CreateCode {
// 数据库的URL、用户名、密码，需要根据自己的设置
- 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";
+ 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";
String USER = "softhuaheng";
String PASS = "HHrobot123.";