Commit bdeac1439f2a0b81223196e1572dcc47ea26c331
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # .idea/compiler.xml # .idea/workspace.xml
Showing
11 changed files
with
486 additions
and
206 deletions
.idea/compiler.xml
... | ... | @@ -7,11 +7,9 @@ |
7 | 7 | <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> |
8 | 8 | <outputRelativeToContentRoot value="true" /> |
9 | 9 | <module name="huaheng" /> |
10 | + <module name="WMSV1" /> | |
10 | 11 | </profile> |
11 | 12 | </annotationProcessing> |
12 | - <bytecodeTargetLevel> | |
13 | - <module name="WMSV1" target="1.8" /> | |
14 | - </bytecodeTargetLevel> | |
15 | 13 | </component> |
16 | 14 | <component name="JavacSettings"> |
17 | 15 | <option name="ADDITIONAL_OPTIONS_OVERRIDE"> |
... | ... |
.idea/workspace.xml
1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | 2 | <project version="4"> |
3 | 3 | <component name="ChangeListManager"> |
4 | - <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment=""> | |
5 | - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java" afterDir="false" /> | |
4 | + <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment=""> | |
5 | + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/framework/config/MybatisPlusConfig.java" afterDir="false" /> | |
6 | 6 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
7 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/domain/Material.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/domain/Material.java" afterDir="false" /> | |
8 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialService.java" afterDir="false" /> | |
9 | - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java" afterDir="false" /> | |
10 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/location/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/location/add.html" afterDir="false" /> | |
7 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/framework/web/controller/BaseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/framework/web/controller/BaseController.java" afterDir="false" /> | |
8 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java" afterDir="false" /> | |
9 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java" afterDir="false" /> | |
10 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java" afterDir="false" /> | |
11 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java" afterDir="false" /> | |
12 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/controller/LocationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/controller/LocationController.java" afterDir="false" /> | |
13 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/domain/Location.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/location/domain/Location.java" afterDir="false" /> | |
14 | + <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" /> | |
15 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java" afterDir="false" /> | |
16 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" afterDir="false" /> | |
17 | + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/location/addBatch.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/location/addBatch.html" afterDir="false" /> | |
11 | 18 | <change beforePath="$PROJECT_DIR$/src/main/resources/templates/general/location/location.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/general/location/location.html" afterDir="false" /> |
12 | 19 | </list> |
13 | 20 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
... | ... | @@ -17,13 +24,13 @@ |
17 | 24 | <option name="LAST_RESOLUTION" value="IGNORE" /> |
18 | 25 | </component> |
19 | 26 | <component name="DatabaseView"> |
20 | - <option name="SHOW_INTERMEDIATE" value="true" /> | |
27 | + <option name="SHOW_INTERMEDIATE" value="false" /> | |
21 | 28 | <option name="GROUP_DATA_SOURCES" value="true" /> |
22 | 29 | <option name="GROUP_SCHEMA" value="true" /> |
23 | 30 | <option name="GROUP_CONTENTS" value="false" /> |
24 | 31 | <option name="SORT_POSITIONED" value="false" /> |
25 | 32 | <option name="SHOW_EMPTY_GROUPS" value="false" /> |
26 | - <option name="AUTO_SCROLL_FROM_SOURCE" value="false" /> | |
33 | + <option name="AUTO_SCROLL_FROM_SOURCE" value="true" /> | |
27 | 34 | <option name="HIDDEN_KINDS"> |
28 | 35 | <set /> |
29 | 36 | </option> |
... | ... | @@ -48,15 +55,50 @@ |
48 | 55 | <item name="@172.16.29.45" type="feb32156:DbDataSourceImpl" /> |
49 | 56 | <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" /> |
50 | 57 | <item name="wms_v2: schema" type="76f4a085:MysqlImplModel$Schema" /> |
51 | - <item name="material: table" type="285a2a93:MysqlImplModel$Table" /> | |
58 | + <item name="location: table" type="285a2a93:MysqlImplModel$Table" /> | |
52 | 59 | </path> |
53 | 60 | </expand> |
54 | 61 | <select /> |
55 | 62 | </component> |
63 | + <component name="FileEditorManager"> | |
64 | + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | |
65 | + <file pinned="false" current-in-tab="false"> | |
66 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java"> | |
67 | + <provider selected="true" editor-type-id="text-editor"> | |
68 | + <state relative-caret-position="70"> | |
69 | + <caret line="124" column="57" selection-start-line="124" selection-start-column="38" selection-end-line="124" selection-end-column="57" /> | |
70 | + </state> | |
71 | + </provider> | |
72 | + </entry> | |
73 | + </file> | |
74 | + <file pinned="false" current-in-tab="true"> | |
75 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/user/edit.html"> | |
76 | + <provider selected="true" editor-type-id="text-editor"> | |
77 | + <state relative-caret-position="171"> | |
78 | + <caret line="69" column="65" lean-forward="true" selection-start-line="69" selection-start-column="65" selection-end-line="69" selection-end-column="65" /> | |
79 | + </state> | |
80 | + </provider> | |
81 | + </entry> | |
82 | + </file> | |
83 | + <file pinned="false" current-in-tab="false"> | |
84 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java"> | |
85 | + <provider selected="true" editor-type-id="text-editor"> | |
86 | + <state relative-caret-position="193"> | |
87 | + <caret line="87" column="77" selection-start-line="87" selection-start-column="61" selection-end-line="87" selection-end-column="77" /> | |
88 | + </state> | |
89 | + </provider> | |
90 | + </entry> | |
91 | + </file> | |
92 | + <file pinned="false" current-in-tab="false"> | |
93 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/system/user/add.html"> | |
94 | + <provider selected="true" editor-type-id="text-editor" /> | |
95 | + </entry> | |
96 | + </file> | |
97 | + </leaf> | |
98 | + </component> | |
56 | 99 | <component name="FileTemplateManagerImpl"> |
57 | 100 | <option name="RECENT_TEMPLATES"> |
58 | 101 | <list> |
59 | - <option value="Interface" /> | |
60 | 102 | <option value="Class" /> |
61 | 103 | </list> |
62 | 104 | </option> |
... | ... | @@ -65,35 +107,174 @@ |
65 | 107 | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
66 | 108 | <option name="RECENT_BRANCH_BY_REPOSITORY"> |
67 | 109 | <map> |
68 | - <entry key="$PROJECT_DIR$" value="developMain" /> | |
110 | + <entry key="$PROJECT_DIR$" value="master" /> | |
69 | 111 | </map> |
70 | 112 | </option> |
71 | - <option name="RESET_MODE" value="HARD" /> | |
72 | 113 | </component> |
73 | 114 | <component name="IgnoredFileRootStore"> |
74 | 115 | <option name="generatedRoots"> |
75 | 116 | <set> |
76 | - <option value="C:\Users\Administrator\IdeaProjects\wms2\.idea" /> | |
117 | + <option value="E:\code\wms2\.idea" /> | |
77 | 118 | </set> |
78 | 119 | </option> |
79 | 120 | </component> |
80 | - <component name="MavenImportPreferences"> | |
81 | - <option name="importingSettings"> | |
82 | - <MavenImportingSettings> | |
83 | - <option name="importAutomatically" value="true" /> | |
84 | - </MavenImportingSettings> | |
85 | - </option> | |
86 | - </component> | |
87 | 121 | <component name="ProjectFrameBounds" extendedState="6"> |
88 | - <option name="x" value="-9" /> | |
89 | - <option name="y" value="-9" /> | |
90 | - <option name="width" value="1938" /> | |
91 | - <option name="height" value="1048" /> | |
122 | + <option name="x" value="470" /> | |
123 | + <option name="width" value="980" /> | |
124 | + <option name="height" value="1030" /> | |
92 | 125 | </component> |
93 | - <component name="ProjectId" id="1P2xIFeseJehotA5kuRjbIbfKQa" /> | |
126 | + <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" /> | |
94 | 127 | <component name="ProjectLevelVcsManager"> |
95 | 128 | <ConfirmationsSetting value="2" id="Add" /> |
96 | 129 | </component> |
130 | + <component name="ProjectView"> | |
131 | + <navigator proportions="" version="1"> | |
132 | + <foldersAlwaysOnTop value="true" /> | |
133 | + </navigator> | |
134 | + <panes> | |
135 | + <pane id="PackagesPane" /> | |
136 | + <pane id="Scope" /> | |
137 | + <pane id="ProjectPane"> | |
138 | + <subPane> | |
139 | + <expand> | |
140 | + <path> | |
141 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
142 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
143 | + </path> | |
144 | + <path> | |
145 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
146 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
147 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
148 | + </path> | |
149 | + <path> | |
150 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
151 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
152 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
153 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
154 | + </path> | |
155 | + <path> | |
156 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
157 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
158 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
159 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
160 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
161 | + </path> | |
162 | + <path> | |
163 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
164 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
165 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
166 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
167 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
168 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
169 | + </path> | |
170 | + <path> | |
171 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
172 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
173 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
174 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
175 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
176 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
177 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
178 | + </path> | |
179 | + <path> | |
180 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
181 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
182 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
183 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
184 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
185 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
186 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
187 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
188 | + </path> | |
189 | + <path> | |
190 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
191 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
192 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
193 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
194 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
195 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
196 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
197 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
198 | + <item name="system" type="462c0819:PsiDirectoryNode" /> | |
199 | + </path> | |
200 | + <path> | |
201 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
202 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
203 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
204 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
205 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
206 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
207 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
208 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
209 | + <item name="system" type="462c0819:PsiDirectoryNode" /> | |
210 | + <item name="user" type="462c0819:PsiDirectoryNode" /> | |
211 | + </path> | |
212 | + <path> | |
213 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
214 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
215 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
216 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
217 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
218 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
219 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
220 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
221 | + <item name="system" type="462c0819:PsiDirectoryNode" /> | |
222 | + <item name="user" type="462c0819:PsiDirectoryNode" /> | |
223 | + <item name="controller" type="462c0819:PsiDirectoryNode" /> | |
224 | + </path> | |
225 | + <path> | |
226 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
227 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
228 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
229 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
230 | + <item name="java" type="462c0819:PsiDirectoryNode" /> | |
231 | + <item name="com" type="462c0819:PsiDirectoryNode" /> | |
232 | + <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
233 | + <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
234 | + <item name="system" type="462c0819:PsiDirectoryNode" /> | |
235 | + <item name="user" type="462c0819:PsiDirectoryNode" /> | |
236 | + <item name="domain" type="462c0819:PsiDirectoryNode" /> | |
237 | + </path> | |
238 | + <path> | |
239 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
240 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
241 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
242 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
243 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
244 | + </path> | |
245 | + <path> | |
246 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
247 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
248 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
249 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
250 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
251 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
252 | + </path> | |
253 | + <path> | |
254 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
255 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
256 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
257 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
258 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
259 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
260 | + <item name="system" type="462c0819:PsiDirectoryNode" /> | |
261 | + </path> | |
262 | + <path> | |
263 | + <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
264 | + <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
265 | + <item name="src" type="462c0819:PsiDirectoryNode" /> | |
266 | + <item name="main" type="462c0819:PsiDirectoryNode" /> | |
267 | + <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
268 | + <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
269 | + <item name="system" type="462c0819:PsiDirectoryNode" /> | |
270 | + <item name="user" type="462c0819:PsiDirectoryNode" /> | |
271 | + </path> | |
272 | + </expand> | |
273 | + <select /> | |
274 | + </subPane> | |
275 | + </pane> | |
276 | + </panes> | |
277 | + </component> | |
97 | 278 | <component name="PropertiesComponent"> |
98 | 279 | <property name="ASKED_ADD_EXTERNAL_FILES" value="true" /> |
99 | 280 | <property name="DatabaseDriversLRU" value="mysql" /> |
... | ... | @@ -104,34 +285,22 @@ |
104 | 285 | <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> |
105 | 286 | <property name="WebServerToolWindowFactoryState" value="false" /> |
106 | 287 | <property name="aspect.path.notification.shown" value="true" /> |
107 | - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1565255020864" /> | |
108 | - <property name="database.console.LAST_STATE" value="true" /> | |
109 | - <property name="last_opened_file_path" value="$PROJECT_DIR$/../WMSV1" /> | |
288 | + <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" /> | |
110 | 289 | <property name="node.js.detected.package.eslint" value="true" /> |
290 | + <property name="node.js.detected.package.tslint" value="true" /> | |
111 | 291 | <property name="node.js.path.for.package.eslint" value="project" /> |
112 | 292 | <property name="node.js.path.for.package.tslint" value="project" /> |
113 | 293 | <property name="node.js.selected.package.eslint" value="(autodetect)" /> |
114 | 294 | <property name="node.js.selected.package.tslint" value="(autodetect)" /> |
115 | - <property name="project.structure.last.edited" value="Modules" /> | |
116 | - <property name="project.structure.proportion" value="0.15" /> | |
117 | - <property name="project.structure.side.proportion" value="0.2" /> | |
118 | 295 | <property name="settings.editor.selected.configurable" value="preferences.pluginManager" /> |
119 | 296 | </component> |
120 | 297 | <component name="RecentsManager"> |
121 | - <key name="CopyClassDialog.RECENTS_KEY"> | |
122 | - <recent name="com.huaheng.pc.config.zoneCapacity.controller" /> | |
123 | - </key> | |
124 | - <key name="CopyFile.RECENT_KEYS"> | |
125 | - <recent name="C:\Users\Administrator\IdeaProjects\wms2\src\main\resources\mybatis\config" /> | |
126 | - <recent name="C:\Users\Administrator\IdeaProjects\wms2\src\main\java\com\huaheng\pc\config" /> | |
298 | + <key name="MoveFile.RECENT_KEYS"> | |
299 | + <recent name="E:\code\wms2\src\main\resources\mybatis\general" /> | |
300 | + <recent name="E:\code\wms2\src\main\resources\mybatis\config" /> | |
127 | 301 | </key> |
128 | 302 | </component> |
129 | 303 | <component name="RunDashboard"> |
130 | - <option name="configurationTypes"> | |
131 | - <set> | |
132 | - <option value="SpringBootApplicationConfigurationType" /> | |
133 | - </set> | |
134 | - </option> | |
135 | 304 | <option name="ruleStates"> |
136 | 305 | <list> |
137 | 306 | <RuleState> |
... | ... | @@ -144,11 +313,9 @@ |
144 | 313 | </option> |
145 | 314 | </component> |
146 | 315 | <component name="RunManager"> |
147 | - <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" activateToolWindowBeforeRun="false" singleton="false" nameIsGenerated="true"> | |
148 | - <module name="huaheng" /> | |
316 | + <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> | |
317 | + <module name="WMSV1" /> | |
149 | 318 | <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> |
150 | - <option name="DEBUG_MODE" value="true" /> | |
151 | - <option name="HIDE_BANNER" value="true" /> | |
152 | 319 | <option name="ALTERNATIVE_JRE_PATH" /> |
153 | 320 | <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" /> |
154 | 321 | <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" /> |
... | ... | @@ -156,14 +323,10 @@ |
156 | 323 | <option name="Make" enabled="true" /> |
157 | 324 | </method> |
158 | 325 | </configuration> |
159 | - <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" activateToolWindowBeforeRun="false"> | |
160 | - <module name="huaheng" /> | |
326 | + <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> | |
327 | + <module name="WMSV1" /> | |
161 | 328 | <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" /> |
162 | - <option name="DEBUG_MODE" value="true" /> | |
163 | - <option name="HIDE_BANNER" value="true" /> | |
164 | 329 | <option name="ALTERNATIVE_JRE_PATH" /> |
165 | - <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" /> | |
166 | - <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" /> | |
167 | 330 | <method v="2"> |
168 | 331 | <option name="Make" enabled="true" /> |
169 | 332 | </method> |
... | ... | @@ -172,120 +335,108 @@ |
172 | 335 | <component name="ServiceViewManager"> |
173 | 336 | <option name="allServicesViewState"> |
174 | 337 | <serviceView> |
175 | - <option name="contentProportion" value="0.17955652" /> | |
176 | 338 | <treeState> |
177 | - <expand /> | |
339 | + <expand> | |
340 | + <path> | |
341 | + <item name="services root" type="e789fda9:ObjectUtils$Sentinel" /> | |
342 | + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@fe9f505" type="7427dc5b:ServiceModel$ServiceGroupNode" /> | |
343 | + </path> | |
344 | + </expand> | |
178 | 345 | <select /> |
179 | 346 | </treeState> |
180 | - <option name="groupByContributor" value="true" /> | |
181 | 347 | </serviceView> |
182 | 348 | </option> |
183 | - <option name="selectedView" value="0" /> | |
184 | - </component> | |
185 | - <component name="StructureViewFactory"> | |
186 | - <option name="ACTIVE_ACTIONS" value=",SHOW_PROPERTIES,SHOW_ANONYMOUS,SHOW_LAMBDA,SHOW_INTERFACES,VISIBILITY_SORTER" /> | |
187 | 349 | </component> |
188 | 350 | <component name="SvnConfiguration"> |
189 | 351 | <configuration /> |
190 | 352 | </component> |
191 | 353 | <component name="TaskManager"> |
192 | 354 | <task active="true" id="Default" summary="Default task"> |
193 | - <changelist id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="" /> | |
194 | - <created>1563950700252</created> | |
355 | + <changelist id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="" /> | |
356 | + <created>1565160110910</created> | |
195 | 357 | <option name="number" value="Default" /> |
196 | 358 | <option name="presentableId" value="Default" /> |
197 | - <updated>1563950700252</updated> | |
198 | - <workItem from="1563950701881" duration="73000" /> | |
199 | - <workItem from="1565055472980" duration="9734000" /> | |
200 | - <workItem from="1565078101170" duration="2642000" /> | |
201 | - <workItem from="1565080771601" duration="951000" /> | |
202 | - <workItem from="1565082117731" duration="348000" /> | |
203 | - <workItem from="1565085916295" duration="323000" /> | |
204 | - <workItem from="1565087331641" duration="170000" /> | |
205 | - <workItem from="1565138504203" duration="3006000" /> | |
206 | - <workItem from="1565162212626" duration="6726000" /> | |
207 | - <workItem from="1565169755725" duration="2857000" /> | |
208 | - <workItem from="1565242132637" duration="963000" /> | |
209 | - <workItem from="1565244881255" duration="620000" /> | |
210 | - <workItem from="1565245587599" duration="32000" /> | |
211 | - <workItem from="1565245636976" duration="7465000" /> | |
212 | - <workItem from="1565336358595" duration="3615000" /> | |
213 | - <workItem from="1565339991037" duration="87000" /> | |
214 | - <workItem from="1565340093097" duration="3717000" /> | |
359 | + <updated>1565160110910</updated> | |
360 | + <workItem from="1565160112236" duration="11971000" /> | |
361 | + <workItem from="1565224833241" duration="14642000" /> | |
362 | + <workItem from="1565242153135" duration="1476000" /> | |
363 | + <workItem from="1565259513116" duration="148000" /> | |
364 | + <workItem from="1565311988064" duration="7176000" /> | |
365 | + <workItem from="1565328536669" duration="797000" /> | |
215 | 366 | </task> |
216 | - <task id="LOCAL-00001" summary="用户查询修改"> | |
217 | - <created>1565058322310</created> | |
367 | + <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口"> | |
368 | + <created>1565226427512</created> | |
218 | 369 | <option name="number" value="00001" /> |
219 | 370 | <option name="presentableId" value="LOCAL-00001" /> |
220 | 371 | <option name="project" value="LOCAL" /> |
221 | - <updated>1565058322310</updated> | |
372 | + <updated>1565226427512</updated> | |
222 | 373 | </task> |
223 | - <task id="LOCAL-00002" summary="库区设置编辑"> | |
224 | - <created>1565075790786</created> | |
374 | + <task id="LOCAL-00002" summary="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面"> | |
375 | + <created>1565256884822</created> | |
225 | 376 | <option name="number" value="00002" /> |
226 | 377 | <option name="presentableId" value="LOCAL-00002" /> |
227 | 378 | <option name="project" value="LOCAL" /> |
228 | - <updated>1565075790786</updated> | |
379 | + <updated>1565256884822</updated> | |
229 | 380 | </task> |
230 | - <task id="LOCAL-00003" summary="库区设置编辑"> | |
231 | - <created>1565075857018</created> | |
381 | + <task id="LOCAL-00003" summary="修改库区service"> | |
382 | + <created>1565259481656</created> | |
232 | 383 | <option name="number" value="00003" /> |
233 | 384 | <option name="presentableId" value="LOCAL-00003" /> |
234 | 385 | <option name="project" value="LOCAL" /> |
235 | - <updated>1565075857018</updated> | |
386 | + <updated>1565259481656</updated> | |
236 | 387 | </task> |
237 | - <task id="LOCAL-00004" summary="库区设置编辑"> | |
238 | - <created>1565075883212</created> | |
388 | + <task id="LOCAL-00004" summary="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml"> | |
389 | + <created>1565342188814</created> | |
239 | 390 | <option name="number" value="00004" /> |
240 | 391 | <option name="presentableId" value="LOCAL-00004" /> |
241 | 392 | <option name="project" value="LOCAL" /> |
242 | - <updated>1565075883212</updated> | |
243 | - </task> | |
244 | - <task id="LOCAL-00005" summary="库区设置编辑"> | |
245 | - <created>1565075915322</created> | |
246 | - <option name="number" value="00005" /> | |
247 | - <option name="presentableId" value="LOCAL-00005" /> | |
248 | - <option name="project" value="LOCAL" /> | |
249 | - <updated>1565075915322</updated> | |
393 | + <updated>1565342188814</updated> | |
250 | 394 | </task> |
251 | - <task id="LOCAL-00006" summary="回退"> | |
252 | - <created>1565081123490</created> | |
253 | - <option name="number" value="00006" /> | |
254 | - <option name="presentableId" value="LOCAL-00006" /> | |
255 | - <option name="project" value="LOCAL" /> | |
256 | - <updated>1565081123490</updated> | |
257 | - </task> | |
258 | - <task id="LOCAL-00007" summary="zone修改"> | |
259 | - <created>1565172969186</created> | |
260 | - <option name="number" value="00007" /> | |
261 | - <option name="presentableId" value="LOCAL-00007" /> | |
262 | - <option name="project" value="LOCAL" /> | |
263 | - <updated>1565172969186</updated> | |
264 | - </task> | |
265 | - <task id="LOCAL-00008" summary="回退"> | |
266 | - <created>1565332810976</created> | |
267 | - <option name="number" value="00008" /> | |
268 | - <option name="presentableId" value="LOCAL-00008" /> | |
269 | - <option name="project" value="LOCAL" /> | |
270 | - <updated>1565332810976</updated> | |
271 | - </task> | |
272 | - <task id="LOCAL-00009" summary="修改表格分页获取总记录数"> | |
273 | - <created>1565335994460</created> | |
274 | - <option name="number" value="00009" /> | |
275 | - <option name="presentableId" value="LOCAL-00009" /> | |
276 | - <option name="project" value="LOCAL" /> | |
277 | - <updated>1565335994460</updated> | |
278 | - </task> | |
279 | - <task id="LOCAL-00010" summary="git忽略"> | |
280 | - <created>1565336618584</created> | |
281 | - <option name="number" value="00010" /> | |
282 | - <option name="presentableId" value="LOCAL-00010" /> | |
283 | - <option name="project" value="LOCAL" /> | |
284 | - <updated>1565336618584</updated> | |
285 | - </task> | |
286 | - <option name="localTasksCounter" value="11" /> | |
395 | + <option name="localTasksCounter" value="5" /> | |
287 | 396 | <servers /> |
288 | 397 | </component> |
398 | + <component name="TimeTrackingManager"> | |
399 | + <option name="totallyTimeSpent" value="893000" /> | |
400 | + </component> | |
401 | + <component name="ToolWindowManager"> | |
402 | + <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> | |
403 | + <editor active="true" /> | |
404 | + <layout> | |
405 | + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2533512" /> | |
406 | + <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> | |
407 | + <window_info id="Designer" order="2" /> | |
408 | + <window_info id="Image Layers" order="3" /> | |
409 | + <window_info id="Capture Tool" order="4" /> | |
410 | + <window_info id="UI Designer" order="5" /> | |
411 | + <window_info id="Favorites" order="6" side_tool="true" /> | |
412 | + <window_info id="Web" order="7" side_tool="true" /> | |
413 | + <window_info anchor="bottom" id="Message" order="0" /> | |
414 | + <window_info anchor="bottom" id="Find" order="1" /> | |
415 | + <window_info anchor="bottom" id="Run" order="2" weight="0.25212464" /> | |
416 | + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> | |
417 | + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> | |
418 | + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> | |
419 | + <window_info anchor="bottom" id="TODO" order="6" weight="0.3286119" /> | |
420 | + <window_info anchor="bottom" id="Spring" order="7" weight="0.3286119" /> | |
421 | + <window_info anchor="bottom" id="Terminal" order="8" weight="0.3286119" /> | |
422 | + <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" /> | |
423 | + <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> | |
424 | + <window_info anchor="bottom" id="Messages" order="11" /> | |
425 | + <window_info anchor="bottom" id="Java Enterprise" order="12" weight="0.3286119" /> | |
426 | + <window_info anchor="bottom" id="Database Changes" order="13" weight="0.3286119" /> | |
427 | + <window_info active="true" anchor="bottom" id="Version Control" order="14" visible="true" weight="0.42351276" /> | |
428 | + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> | |
429 | + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> | |
430 | + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> | |
431 | + <window_info anchor="right" id="Maven" order="3" weight="0.3297587" /> | |
432 | + <window_info anchor="right" id="Palette" order="4" /> | |
433 | + <window_info anchor="right" id="Capture Analysis" order="5" /> | |
434 | + <window_info anchor="right" id="Database" order="6" /> | |
435 | + <window_info anchor="right" id="Palette	" order="7" /> | |
436 | + <window_info anchor="right" id="Theme Preview" order="8" /> | |
437 | + <window_info anchor="right" id="Bean Validation" order="9" /> | |
438 | + </layout> | |
439 | + </component> | |
289 | 440 | <component name="TypeScriptGeneratedFilesManager"> |
290 | 441 | <option name="version" value="1" /> |
291 | 442 | </component> |
... | ... | @@ -295,16 +446,11 @@ |
295 | 446 | <entry key="MAIN"> |
296 | 447 | <value> |
297 | 448 | <State> |
298 | - <option name="FILTERS"> | |
299 | - <map> | |
300 | - <entry key="branch"> | |
301 | - <value> | |
302 | - <list> | |
303 | - <option value="origin/develop" /> | |
304 | - </list> | |
305 | - </value> | |
306 | - </entry> | |
307 | - </map> | |
449 | + <option name="RECENTLY_FILTERED_USER_GROUPS"> | |
450 | + <collection /> | |
451 | + </option> | |
452 | + <option name="RECENTLY_FILTERED_BRANCH_GROUPS"> | |
453 | + <collection /> | |
308 | 454 | </option> |
309 | 455 | <option name="COLUMN_ORDER" /> |
310 | 456 | </State> |
... | ... | @@ -316,46 +462,22 @@ |
316 | 462 | <map> |
317 | 463 | <entry key="Branch"> |
318 | 464 | <value> |
319 | - <list> | |
320 | - <RecentGroup> | |
321 | - <option name="FILTER_VALUES"> | |
322 | - <option value="origin/develop" /> | |
323 | - </option> | |
324 | - </RecentGroup> | |
325 | - </list> | |
465 | + <list /> | |
466 | + </value> | |
467 | + </entry> | |
468 | + <entry key="User"> | |
469 | + <value> | |
470 | + <list /> | |
326 | 471 | </value> |
327 | 472 | </entry> |
328 | 473 | </map> |
329 | 474 | </option> |
330 | 475 | </component> |
331 | 476 | <component name="VcsManagerConfiguration"> |
332 | - <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" /> | |
333 | - <MESSAGE value="用户查询修改" /> | |
334 | - <MESSAGE value="库区设置编辑" /> | |
335 | - <MESSAGE value="zone修改" /> | |
336 | - <MESSAGE value="回退" /> | |
337 | - <MESSAGE value="修改表格分页获取总记录数" /> | |
338 | - <MESSAGE value="git忽略" /> | |
339 | - <option name="LAST_COMMIT_MESSAGE" value="git忽略" /> | |
340 | - </component> | |
341 | - <component name="XDebuggerManager"> | |
342 | - <breakpoint-manager> | |
343 | - <breakpoints> | |
344 | - <line-breakpoint enabled="true" type="java-line"> | |
345 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java</url> | |
346 | - <line>52</line> | |
347 | - <option name="timeStamp" value="11" /> | |
348 | - </line-breakpoint> | |
349 | - <line-breakpoint enabled="true" type="java-line"> | |
350 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/locationType/service/LocationTypeServiceImpl.java</url> | |
351 | - <line>21</line> | |
352 | - <option name="timeStamp" value="14" /> | |
353 | - </line-breakpoint> | |
354 | - </breakpoints> | |
355 | - </breakpoint-manager> | |
356 | - </component> | |
357 | - <component name="antWorkspaceConfiguration"> | |
358 | - <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> | |
359 | - <option name="FILTER_TARGETS" value="false" /> | |
477 | + <MESSAGE value="添加库位、库位类型增删改查接口" /> | |
478 | + <MESSAGE value="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面" /> | |
479 | + <MESSAGE value="修改库区service" /> | |
480 | + <MESSAGE value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml" /> | |
481 | + <option name="LAST_COMMIT_MESSAGE" value="Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop # Conflicts: #	.idea/workspace.xml" /> | |
360 | 482 | </component> |
361 | 483 | </project> |
362 | 484 | \ No newline at end of file |
... | ... |
src/main/java/com/huaheng/pc/config/containerType/controller/ContainerTypeController.java
0 → 100644
1 | +package com.huaheng.pc.config.containerType.controller; | |
2 | + | |
3 | +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |
4 | +import com.baomidou.mybatisplus.core.metadata.IPage; | |
5 | +import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |
6 | +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | |
7 | +import com.huaheng.common.support.Convert; | |
8 | +import com.huaheng.common.utils.StringUtils; | |
9 | +import com.huaheng.common.utils.security.ShiroUtils; | |
10 | +import com.huaheng.framework.aspectj.lang.annotation.Log; | |
11 | +import com.huaheng.framework.aspectj.lang.constant.BusinessType; | |
12 | +import com.huaheng.framework.web.controller.BaseController; | |
13 | +import com.huaheng.framework.web.domain.AjaxResult; | |
14 | +import com.huaheng.framework.web.page.PageDomain; | |
15 | +import com.huaheng.framework.web.page.TableDataInfo; | |
16 | +import com.huaheng.framework.web.page.TableSupport; | |
17 | +import com.huaheng.pc.config.containerType.domain.ContainerType; | |
18 | +import com.huaheng.pc.config.containerType.service.ContainerTypeService; | |
19 | +import org.apache.shiro.authz.annotation.RequiresPermissions; | |
20 | +import org.springframework.beans.factory.annotation.Autowired; | |
21 | +import org.springframework.stereotype.Controller; | |
22 | +import org.springframework.ui.ModelMap; | |
23 | +import org.springframework.web.bind.annotation.*; | |
24 | + | |
25 | +import java.util.List; | |
26 | + | |
27 | +/** | |
28 | + * 容器类型 信息操作处理 | |
29 | + * | |
30 | + * @author huaheng | |
31 | + * @date 2018-08-19 | |
32 | + */ | |
33 | +@Controller | |
34 | +@RequestMapping("/config/containerType") | |
35 | +public class ContainerTypeController extends BaseController | |
36 | +{ | |
37 | + private String prefix = "config/containerType"; | |
38 | + | |
39 | + @Autowired | |
40 | + private ContainerTypeService containerTypeService; | |
41 | + | |
42 | + @RequiresPermissions("config:containerType:view") | |
43 | + @GetMapping() | |
44 | + public String containerType() | |
45 | + { | |
46 | + return prefix + "/containerType"; | |
47 | + } | |
48 | + | |
49 | + /** | |
50 | + * 查询容器类型列表 | |
51 | + */ | |
52 | + @RequiresPermissions("config:containerType:list") | |
53 | + @Log(title = "配置-容器类型设置", operating = "查看容器类型", action = BusinessType.GRANT) | |
54 | + @PostMapping("/list") | |
55 | + @ResponseBody | |
56 | + public TableDataInfo list(ContainerType containerType,String createdBegin, String createdEnd) | |
57 | + { | |
58 | + LambdaQueryWrapper<ContainerType> lambdaQueryWrapper = Wrappers.lambdaQuery(); | |
59 | + PageDomain pageDomain = TableSupport.buildPageRequest(); | |
60 | + Integer pageNum = pageDomain.getPageNum(); | |
61 | + Integer pageSize = pageDomain.getPageSize(); | |
62 | + | |
63 | + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ContainerType::getCreated, createdBegin) | |
64 | + .le(StringUtils.isNotEmpty(createdEnd), ContainerType::getCreated, createdEnd) | |
65 | + .eq(ContainerType::getWarehouseCode,ShiroUtils.getWarehouseCode()) | |
66 | + .eq(StringUtils.isNotEmpty(containerType.getCode()),ContainerType::getCode,containerType.getCode()) | |
67 | + .like(StringUtils.isNotEmpty(containerType.getName()),ContainerType::getName,containerType.getName());; | |
68 | + | |
69 | + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){ | |
70 | + /** | |
71 | + * 使用分页查询 | |
72 | + */ | |
73 | + Page<ContainerType> page = new Page<>(pageNum, pageSize); | |
74 | + IPage<ContainerType> iPage = containerTypeService.page(page, lambdaQueryWrapper); | |
75 | + return getMpDataTable(iPage.getRecords(),iPage.getTotal()); | |
76 | + } else { | |
77 | + List<ContainerType> list = containerTypeService.list(lambdaQueryWrapper); | |
78 | + return getDataTable(list); | |
79 | + } | |
80 | + } | |
81 | + | |
82 | + /** | |
83 | + * 新增容器类型 | |
84 | + */ | |
85 | + @GetMapping("/add") | |
86 | + public String add() | |
87 | + { | |
88 | + return prefix + "/add"; | |
89 | + } | |
90 | + | |
91 | + /** | |
92 | + * 新增保存容器类型 | |
93 | + */ | |
94 | + @RequiresPermissions("config:containerType:add") | |
95 | + @Log(title = "配置-容器类型设置", operating = "新增容器类型", action = BusinessType.INSERT) | |
96 | + @PostMapping("/add") | |
97 | + @ResponseBody | |
98 | + public AjaxResult addSave(ContainerType containerType) | |
99 | + { | |
100 | + containerType.setWarehouseCode(ShiroUtils.getWarehouseCode()); | |
101 | + containerType.setCreatedBy(ShiroUtils.getLoginName()); | |
102 | + containerType.setLastUpdatedBy(ShiroUtils.getLoginName()); | |
103 | + return toAjax(containerTypeService.save(containerType)); | |
104 | + } | |
105 | + | |
106 | + /** | |
107 | + * 修改容器类型 | |
108 | + */ | |
109 | + @GetMapping("/edit/{id}") | |
110 | + public String edit(@PathVariable("id") Integer id, ModelMap mmap) | |
111 | + { | |
112 | + ContainerType containerType = containerTypeService.getById(id); | |
113 | + mmap.put("containerType", containerType); | |
114 | + return prefix + "/edit"; | |
115 | + } | |
116 | + | |
117 | + /** | |
118 | + * 修改保存容器类型 | |
119 | + */ | |
120 | + @RequiresPermissions("config:containerType:edit") | |
121 | + @Log(title = "配置-容器类型设置", operating = "修改容器类型", action = BusinessType.UPDATE) | |
122 | + @PostMapping("/edit") | |
123 | + @ResponseBody | |
124 | + public AjaxResult editSave(ContainerType containerType) | |
125 | + { | |
126 | + containerType.setLastUpdatedBy(ShiroUtils.getLoginName()); | |
127 | + return toAjax(containerTypeService.saveOrUpdate(containerType)); | |
128 | + } | |
129 | + | |
130 | + /** | |
131 | + * 删除容器类型 | |
132 | + */ | |
133 | + @RequiresPermissions("config:containerType:remove") | |
134 | + @Log(title = "配置-容器类型设置", operating = "删除容器类型", action = BusinessType.DELETE) | |
135 | + @PostMapping( "/remove") | |
136 | + @ResponseBody | |
137 | + public AjaxResult remove(String ids) | |
138 | + { | |
139 | + if (StringUtils.isEmpty(ids)) | |
140 | + return AjaxResult.error("id不能为空"); | |
141 | + for (Integer id : Convert.toIntArray(ids)) | |
142 | + { | |
143 | + containerTypeService.removeById(id); | |
144 | + } | |
145 | + return AjaxResult.success("删除成功!"); | |
146 | + } | |
147 | + | |
148 | +} | |
... | ... |
src/main/java/com/huaheng/pc/config/locationType/controller/LocationTypeController.java
1 | 1 | package com.huaheng.pc.config.locationType.controller; |
2 | 2 | |
3 | + | |
3 | 4 | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
4 | 5 | import com.baomidou.mybatisplus.core.metadata.IPage; |
5 | 6 | import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
... | ... | @@ -14,16 +15,16 @@ import com.huaheng.framework.web.domain.AjaxResult; |
14 | 15 | import com.huaheng.framework.web.page.PageDomain; |
15 | 16 | import com.huaheng.framework.web.page.TableDataInfo; |
16 | 17 | import com.huaheng.framework.web.page.TableSupport; |
17 | -import com.huaheng.pc.general.location.domain.Location; | |
18 | 18 | import com.huaheng.pc.config.locationType.domain.LocationType; |
19 | -import com.huaheng.pc.general.location.service.LocationService; | |
20 | 19 | import com.huaheng.pc.config.locationType.service.LocationTypeService; |
20 | +import com.huaheng.pc.general.location.domain.Location; | |
21 | +import com.huaheng.pc.general.location.service.LocationService; | |
21 | 22 | import org.apache.shiro.authz.annotation.RequiresPermissions; |
23 | +import org.springframework.beans.factory.annotation.Autowired; | |
22 | 24 | import org.springframework.stereotype.Controller; |
23 | 25 | import org.springframework.ui.ModelMap; |
24 | 26 | import org.springframework.web.bind.annotation.*; |
25 | 27 | |
26 | -import javax.annotation.Resource; | |
27 | 28 | import java.util.Arrays; |
28 | 29 | import java.util.List; |
29 | 30 | |
... | ... | @@ -33,15 +34,16 @@ public class LocationTypeController extends BaseController { |
33 | 34 | |
34 | 35 | private String prefix = "config/locationType"; |
35 | 36 | |
36 | - @Resource | |
37 | + @Autowired | |
37 | 38 | private LocationTypeService locationTypeService; |
38 | - @Resource | |
39 | + @Autowired | |
39 | 40 | private LocationService locationService; |
40 | 41 | |
41 | 42 | @RequestMapping("config:locationType:view") |
42 | - @GetMapping | |
43 | - public String locationType() { | |
44 | - return prefix + "/location"; | |
43 | + @GetMapping() | |
44 | + public String locationType() | |
45 | + { | |
46 | + return prefix + "/locationType"; | |
45 | 47 | } |
46 | 48 | |
47 | 49 | /** |
... | ... | @@ -51,13 +53,17 @@ public class LocationTypeController extends BaseController { |
51 | 53 | @Log(title = "通用-库位类型管理", operating = "查看库位类型列表", action = BusinessType.GRANT) |
52 | 54 | @PostMapping("/list") |
53 | 55 | @ResponseBody |
54 | - public TableDataInfo list(LocationType locationType) { | |
56 | + public TableDataInfo list(LocationType locationType,String createdBegin, String createdEnd) { | |
55 | 57 | LambdaQueryWrapper<LocationType> lambdaQueryWrapper = Wrappers.lambdaQuery(); |
56 | 58 | PageDomain pageDomain = TableSupport.buildPageRequest(); |
57 | 59 | Integer pageNum = pageDomain.getPageNum(); |
58 | 60 | Integer pageSize = pageDomain.getPageSize(); |
59 | 61 | |
60 | - lambdaQueryWrapper.eq(LocationType::getWarehouseCode,ShiroUtils.getWarehouseCode()); | |
62 | + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),LocationType::getCreated, createdBegin) | |
63 | + .le(StringUtils.isNotEmpty(createdEnd), LocationType::getCreated, createdEnd) | |
64 | + .eq(LocationType::getWarehouseCode, ShiroUtils.getWarehouseCode()) | |
65 | + .eq(StringUtils.isNotEmpty(locationType.getCode()),LocationType::getCode,locationType.getCode()) | |
66 | + .like(StringUtils.isNotEmpty(locationType.getName()),LocationType::getName,locationType.getName()); | |
61 | 67 | |
62 | 68 | if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){ |
63 | 69 | /** |
... | ... |
src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java
... | ... | @@ -56,6 +56,7 @@ public class ZoneController extends BaseController { |
56 | 56 | |
57 | 57 | lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),Zone::getCreated, createdBegin) |
58 | 58 | .le(StringUtils.isNotEmpty(createdEnd), Zone::getCreated, createdEnd) |
59 | + .eq(Zone::getWarehouseCode,ShiroUtils.getWarehouseCode()) | |
59 | 60 | .eq(StringUtils.isNotEmpty(zone.getCode()), Zone::getCode, zone.getCode()) |
60 | 61 | .like(StringUtils.isNotEmpty(zone.getName()), Zone::getName, zone.getName()) |
61 | 62 | .orderByAsc(Zone::getId); |
... | ... | @@ -66,7 +67,7 @@ public class ZoneController extends BaseController { |
66 | 67 | */ |
67 | 68 | Page<Zone> page = new Page<>(pageNum, pageSize); |
68 | 69 | IPage<Zone> iPage = zoneService.page(page, lambdaQueryWrapper); |
69 | - return getDataTable(iPage.getRecords()); | |
70 | + return getMpDataTable(iPage.getRecords(),iPage.getTotal()); | |
70 | 71 | } else { |
71 | 72 | List<Zone> list = zoneService.list(lambdaQueryWrapper); |
72 | 73 | return getDataTable(list); |
... | ... |
src/main/java/com/huaheng/pc/config/zoneCapacity/controller/ZoneCapacityController.java
... | ... | @@ -63,6 +63,7 @@ public class ZoneCapacityController extends BaseController |
63 | 63 | |
64 | 64 | lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ZoneCapacity::getCreated, createdBegin) |
65 | 65 | .le(StringUtils.isNotEmpty(createdEnd), ZoneCapacity::getCreated, createdEnd) |
66 | + .eq(ZoneCapacity::getWarehouseCode,ShiroUtils.getWarehouseCode()) | |
66 | 67 | .eq(StringUtils.isNotEmpty(zoneCapacity.getMaterialCode()), ZoneCapacity::getMaterialCode, zoneCapacity.getMaterialCode()) |
67 | 68 | .like(StringUtils.isNotEmpty(zoneCapacity.getMaterialName()), ZoneCapacity::getMaterialName, zoneCapacity.getMaterialName()) |
68 | 69 | .orderByAsc(ZoneCapacity::getId); |
... | ... | @@ -73,7 +74,7 @@ public class ZoneCapacityController extends BaseController |
73 | 74 | */ |
74 | 75 | Page<ZoneCapacity> page = new Page<>(pageNum, pageSize); |
75 | 76 | IPage<ZoneCapacity> iPage = zoneCapacityService.page(page, lambdaQueryWrapper); |
76 | - return getDataTable(iPage.getRecords()); | |
77 | + return getMpDataTable(iPage.getRecords(),iPage.getTotal()); | |
77 | 78 | } else { |
78 | 79 | List<ZoneCapacity> list = zoneCapacityService.list(lambdaQueryWrapper); |
79 | 80 | return getDataTable(list); |
... | ... |
src/main/resources/mybatis/general/CompanyMapper.xml
... | ... | @@ -54,7 +54,7 @@ |
54 | 54 | INNER JOIN warehouse_company wc ON wc.companyId=c.id AND wc.warehouseCode = #{warehouseCode} |
55 | 55 | </select> |
56 | 56 | <select id="selectByWarehouseCode" resultType="com.huaheng.pc.general.company.domain.Company"> |
57 | - select id from company INNER JOIN warehouse_company ON company.id = warehouse_company.companyId | |
57 | + select company.id from company INNER JOIN warehouse_company ON company.id = warehouse_company.companyId | |
58 | 58 | where company.warehouseCode = #{warehouseCode} |
59 | 59 | </select> |
60 | 60 | |
... | ... |
src/main/resources/templates/config/containerCapacity/containerCapacity.html
... | ... | @@ -26,9 +26,9 @@ |
26 | 26 | <!--</li>--> |
27 | 27 | <li class="time"> |
28 | 28 | <label>创建时间: </label> |
29 | - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/> | |
29 | + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/> | |
30 | 30 | <span>-</span> |
31 | - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/> | |
31 | + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/> | |
32 | 32 | </li> |
33 | 33 | <li> |
34 | 34 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
... | ... |
src/main/resources/templates/config/containerType/containerType.html
... | ... | @@ -10,7 +10,7 @@ |
10 | 10 | <div class="select-list"> |
11 | 11 | <ul> |
12 | 12 | <li> |
13 | - 编码:<input type="text" name="code"/> | |
13 | + 箱型:<input type="text" name="code"/> | |
14 | 14 | </li> |
15 | 15 | <li> |
16 | 16 | 名称:<input type="text" name="name"/> |
... | ... | @@ -23,9 +23,9 @@ |
23 | 23 | <!--</li>--> |
24 | 24 | <li class="time"> |
25 | 25 | <label>创建时间: </label> |
26 | - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/> | |
26 | + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/> | |
27 | 27 | <span>-</span> |
28 | - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/> | |
28 | + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/> | |
29 | 29 | </li> |
30 | 30 | <li> |
31 | 31 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
... | ... | @@ -73,16 +73,20 @@ |
73 | 73 | }, |
74 | 74 | { |
75 | 75 | field : 'code', |
76 | - title : '编码' | |
76 | + title : '箱型' | |
77 | 77 | }, |
78 | 78 | { |
79 | 79 | field : 'name', |
80 | 80 | title : '名称' |
81 | 81 | }, |
82 | 82 | { |
83 | - field : 'prefix', | |
84 | - title : '前缀' | |
83 | + field : 'warehouseCode', | |
84 | + title : '仓库编码' | |
85 | 85 | }, |
86 | + { | |
87 | + field : 'companyCode', | |
88 | + title : '货主编码' | |
89 | + }, | |
86 | 90 | { |
87 | 91 | field : 'emptyWeight', |
88 | 92 | title : '空箱重量kg' |
... | ... |
src/main/resources/templates/config/locationType/locationType.html
... | ... | @@ -23,9 +23,9 @@ |
23 | 23 | <!--</li>--> |
24 | 24 | <li class="time"> |
25 | 25 | <label>创建时间: </label> |
26 | - <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/> | |
26 | + <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/> | |
27 | 27 | <span>-</span> |
28 | - <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/> | |
28 | + <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/> | |
29 | 29 | </li> |
30 | 30 | <li> |
31 | 31 | <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a> |
... | ... |
src/main/resources/templates/system/user/edit.html
... | ... | @@ -62,7 +62,7 @@ |
62 | 62 | <label class="col-sm-3 control-label">货主:</label> |
63 | 63 | <div class="col-sm-8"> |
64 | 64 | <label th:each="company:${companys}" class="checkbox-inline i-checks"> |
65 | - <input name="company" type="checkbox" th:value="${company.id}" th:text=" ${company.name}" th:checked="${company.flag}" th:disabled="${company.enable == false}"> | |
65 | + <input name="company" type="checkbox" th:value="${company.id}" th:text=" ${company.name}" th:checked="${company.flag}" > | |
66 | 66 | </label> |
67 | 67 | </div> |
68 | 68 | </div> |
... | ... |