wms / wms_xiaogangabu · Commits

Commit 45137afddcebaeb1339b3cd17da329185cb51624

Authored by pengcheng
2 parents f2ae016c c0d2a7fa
develop ... test

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

# Conflicts:
#	src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
Inline Side-by-side
Showing 165 changed files with 4330 additions and 2815 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 83 of 165 files are displayed.

.idea/MyBatisCodeHelperDatasource.xml
  View file @45137af
... ... @@ -6,9 +6,9 @@
6 6 <option name="addSerializeUid" value="true" />
7 7 <option name="generateService" value="true" />
8 8 <option name="generateServiceInterface" value="true" />
9   - <option name="javaMapperPackage" value="com.huaheng.pc.config.warehouseConfig.mapper" />
  9 + <option name="javaMapperPackage" value="com.huaheng.pc.inventory.inventoryDetail.mapper" />
10 10 <option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" />
11   - <option name="javaModelPackage" value="com.huaheng.pc.config.warehouseConfig.domain" />
  11 + <option name="javaModelPackage" value="com.huaheng.pc.inventory.inventoryDetail.domain" />
12 12 <option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" />
13 13 <option name="lastDatabaseCrudChooseModuleName" value="huaheng" />
14 14 <option name="moduleNameToPackageAndPathMap">
... ... @@ -30,15 +30,15 @@
30 30 <entry key="huaheng">
31 31 <value>
32 32 <UserPackageAndPathInfoByModule>
33   - <option name="javaMapperPackage" value="com.huaheng.pc.config.warehouseConfig.mapper" />
  33 + <option name="javaMapperPackage" value="com.huaheng.pc.inventory.inventoryDetail.mapper" />
34 34 <option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" />
35   - <option name="javaModelPacakge" value="com.huaheng.pc.config.warehouseConfig.domain" />
  35 + <option name="javaModelPacakge" value="com.huaheng.pc.inventory.inventoryDetail.domain" />
36 36 <option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" />
37   - <option name="javaServiceInterfacePackage" value="com.huaheng.pc.config.warehouseConfig.service" />
  37 + <option name="javaServiceInterfacePackage" value="com.huaheng.pc.inventory.inventoryDetail.service" />
38 38 <option name="javaServiceInterfacePath" value="$PROJECT_DIR$/src/main/java" />
39   - <option name="javaServicePackage" value="com.huaheng.pc.config.warehouseConfig.service" />
  39 + <option name="javaServicePackage" value="com.huaheng.pc.inventory.inventoryDetail.service" />
40 40 <option name="javaServicePath" value="$PROJECT_DIR$/src/main/java" />
41   - <option name="xmlPackage" value="config" />
  41 + <option name="xmlPackage" value="inventory" />
42 42 <option name="xmlPath" value="E:\code\wms2\src\main\resources\mybatis" />
43 43 </UserPackageAndPathInfoByModule>
44 44 </value>
... ... @@ -138,6 +138,26 @@
138 138 </TableGenerateConfig>
139 139 </value>
140 140 </entry>
  141 + <entry key="wms_v2:inventory_detail">
  142 + <value>
  143 + <TableGenerateConfig>
  144 + <option name="generatedKey" value="id" />
  145 + <option name="javaModelName" value="InventoryDetail" />
  146 + <option name="moduleName" value="huaheng" />
  147 + <option name="useActualColumnName" value="true" />
  148 + </TableGenerateConfig>
  149 + </value>
  150 + </entry>
  151 + <entry key="wms_v2:inventory_header">
  152 + <value>
  153 + <TableGenerateConfig>
  154 + <option name="generatedKey" value="id" />
  155 + <option name="javaModelName" value="InventoryHeader" />
  156 + <option name="moduleName" value="huaheng" />
  157 + <option name="useActualColumnName" value="true" />
  158 + </TableGenerateConfig>
  159 + </value>
  160 + </entry>
141 161 <entry key="wms_v2:inventory_transaction">
142 162 <value>
143 163 <TableGenerateConfig>
... ... @@ -178,12 +198,22 @@
178 198 </TableGenerateConfig>
179 199 </value>
180 200 </entry>
  201 + <entry key="wms_v2:material_multiple">
  202 + <value>
  203 + <TableGenerateConfig>
  204 + <option name="generatedKey" value="id" />
  205 + <option name="javaModelName" value="MaterialMultiple" />
  206 + <option name="moduleName" value="huaheng" />
  207 + <option name="useActualColumnName" value="true" />
  208 + </TableGenerateConfig>
  209 + </value>
  210 + </entry>
181 211 <entry key="wms_v2:material_unit">
182 212 <value>
183 213 <TableGenerateConfig>
184 214 <option name="generatedKey" value="id" />
185 215 <option name="javaModelName" value="MaterialUnit" />
186   - <option name="moduleName" value="WMSV1" />
  216 + <option name="moduleName" value="huaheng" />
187 217 <option name="useActualColumnName" value="true" />
188 218 </TableGenerateConfig>
189 219 </value>
... ... @@ -374,7 +404,7 @@
374 404 <option name="useLomBokOnModel" value="true" />
375 405 <option name="useSwagger" value="true" />
376 406 <option name="userMybatisPlus" value="true" />
377   - <option name="xmlMapperPackage" value="config" />
  407 + <option name="xmlMapperPackage" value="inventory" />
378 408 <option name="xmlMapperPath" value="E:\code\wms2\src\main\resources\mybatis" />
379 409 </ProjectProfile>
380 410 </option>
... ...
.idea/compiler.xml
  View file @45137af
... ... @@ -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="huaheng" />
10 9 <module name="wms2" />
  10 + <module name="huaheng" />
11 11 </profile>
12 12 </annotationProcessing>
13 13 </component>
... ...
.idea/workspace.xml
  View file @45137af
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
5   - <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html" afterDir="false" />
  4 + <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="">
6 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
7   - <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
8 6 <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" afterDir="false" />
9   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" afterDir="false" />
10 7 <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" afterDir="false" />
11 9 <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" afterDir="false" />
12 10 <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" afterDir="false" />
13 11 </list>
... ... @@ -48,43 +46,31 @@
48 46 </expand>
49 47 <select />
50 48 </component>
51   - <component name="FavoritesManager">
52   - <favorites_list name="wms2" />
53   - </component>
54 49 <component name="FileEditorManager">
55   - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
56   - <file pinned="false" current-in-tab="true">
57   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
58   - <provider selected="true" editor-type-id="text-editor">
59   - <state relative-caret-position="79">
60   - <caret line="72" column="28" selection-start-line="72" selection-start-column="28" selection-end-line="72" selection-end-column="28" />
61   - </state>
62   - </provider>
63   - </entry>
64   - </file>
  50 + <leaf>
65 51 <file pinned="false" current-in-tab="false">
66   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java">
  52 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
67 53 <provider selected="true" editor-type-id="text-editor">
68   - <state relative-caret-position="80">
69   - <caret line="5" column="49" selection-start-line="5" selection-start-column="49" selection-end-line="5" selection-end-column="49" />
  54 + <state relative-caret-position="51">
  55 + <caret line="72" selection-start-line="72" selection-end-line="72" />
70 56 </state>
71 57 </provider>
72 58 </entry>
73 59 </file>
74 60 <file pinned="false" current-in-tab="false">
75   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml">
  61 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
76 62 <provider selected="true" editor-type-id="text-editor">
77   - <state relative-caret-position="315">
78   - <caret line="32" column="30" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="30" />
  63 + <state relative-caret-position="234">
  64 + <caret line="78" column="44" selection-start-line="78" selection-start-column="44" selection-end-line="78" selection-end-column="44" />
79 65 </state>
80 66 </provider>
81 67 </entry>
82 68 </file>
83   - <file pinned="false" current-in-tab="false">
84   - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.class">
  69 + <file pinned="false" current-in-tab="true">
  70 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
85 71 <provider selected="true" editor-type-id="text-editor">
86   - <state relative-caret-position="116">
87   - <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
  72 + <state relative-caret-position="328">
  73 + <caret line="92" column="18" lean-forward="true" selection-start-line="92" selection-start-column="18" selection-end-line="92" selection-end-column="18" />
88 74 </state>
89 75 </provider>
90 76 </entry>
... ... @@ -92,43 +78,8 @@
92 78 <file pinned="false" current-in-tab="false">
93 79 <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
94 80 <provider selected="true" editor-type-id="text-editor">
95   - <state relative-caret-position="499">
96   - <caret line="125" column="44" selection-start-line="125" selection-start-column="33" selection-end-line="125" selection-end-column="44" />
97   - <folding>
98   - <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
99   - </folding>
100   - </state>
101   - </provider>
102   - </entry>
103   - </file>
104   - <file pinned="false" current-in-tab="false">
105   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java">
106   - <provider selected="true" editor-type-id="text-editor">
107   - <state relative-caret-position="-668">
108   - <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
109   - </state>
110   - </provider>
111   - </entry>
112   - </file>
113   - <file pinned="false" current-in-tab="false">
114   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html">
115   - <provider selected="true" editor-type-id="text-editor">
116   - <state relative-caret-position="94">
117   - <caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" />
118   - <folding>
119   - <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
120   - <element signature="e#2365#2371#0" expanded="true" />
121   - <element signature="e#3190#7361#0" />
122   - </folding>
123   - </state>
124   - </provider>
125   - </entry>
126   - </file>
127   - <file pinned="false" current-in-tab="false">
128   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
129   - <provider selected="true" editor-type-id="text-editor">
130   - <state>
131   - <caret column="28" selection-start-column="28" selection-end-column="28" />
  81 + <state relative-caret-position="252">
  82 + <caret line="99" column="33" selection-start-line="99" selection-start-column="33" selection-end-line="99" selection-end-column="33" />
132 83 </state>
133 84 </provider>
134 85 </entry>
... ... @@ -140,14 +91,14 @@
140 91 <list>
141 92 <option value="FxmlFile" />
142 93 <option value="Interface" />
143   - <option value="Class" />
144 94 <option value="HTML File" />
  95 + <option value="Class" />
145 96 </list>
146 97 </option>
147 98 </component>
148 99 <component name="FindInProjectRecents">
149 100 <findStrings>
150   - <find>detail</find>
  101 + <find>configuration</find>
151 102 </findStrings>
152 103 </component>
153 104 <component name="Git.Settings">
... ... @@ -157,19 +108,28 @@
157 108 <entry key="$PROJECT_DIR$" value="master" />
158 109 </map>
159 110 </option>
  111 + <option name="RESET_MODE" value="HARD" />
160 112 </component>
161 113 <component name="IdeDocumentHistory">
162 114 <option name="CHANGED_PATHS">
163 115 <list>
  116 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" />
  117 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" />
  118 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" />
  119 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" />
  120 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java" />
  121 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java" />
  122 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java" />
  123 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java" />
  124 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java" />
164 125 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" />
165   - <option value="$PROJECT_DIR$/README.md" />
166   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/cyclecountAdjust.html" />
  126 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java" />
  127 + <option value="$PROJECT_DIR$/pom.xml" />
  128 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java" />
  129 + <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" />
  130 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" />
167 131 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" />
168   - <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html" />
169 132 <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" />
170   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" />
171   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" />
172   - <option value="$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml" />
173 133 </list>
174 134 </option>
175 135 </component>
... ... @@ -180,18 +140,11 @@
180 140 </set>
181 141 </option>
182 142 </component>
183   - <component name="MavenImportPreferences">
184   - <option name="importingSettings">
185   - <MavenImportingSettings>
186   - <option name="importAutomatically" value="true" />
187   - </MavenImportingSettings>
188   - </option>
189   - </component>
190 143 <component name="ProjectFrameBounds" extendedState="6">
191   - <option name="x" value="-10" />
192   - <option name="y" value="-10" />
193   - <option name="width" value="1939" />
194   - <option name="height" value="1049" />
  144 + <option name="x" value="-9" />
  145 + <option name="y" value="-9" />
  146 + <option name="width" value="1938" />
  147 + <option name="height" value="1048" />
195 148 </component>
196 149 <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
197 150 <component name="ProjectLevelVcsManager">
... ... @@ -202,8 +155,8 @@
202 155 <foldersAlwaysOnTop value="true" />
203 156 </navigator>
204 157 <panes>
205   - <pane id="Scope" />
206 158 <pane id="PackagesPane" />
  159 + <pane id="Scope" />
207 160 <pane id="ProjectPane">
208 161 <subPane>
209 162 <expand>
... ... @@ -302,7 +255,8 @@
302 255 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
303 256 <item name="pc" type="462c0819:PsiDirectoryNode" />
304 257 <item name="inventory" type="462c0819:PsiDirectoryNode" />
305   - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  258 + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
  259 + <item name="domain" type="462c0819:PsiDirectoryNode" />
306 260 </path>
307 261 <path>
308 262 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -314,8 +268,8 @@
314 268 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
315 269 <item name="pc" type="462c0819:PsiDirectoryNode" />
316 270 <item name="inventory" type="462c0819:PsiDirectoryNode" />
317   - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
318   - <item name="controller" type="462c0819:PsiDirectoryNode" />
  271 + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
  272 + <item name="service" type="462c0819:PsiDirectoryNode" />
319 273 </path>
320 274 <path>
321 275 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -328,7 +282,6 @@
328 282 <item name="pc" type="462c0819:PsiDirectoryNode" />
329 283 <item name="inventory" type="462c0819:PsiDirectoryNode" />
330 284 <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
331   - <item name="domain" type="462c0819:PsiDirectoryNode" />
332 285 </path>
333 286 <path>
334 287 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -341,30 +294,7 @@
341 294 <item name="pc" type="462c0819:PsiDirectoryNode" />
342 295 <item name="inventory" type="462c0819:PsiDirectoryNode" />
343 296 <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
344   - <item name="mapper" type="462c0819:PsiDirectoryNode" />
345   - </path>
346   - <path>
347   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
348   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
349   - <item name="src" type="462c0819:PsiDirectoryNode" />
350   - <item name="main" type="462c0819:PsiDirectoryNode" />
351   - <item name="java" type="462c0819:PsiDirectoryNode" />
352   - <item name="com" type="462c0819:PsiDirectoryNode" />
353   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
354   - <item name="pc" type="462c0819:PsiDirectoryNode" />
355   - <item name="shipment" type="462c0819:PsiDirectoryNode" />
356   - </path>
357   - <path>
358   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
359   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
360   - <item name="src" type="462c0819:PsiDirectoryNode" />
361   - <item name="main" type="462c0819:PsiDirectoryNode" />
362   - <item name="java" type="462c0819:PsiDirectoryNode" />
363   - <item name="com" type="462c0819:PsiDirectoryNode" />
364   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
365   - <item name="pc" type="462c0819:PsiDirectoryNode" />
366   - <item name="shipment" type="462c0819:PsiDirectoryNode" />
367   - <item name="shipmentHeader" type="462c0819:PsiDirectoryNode" />
  297 + <item name="controller" type="462c0819:PsiDirectoryNode" />
368 298 </path>
369 299 <path>
370 300 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -375,8 +305,8 @@
375 305 <item name="com" type="462c0819:PsiDirectoryNode" />
376 306 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
377 307 <item name="pc" type="462c0819:PsiDirectoryNode" />
378   - <item name="shipment" type="462c0819:PsiDirectoryNode" />
379   - <item name="shipmentHeader" type="462c0819:PsiDirectoryNode" />
  308 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  309 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
380 310 <item name="domain" type="462c0819:PsiDirectoryNode" />
381 311 </path>
382 312 <path>
... ... @@ -388,8 +318,9 @@
388 318 <item name="com" type="462c0819:PsiDirectoryNode" />
389 319 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
390 320 <item name="pc" type="462c0819:PsiDirectoryNode" />
391   - <item name="shipment" type="462c0819:PsiDirectoryNode" />
392   - <item name="shippingCombination" type="462c0819:PsiDirectoryNode" />
  321 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  322 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  323 + <item name="mapper" type="462c0819:PsiDirectoryNode" />
393 324 </path>
394 325 <path>
395 326 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -400,9 +331,9 @@
400 331 <item name="com" type="462c0819:PsiDirectoryNode" />
401 332 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
402 333 <item name="pc" type="462c0819:PsiDirectoryNode" />
403   - <item name="shipment" type="462c0819:PsiDirectoryNode" />
404   - <item name="shippingCombination" type="462c0819:PsiDirectoryNode" />
405   - <item name="controller" type="462c0819:PsiDirectoryNode" />
  334 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  335 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  336 + <item name="service" type="462c0819:PsiDirectoryNode" />
406 337 </path>
407 338 <path>
408 339 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -413,9 +344,7 @@
413 344 <item name="com" type="462c0819:PsiDirectoryNode" />
414 345 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
415 346 <item name="pc" type="462c0819:PsiDirectoryNode" />
416   - <item name="shipment" type="462c0819:PsiDirectoryNode" />
417   - <item name="shippingCombination" type="462c0819:PsiDirectoryNode" />
418   - <item name="service" type="462c0819:PsiDirectoryNode" />
  347 + <item name="system" type="462c0819:PsiDirectoryNode" />
419 348 </path>
420 349 <path>
421 350 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -449,7 +378,7 @@
449 378 <item name="resources" type="462c0819:PsiDirectoryNode" />
450 379 <item name="templates" type="462c0819:PsiDirectoryNode" />
451 380 <item name="inventory" type="462c0819:PsiDirectoryNode" />
452   - <item name="cyclecountAdjust" type="462c0819:PsiDirectoryNode" />
  381 + <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
453 382 </path>
454 383 <path>
455 384 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -461,45 +390,6 @@
461 390 <item name="inventory" type="462c0819:PsiDirectoryNode" />
462 391 <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
463 392 </path>
464   - <path>
465   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
466   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
467   - <item name="src" type="462c0819:PsiDirectoryNode" />
468   - <item name="main" type="462c0819:PsiDirectoryNode" />
469   - <item name="resources" type="462c0819:PsiDirectoryNode" />
470   - <item name="templates" type="462c0819:PsiDirectoryNode" />
471   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
472   - <item name="invetoryDetail" type="462c0819:PsiDirectoryNode" />
473   - </path>
474   - <path>
475   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
476   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
477   - <item name="src" type="462c0819:PsiDirectoryNode" />
478   - <item name="main" type="462c0819:PsiDirectoryNode" />
479   - <item name="resources" type="462c0819:PsiDirectoryNode" />
480   - <item name="templates" type="462c0819:PsiDirectoryNode" />
481   - <item name="receipt" type="462c0819:PsiDirectoryNode" />
482   - </path>
483   - <path>
484   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
485   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
486   - <item name="src" type="462c0819:PsiDirectoryNode" />
487   - <item name="main" type="462c0819:PsiDirectoryNode" />
488   - <item name="resources" type="462c0819:PsiDirectoryNode" />
489   - <item name="templates" type="462c0819:PsiDirectoryNode" />
490   - <item name="receipt" type="462c0819:PsiDirectoryNode" />
491   - <item name="receiptContainerDetail" type="462c0819:PsiDirectoryNode" />
492   - </path>
493   - <path>
494   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
495   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
496   - <item name="src" type="462c0819:PsiDirectoryNode" />
497   - <item name="main" type="462c0819:PsiDirectoryNode" />
498   - <item name="resources" type="462c0819:PsiDirectoryNode" />
499   - <item name="templates" type="462c0819:PsiDirectoryNode" />
500   - <item name="receipt" type="462c0819:PsiDirectoryNode" />
501   - <item name="receiptHeader" type="462c0819:PsiDirectoryNode" />
502   - </path>
503 393 </expand>
504 394 <select />
505 395 </subPane>
... ... @@ -518,7 +408,7 @@
518 408 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
519 409 <property name="WebServerToolWindowFactoryState" value="false" />
520 410 <property name="aspect.path.notification.shown" value="true" />
521   - <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail" />
  411 + <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis/config" />
522 412 <property name="node.js.detected.package.eslint" value="true" />
523 413 <property name="node.js.detected.package.tslint" value="true" />
524 414 <property name="node.js.path.for.package.eslint" value="project" />
... ... @@ -529,21 +419,21 @@
529 419 <property name="project.structure.last.edited" value="Project" />
530 420 <property name="project.structure.proportion" value="0.0" />
531 421 <property name="project.structure.side.proportion" value="0.0" />
532   - <property name="settings.editor.selected.configurable" value="File.Encoding" />
  422 + <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
533 423 </component>
534 424 <component name="RecentsManager">
535   - <key name="CopyFile.RECENT_KEYS">
536   - <recent name="C:\Project\wms2\src\main\resources\templates\inventory\invetoryDetail" />
537   - <recent name="C:\Project\wms2\src\main\resources\templates\inventory\inventoryHeader" />
538   - <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
539   - <recent name="E:\code\wms2\src\main\java\com\huaheng\pc\config" />
540   - <recent name="E:\code\wms2\src\main\resources\static\ajax\libs\layui\lay\modules" />
541   - </key>
542 425 <key name="MoveFile.RECENT_KEYS">
543 426 <recent name="E:\code\wms2\src\main\resources\templates\general\carrier" />
544 427 <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
545 428 <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
546 429 </key>
  430 + <key name="CopyFile.RECENT_KEYS">
  431 + <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
  432 + <recent name="E:\code\wms2\src\main\java\com\huaheng\pc\config" />
  433 + <recent name="E:\code\wms2\src\main\resources\static\ajax\libs\layui\lay\modules" />
  434 + <recent name="E:\code\wms2\target\classes\static\file" />
  435 + <recent name="E:\code\wms2\src\main\resources\static\file" />
  436 + </key>
547 437 </component>
548 438 <component name="RunDashboard">
549 439 <option name="configurationTypes">
... ... @@ -561,13 +451,14 @@
561 451 </RuleState>
562 452 </list>
563 453 </option>
564   - <option name="contentProportion" value="0.08743169" />
  454 + <option name="contentProportion" value="0.052489176" />
565 455 </component>
566 456 <component name="RunManager">
567 457 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
568 458 <module name="wms2" />
569 459 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
570   - <option name="ALTERNATIVE_JRE_PATH" />
  460 + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
  461 + <option name="ALTERNATIVE_JRE_PATH" value="C:\Program Files\Java\jdk1.8.0_202\jre" />
571 462 <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
572 463 <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
573 464 <method v="2">
... ... @@ -591,11 +482,7 @@
591 482 <expand>
592 483 <path>
593 484 <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
594   - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@5ef312b7" type="7427dc5b:ServiceModel$ServiceGroupNode" />
595   - </path>
596   - <path>
597   - <item name="services root" type="e789fda9:ObjectUtils$Sentinel" />
598   - <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@28150ae" type="7427dc5b:ServiceModel$ServiceGroupNode" />
  485 + <item name="com.intellij.execution.services.ServiceModel$ServiceGroupNode@dbb4d4b" type="7427dc5b:ServiceModel$ServiceGroupNode" />
599 486 </path>
600 487 </expand>
601 488 <select />
... ... @@ -636,6 +523,9 @@
636 523 <workItem from="1565832950552" duration="86000" />
637 524 <workItem from="1565833039573" duration="288000" />
638 525 <workItem from="1565833342181" duration="13946000" />
  526 + <workItem from="1565936336169" duration="3845000" />
  527 + <workItem from="1565941296716" duration="6217000" />
  528 + <workItem from="1566175534262" duration="11146000" />
639 529 </task>
640 530 <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
641 531 <created>1565226427512</created>
... ... @@ -728,10 +618,17 @@
728 618 <option name="project" value="LOCAL" />
729 619 <updated>1565833218584</updated>
730 620 </task>
731   - <option name="localTasksCounter" value="14" />
  621 + <task id="LOCAL-00014" summary="添加仓库配置">
  622 + <created>1566176469173</created>
  623 + <option name="number" value="00014" />
  624 + <option name="presentableId" value="LOCAL-00014" />
  625 + <option name="project" value="LOCAL" />
  626 + <updated>1566176469173</updated>
  627 + </task>
  628 + <option name="localTasksCounter" value="15" />
732 629 <servers />
733 630 </component>
734   - <component name="TodoView" selected-index="1">
  631 + <component name="TodoView">
735 632 <todo-panel id="selected-file">
736 633 <is-autoscroll-to-source value="true" />
737 634 </todo-panel>
... ... @@ -744,7 +641,7 @@
744 641 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
745 642 <editor active="true" />
746 643 <layout>
747   - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.23793566" />
  644 + <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.31434315" />
748 645 <window_info id="Structure" order="1" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
749 646 <window_info id="Web" order="2" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
750 647 <window_info id="Designer" order="3" />
... ... @@ -756,15 +653,15 @@
756 653 <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
757 654 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
758 655 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
759   - <window_info anchor="bottom" id="TODO" order="6" weight="0.3286119" />
  656 + <window_info anchor="bottom" id="TODO" order="6" weight="0.3275488" />
760 657 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
761   - <window_info anchor="bottom" id="Version Control" order="8" weight="0.592068" />
762   - <window_info active="true" anchor="bottom" id="Run Dashboard" order="9" visible="true" weight="0.4022663" />
  658 + <window_info anchor="bottom" id="Version Control" order="8" weight="0.43342775" />
  659 + <window_info anchor="bottom" id="Run Dashboard" order="9" visible="true" weight="0.12747875" />
763 660 <window_info anchor="bottom" id="Spring" order="10" weight="0.3286119" />
764   - <window_info anchor="bottom" id="Database Changes" order="11" weight="0.3286119" />
  661 + <window_info anchor="bottom" id="Database Changes" order="11" weight="0.3275488" />
765 662 <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
766   - <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.3286119" />
767   - <window_info anchor="bottom" id="Messages" order="14" weight="0.43909347" />
  663 + <window_info anchor="bottom" id="Java Enterprise" order="13" weight="0.3275488" />
  664 + <window_info anchor="bottom" id="Messages" order="14" weight="0.3186969" />
768 665 <window_info anchor="bottom" id="MyBatis Log" order="15" />
769 666 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
770 667 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
... ... @@ -833,241 +730,233 @@
833 730 <MESSAGE value="添加商品、商品详情页面" />
834 731 <MESSAGE value="添加承运商" />
835 732 <MESSAGE value="添加物料导入、导出模板，添加Excel导入导出配置文件" />
836   - <option name="LAST_COMMIT_MESSAGE" value="添加物料导入、导出模板，添加Excel导入导出配置文件" />
  733 + <MESSAGE value="添加仓库配置" />
  734 + <MESSAGE value="代码错误，库存导包" />
  735 + <MESSAGE value="代码错误，导包" />
  736 + <option name="LAST_COMMIT_MESSAGE" value="代码错误，导包" />
837 737 </component>
838 738 <component name="XDebuggerManager">
839 739 <breakpoint-manager>
840 740 <breakpoints>
841 741 <line-breakpoint enabled="true" type="java-line">
842   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url>
843   - <line>198</line>
844   - <properties />
845   - <option name="timeStamp" value="11" />
846   - </line-breakpoint>
847   - <line-breakpoint enabled="true" type="java-line">
848 742 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/poi/ExcelUtil.java</url>
849 743 <line>302</line>
850 744 <properties />
851 745 <option name="timeStamp" value="12" />
852 746 </line-breakpoint>
853 747 <line-breakpoint enabled="true" type="java-line">
854   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java</url>
855   - <line>187</line>
856   - <properties />
857   - <option name="timeStamp" value="16" />
858   - </line-breakpoint>
859   - <line-breakpoint enabled="true" type="java-line">
860 748 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java</url>
861 749 <line>66</line>
862 750 <properties />
863 751 <option name="timeStamp" value="24" />
864 752 </line-breakpoint>
  753 + <line-breakpoint enabled="true" type="java-line">
  754 + <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/controllerAdvice/MyControllerAdvice.java</url>
  755 + <line>26</line>
  756 + <properties />
  757 + <option name="timeStamp" value="25" />
  758 + </line-breakpoint>
865 759 </breakpoints>
866 760 </breakpoint-manager>
  761 + <watches-manager>
  762 + <configuration name="SpringBootApplicationConfigurationType">
  763 + <watch expression="receiptTotal" />
  764 + <watch expression="this.h" custom="java.lang.reflect.Proxy" />
  765 + <watch expression="((MybatisMapperProxy)this.h).methodCache" custom="java.lang.reflect.Proxy,com.baomidou.mybatisplus.core.override.MybatisMapperProxy" />
  766 + </configuration>
  767 + </watches-manager>
867 768 </component>
868 769 <component name="editorHistoryManager">
869   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java">
  770 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java">
870 771 <provider selected="true" editor-type-id="text-editor">
871   - <state relative-caret-position="-356">
872   - <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" />
  772 + <state relative-caret-position="100">
  773 + <caret line="8" column="91" lean-forward="true" selection-start-line="8" selection-start-column="91" selection-end-line="8" selection-end-column="91" />
873 774 </state>
874 775 </provider>
875 776 </entry>
876   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentCombinationModel.java">
  777 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java">
877 778 <provider selected="true" editor-type-id="text-editor">
878   - <state relative-caret-position="68">
879   - <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
  779 + <state relative-caret-position="100">
  780 + <caret line="8" column="94" selection-start-line="8" selection-start-column="94" selection-end-line="8" selection-end-column="94" />
880 781 </state>
881 782 </provider>
882 783 </entry>
883   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java">
  784 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java">
884 785 <provider selected="true" editor-type-id="text-editor">
885   - <state relative-caret-position="202">
886   - <caret line="76" column="16" lean-forward="true" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" />
  786 + <state relative-caret-position="100">
  787 + <caret line="7" column="66" selection-start-line="7" selection-start-column="66" selection-end-line="7" selection-end-column="66" />
887 788 </state>
888 789 </provider>
889 790 </entry>
890   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java">
  791 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java">
  792 + <provider selected="true" editor-type-id="text-editor">
  793 + <state relative-caret-position="100">
  794 + <caret line="5" column="67" lean-forward="true" selection-start-line="5" selection-start-column="67" selection-end-line="5" selection-end-column="67" />
  795 + <folding>
  796 + <element signature="imports" expanded="true" />
  797 + </folding>
  798 + </state>
  799 + </provider>
  800 + </entry>
  801 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/mapper/ShippingCombinationMapper.java">
891 802 <provider selected="true" editor-type-id="text-editor">
892   - <state relative-caret-position="1156">
893   - <caret line="81" column="11" lean-forward="true" selection-start-line="81" selection-start-column="11" selection-end-line="81" selection-end-column="11" />
  803 + <state relative-caret-position="140">
  804 + <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
894 805 </state>
895 806 </provider>
896 807 </entry>
897   - <entry file="file://$PROJECT_DIR$/README.md">
898   - <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
899   - <state split_layout="SPLIT">
900   - <first_editor relative-caret-position="40">
901   - <caret line="2" column="9" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="9" />
902   - </first_editor>
903   - <second_editor />
  808 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java">
  809 + <provider selected="true" editor-type-id="text-editor">
  810 + <state relative-caret-position="300">
  811 + <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
904 812 </state>
905 813 </provider>
906 814 </entry>
907   - <entry file="file://$PROJECT_DIR$/pom.xml">
908   - <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
  815 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java">
909 816 <provider selected="true" editor-type-id="text-editor">
910   - <state relative-caret-position="-232">
911   - <caret line="73" column="33" selection-start-line="73" selection-start-column="33" selection-end-line="73" selection-end-column="33" />
  817 + <state relative-caret-position="120">
  818 + <caret line="88" column="70" selection-start-line="88" selection-start-column="70" selection-end-line="88" selection-end-column="70" />
912 819 </state>
913 820 </provider>
914 821 </entry>
915   - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/2.1.3.RELEASE/spring-boot-autoconfigure-2.1.3.RELEASE.jar!/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.class">
  822 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java">
916 823 <provider selected="true" editor-type-id="text-editor">
917   - <state relative-caret-position="44">
918   - <caret line="250" column="44" selection-start-line="250" selection-start-column="44" selection-end-line="250" selection-end-column="44" />
  824 + <state relative-caret-position="128">
  825 + <caret line="106" column="27" selection-start-line="106" selection-start-column="27" selection-end-line="106" selection-end-column="27" />
919 826 </state>
920 827 </provider>
921 828 </entry>
922   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/error/500.html">
923   - <provider selected="true" editor-type-id="text-editor" />
  829 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java">
  830 + <provider selected="true" editor-type-id="text-editor">
  831 + <state relative-caret-position="92">
  832 + <caret line="127" column="62" lean-forward="true" selection-start-line="127" selection-start-column="62" selection-end-line="127" selection-end-column="62" />
  833 + </state>
  834 + </provider>
924 835 </entry>
925   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/error/unauth.html">
926   - <provider selected="true" editor-type-id="text-editor" />
  836 + <entry file="file://$PROJECT_DIR$/pom.xml">
  837 + <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
  838 + <provider selected="true" editor-type-id="text-editor">
  839 + <state relative-caret-position="892">
  840 + <caret line="354" column="67" selection-start-line="354" selection-start-column="67" selection-end-line="354" selection-end-column="67" />
  841 + </state>
  842 + </provider>
927 843 </entry>
928   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/error/404.html">
929   - <provider selected="true" editor-type-id="text-editor" />
  844 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java">
  845 + <provider selected="true" editor-type-id="text-editor">
  846 + <state relative-caret-position="-1032">
  847 + <caret line="15" column="35" lean-forward="true" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
  848 + </state>
  849 + </provider>
930 850 </entry>
931   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail/inventoryDetail.html" />
932   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java">
  851 + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-aop/5.1.5.RELEASE/spring-aop-5.1.5.RELEASE.jar!/org/springframework/aop/aspectj/AspectJAfterThrowingAdvice.class">
933 852 <provider selected="true" editor-type-id="text-editor">
934   - <state relative-caret-position="-1715">
935   - <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
  853 + <state relative-caret-position="68">
  854 + <caret line="38" selection-start-line="38" selection-end-line="38" />
936 855 </state>
937 856 </provider>
938 857 </entry>
939   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java">
  858 + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.5.RELEASE/spring-core-5.1.5.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
940 859 <provider selected="true" editor-type-id="text-editor">
941   - <state relative-caret-position="140">
942   - <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
  860 + <state relative-caret-position="105">
  861 + <caret line="104" selection-start-line="104" selection-end-line="104" />
943 862 </state>
944 863 </provider>
945 864 </entry>
946   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountAdjust/cyclecountAdjust.html">
  865 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java">
947 866 <provider selected="true" editor-type-id="text-editor">
948   - <state relative-caret-position="80">
949   - <caret line="206" column="33" selection-start-line="206" selection-start-column="33" selection-end-line="206" selection-end-column="33" />
950   - <folding>
951   - <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
952   - <element signature="e#3143#6956#0" />
953   - <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
954   - <element signature="e#7300#7959#0" />
955   - </folding>
  867 + <state relative-caret-position="100">
  868 + <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
956 869 </state>
957 870 </provider>
958 871 </entry>
959   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html">
  872 + <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.1.5.RELEASE/spring-web-5.1.5.RELEASE.jar!/org/springframework/web/method/support/InvocableHandlerMethod.class">
960 873 <provider selected="true" editor-type-id="text-editor">
961   - <state relative-caret-position="302">
962   - <caret line="709" column="48" lean-forward="true" selection-start-line="709" selection-start-column="48" selection-end-line="709" selection-end-column="48" />
963   - <folding>
964   - <element signature="e#10179#16495#0" />
965   - <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
966   - <element signature="e#16591#20920#0" />
967   - <element signature="e#21391#24464#0" />
968   - <element signature="e#24661#25310#0" />
969   - <element signature="e#25357#25470#0" />
970   - <element signature="e#25521#25805#0" />
971   - <element signature="e#25857#26476#0" />
972   - <element signature="e#26529#27160#0" />
973   - <element signature="e#27216#27659#0" />
974   - <element signature="e#27707#28073#0" />
975   - <element signature="e#28654#28666#0" />
976   - <element signature="e#29244#29273#0" />
977   - <element signature="e#29533#29580#0" />
978   - </folding>
  874 + <state relative-caret-position="126">
  875 + <caret line="107" selection-start-line="107" selection-end-line="107" />
979 876 </state>
980 877 </provider>
981 878 </entry>
982   - <entry file="jar://$MAVEN_REPOSITORY$/org/thymeleaf/thymeleaf/3.0.11.RELEASE/thymeleaf-3.0.11.RELEASE.jar!/org/thymeleaf/engine/TemplateManager.class">
  879 + <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/java/util/LinkedHashMap.java">
983 880 <provider selected="true" editor-type-id="text-editor">
984   - <state relative-caret-position="96">
985   - <caret line="236" selection-start-line="236" selection-end-line="236" />
  881 + <state relative-caret-position="-376">
  882 + <caret line="163" column="24" lean-forward="true" selection-start-line="163" selection-start-column="24" selection-end-line="163" selection-end-column="24" />
986 883 </state>
987 884 </provider>
988 885 </entry>
989   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptContainerDetail/receiptContainerDetail.html">
  886 + <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.1/mybatis-3.5.1.jar!/org/apache/ibatis/builder/xml/mybatis-3-mapper.dtd">
990 887 <provider selected="true" editor-type-id="text-editor">
991   - <state relative-caret-position="240">
992   - <caret line="12" column="44" lean-forward="true" selection-start-line="12" selection-start-column="44" selection-end-line="12" selection-end-column="44" />
  888 + <state relative-caret-position="124">
  889 + <caret line="172" column="27" lean-forward="true" selection-start-line="172" selection-start-column="27" selection-end-line="172" selection-end-column="27" />
993 890 </state>
994 891 </provider>
995 892 </entry>
996   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
  893 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/report/ExcelReportMapper.xml">
997 894 <provider selected="true" editor-type-id="text-editor">
998   - <state>
999   - <caret column="28" selection-start-column="28" selection-end-column="28" />
  895 + <state relative-caret-position="300">
  896 + <caret line="94" column="16" lean-forward="true" selection-start-line="94" selection-start-column="16" selection-end-line="94" selection-end-column="16" />
1000 897 </state>
1001 898 </provider>
1002 899 </entry>
1003   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html">
  900 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/IndexController.java">
1004 901 <provider selected="true" editor-type-id="text-editor">
1005   - <state relative-caret-position="94">
1006   - <caret line="70" lean-forward="true" selection-start-line="70" selection-end-line="70" />
1007   - <folding>
1008   - <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
1009   - <element signature="e#2365#2371#0" expanded="true" />
1010   - <element signature="e#3190#7361#0" />
1011   - </folding>
  902 + <state relative-caret-position="253">
  903 + <caret line="106" column="22" selection-start-line="106" selection-start-column="22" selection-end-line="106" selection-end-column="22" />
1012 904 </state>
1013 905 </provider>
1014 906 </entry>
1015   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js">
  907 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java">
1016 908 <provider selected="true" editor-type-id="text-editor">
1017   - <state relative-caret-position="-608">
1018   - <caret line="11" column="37" lean-forward="true" selection-start-line="11" selection-start-column="37" selection-end-line="11" selection-end-column="37" />
  909 + <state relative-caret-position="-220">
  910 + <caret line="114" column="7" lean-forward="true" selection-start-line="114" selection-start-column="7" selection-end-line="114" selection-end-column="7" />
1019 911 </state>
1020 912 </provider>
1021 913 </entry>
1022   - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-core/3.1.2/mybatis-plus-core-3.1.2.jar!/com/baomidou/mybatisplus/core/mapper/BaseMapper.class">
  914 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml">
1023 915 <provider selected="true" editor-type-id="text-editor">
1024   - <state relative-caret-position="116">
1025   - <caret line="15" column="17" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" />
  916 + <state relative-caret-position="580">
  917 + <caret line="29" column="14" lean-forward="true" selection-start-line="29" selection-start-column="14" selection-end-line="29" selection-end-column="14" />
1026 918 </state>
1027 919 </provider>
1028 920 </entry>
1029   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
  921 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java">
1030 922 <provider selected="true" editor-type-id="text-editor">
1031   - <state relative-caret-position="499">
1032   - <caret line="125" column="44" selection-start-line="125" selection-start-column="33" selection-end-line="125" selection-end-column="44" />
1033   - <folding>
1034   - <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
1035   - </folding>
  923 + <state relative-caret-position="275">
  924 + <caret line="302" column="20" selection-start-line="302" selection-start-column="20" selection-end-line="302" selection-end-column="20" />
1036 925 </state>
1037 926 </provider>
1038 927 </entry>
1039   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java">
  928 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
1040 929 <provider selected="true" editor-type-id="text-editor">
1041   - <state relative-caret-position="80">
1042   - <caret line="5" column="49" selection-start-line="5" selection-start-column="49" selection-end-line="5" selection-end-column="49" />
  930 + <state relative-caret-position="234">
  931 + <caret line="78" column="44" selection-start-line="78" selection-start-column="44" selection-end-line="78" selection-end-column="44" />
1043 932 </state>
1044 933 </provider>
1045 934 </entry>
1046   - <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.1.5.RELEASE/spring-core-5.1.5.RELEASE.jar!/org/springframework/cglib/proxy/MethodProxy.class">
  935 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/report/excelReport/mapper/ExcelReportMapper.java">
1047 936 <provider selected="true" editor-type-id="text-editor">
1048   - <state relative-caret-position="132">
1049   - <caret line="103" selection-start-line="103" selection-end-line="103" />
  937 + <state relative-caret-position="100">
  938 + <caret line="9" column="40" selection-start-line="9" selection-start-column="40" selection-end-line="9" selection-end-column="40" />
1050 939 </state>
1051 940 </provider>
1052 941 </entry>
1053   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java">
  942 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
1054 943 <provider selected="true" editor-type-id="text-editor">
1055   - <state relative-caret-position="-668">
1056   - <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
  944 + <state relative-caret-position="51">
  945 + <caret line="72" selection-start-line="72" selection-end-line="72" />
1057 946 </state>
1058 947 </provider>
1059 948 </entry>
1060   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml">
  949 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
1061 950 <provider selected="true" editor-type-id="text-editor">
1062   - <state relative-caret-position="315">
1063   - <caret line="32" column="30" selection-start-line="32" selection-start-column="30" selection-end-line="32" selection-end-column="30" />
  951 + <state relative-caret-position="252">
  952 + <caret line="99" column="33" selection-start-line="99" selection-start-column="33" selection-end-line="99" selection-end-column="33" />
1064 953 </state>
1065 954 </provider>
1066 955 </entry>
1067   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
  956 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html">
1068 957 <provider selected="true" editor-type-id="text-editor">
1069   - <state relative-caret-position="79">
1070   - <caret line="72" column="28" selection-start-line="72" selection-start-column="28" selection-end-line="72" selection-end-column="28" />
  958 + <state relative-caret-position="328">
  959 + <caret line="92" column="18" lean-forward="true" selection-start-line="92" selection-start-column="18" selection-end-line="92" selection-end-column="18" />
1071 960 </state>
1072 961 </provider>
1073 962 </entry>
... ...
src/main/java/com/huaheng/common/utils/TreeUtils.java
  View file @45137af
... ... @@ -27,8 +27,7 @@ public class TreeUtils
27 27 {
28 28 Menu t = (Menu) iterator.next();
29 29 // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
30   - if (t.getParentId() == parentId)
31   - {
  30 + if (t.getParentId() == parentId) {
32 31 recursionFn(list, t);
33 32 returnList.add(t);
34 33 }
... ...
src/main/java/com/huaheng/pc/config/alarmLevel/controller/AlarmLevelController.java 0 → 100644
  View file @45137af
  1 +package com.huaheng.pc.config.alarmLevel.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.alarmLevel.domain.AlarmLevel;
  18 +import com.huaheng.pc.config.alarmLevel.service.AlarmLevelService;
  19 +import com.huaheng.pc.config.sendMail.domain.SendMail;
  20 +import com.huaheng.pc.config.sendMail.service.SendMailService;
  21 +import io.swagger.annotations.Api;
  22 +import io.swagger.annotations.ApiOperation;
  23 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  24 +import org.springframework.stereotype.Controller;
  25 +import org.springframework.ui.ModelMap;
  26 +import org.springframework.web.bind.annotation.*;
  27 +
  28 +import javax.annotation.Resource;
  29 +import java.util.ArrayList;
  30 +import java.util.List;
  31 +
  32 +@Api(tags = "预警等级")
  33 +@Controller
  34 +@RequestMapping("/config/alarmLevel")
  35 +public class AlarmLevelController extends BaseController {
  36 +
  37 + @Resource
  38 + private AlarmLevelService alarmLevelService;
  39 + @Resource
  40 + private SendMailService sendMailService;
  41 +
  42 + private String prefix = "config/alarmLevel";
  43 +
  44 + @RequiresPermissions("config:containerCapacity:view")
  45 + @GetMapping()
  46 + public String containerCapacity()
  47 + {
  48 + return prefix + "/containerCapacity";
  49 + }
  50 +
  51 + /**
  52 + * 查询容器容量列表
  53 + */
  54 + @RequiresPermissions("config:alarmLevel:list")
  55 + @Log(title = "配置-预警等级", operating = "查看预警等级列表", action = BusinessType.GRANT)
  56 + @PostMapping("/list")
  57 + @ResponseBody
  58 + public TableDataInfo list(String createdBegin, String createdEnd) {
  59 + LambdaQueryWrapper<AlarmLevel> lambdaQueryWrapper = Wrappers.lambdaQuery();
  60 + PageDomain pageDomain = TableSupport.buildPageRequest();
  61 + Integer pageNum = pageDomain.getPageNum();
  62 + Integer pageSize = pageDomain.getPageSize();
  63 +
  64 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), AlarmLevel::getCreated, createdBegin)
  65 + .le(StringUtils.isNotEmpty(createdEnd), AlarmLevel::getCreated, createdEnd)
  66 + .in(AlarmLevel::getCompanyCode, ShiroUtils.getCompanyCodeList())
  67 + .eq(AlarmLevel::getWarehouseCode, ShiroUtils.getWarehouseCode())
  68 + .orderByAsc(AlarmLevel::getId);
  69 +
  70 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  71 + /**
  72 + * 使用分页查询
  73 + */
  74 + Page<AlarmLevel> page = new Page<>(pageNum, pageSize);
  75 + IPage<AlarmLevel> iPage = alarmLevelService.page(page, lambdaQueryWrapper);
  76 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
  77 + } else {
  78 + List<AlarmLevel> list = alarmLevelService.list(lambdaQueryWrapper);
  79 + return getDataTable(list);
  80 + }
  81 + }
  82 +
  83 + /**
  84 + * 新增预警等级
  85 + */
  86 + @GetMapping("/add")
  87 + public String add() {
  88 + return prefix + "/add";
  89 + }
  90 +
  91 + /**
  92 + * 新增保存预警等级
  93 + */
  94 + @ApiOperation(value="新增预警等级 ", notes="新增预警等级 ", httpMethod = "POST")
  95 + @RequiresPermissions("config:alarmLevel:add")
  96 + @Log(title = "配置-预警等级 ",operating = "新增预警等级 ", action = BusinessType.INSERT)
  97 + @PostMapping("/add")
  98 + @ResponseBody
  99 + public AjaxResult addSave(AlarmLevel alarmLevel) {
  100 + alarmLevel.setWarehouseCode(ShiroUtils.getWarehouseCode());
  101 + LambdaQueryWrapper<AlarmLevel> lambdaQueryWrapper = Wrappers.lambdaQuery();
  102 + lambdaQueryWrapper.eq(AlarmLevel::getLevel, alarmLevel.getLevel())
  103 + .eq(AlarmLevel::getCompanyCode, alarmLevel.getCompanyCode())
  104 + .eq(AlarmLevel::getWarehouseCode, alarmLevel.getWarehouseCode());
  105 + AlarmLevel alarmLevel1 = alarmLevelService.getOne(lambdaQueryWrapper);
  106 + if (alarmLevel != null){
  107 + return AjaxResult.error("该记录已存在");
  108 + }
  109 + alarmLevel.setCreatedBy(ShiroUtils.getLoginName());
  110 + alarmLevel.setLastUpdateBy(ShiroUtils.getLoginName());
  111 + return toAjax(alarmLevelService.save(alarmLevel));
  112 + }
  113 +
  114 + /**
  115 + * 修改预警等级
  116 + */
  117 + @GetMapping("/edit/{id}")
  118 + public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
  119 + AlarmLevel alarmLevel = alarmLevelService.getById(id);
  120 + mmap.put("alarmLevel", alarmLevel);
  121 + return prefix + "/edit";
  122 + }
  123 +
  124 + /**
  125 + * 修改保存预警等级
  126 + */
  127 + @ApiOperation(value="修改预警等级信息", notes="修改预警等级信息", httpMethod = "POST")
  128 + @RequiresPermissions("config:warehouse:edit")
  129 + @Log(title = "配置-预警等级 ",operating = "修改预警等级 ", action = BusinessType.UPDATE)
  130 + @PostMapping("/edit")
  131 + @ResponseBody
  132 + public AjaxResult editSave(AlarmLevel alarmLevel) {
  133 + alarmLevel.setLastUpdateBy(ShiroUtils.getLoginName());
  134 + return toAjax(alarmLevelService.updateById(alarmLevel));
  135 + }
  136 +
  137 + /**
  138 + * 删除预警等级
  139 + */
  140 + @ApiOperation(value="删除预警等级 ", notes="单条删除或批量删除预警等级 ，示例1或1,2,3", httpMethod = "POST")
  141 + @RequiresPermissions("config:receiptType:remove")
  142 + @Log(title = "配置-预警等级 ",operating = "删除预警等级 ", action = BusinessType.DELETE)
  143 + @PostMapping( "/remove")
  144 + @ResponseBody
  145 + public AjaxResult remove(String ids) {
  146 + if (StringUtils.isEmpty(ids)) {
  147 + return AjaxResult.error("id不能为空");
  148 + }
  149 + List<Integer> list = new ArrayList<>();
  150 + for (Integer id : Convert.toIntArray(ids)) {
  151 + LambdaQueryWrapper<SendMail> lambda = Wrappers.lambdaQuery();
  152 + lambda.eq(SendMail::getWarningLevel, alarmLevelService.getById(id).getLevel());
  153 + List<SendMail> sendMails = sendMailService.list(lambda);
  154 + if (sendMails != null) {
  155 + return AjaxResult.error("该类型正在被使用");
  156 + }
  157 + list.add(id);
  158 + }
  159 + return toAjax(alarmLevelService.removeByIds(list));
  160 + }
  161 +}
... ...
src/main/java/com/huaheng/pc/config/alarmLevel/domain/AlarmLevel.java 0 → 100644
  View file @45137af
  1 +package com.huaheng.pc.config.alarmLevel.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.util.Date;
  11 +import lombok.Data;
  12 +
  13 +@ApiModel(value="com.huaheng.pc.config.alarmLevel.domain.AlarmLevel")
  14 +@Data
  15 +@TableName(value = "alarm_level")
  16 +public class AlarmLevel implements Serializable {
  17 + /**
  18 + * 主键、自增字段
  19 + */
  20 + @TableId(value = "id", type = IdType.AUTO)
  21 + @ApiModelProperty(value="主键、自增字段")
  22 + private Integer id;
  23 +
  24 + /**
  25 + * 仓库编码
  26 + */
  27 + @TableField(value = "warehouseCode")
  28 + @ApiModelProperty(value="仓库编码")
  29 + private String warehouseCode;
  30 +
  31 + /**
  32 + * 货主编码
  33 + */
  34 + @TableField(value = "companyCode")
  35 + @ApiModelProperty(value="货主编码")
  36 + private String companyCode;
  37 +
  38 + /**
  39 + * 预警类型
  40 + */
  41 + @TableField(value = "type")
  42 + @ApiModelProperty(value="预警类型")
  43 + private Integer type;
  44 +
  45 + /**
  46 + * 等级
  47 + */
  48 + @TableField(value = "level")
  49 + @ApiModelProperty(value="等级")
  50 + private Integer level;
  51 +
  52 + /**
  53 + * 时间阈值
  54 + */
  55 + @TableField(value = "timeThreshold")
  56 + @ApiModelProperty(value="时间阈值")
  57 + private Integer timeThreshold;
  58 +
  59 + /**
  60 + * 创建时间
  61 + */
  62 + @TableField(value = "created")
  63 + @ApiModelProperty(value="创建时间")
  64 + private Date created;
  65 +
  66 + /**
  67 + * 创建用户
  68 + */
  69 + @TableField(value = "createdBy")
  70 + @ApiModelProperty(value="创建用户")
  71 + private String createdBy;
  72 +
  73 + /**
  74 + * 更新时间
  75 + */
  76 + @TableField(value = "lastUpdate")
  77 + @ApiModelProperty(value="更新时间")
  78 + private Date lastUpdate;
  79 +
  80 + /**
  81 + * 更新用户
  82 + */
  83 + @TableField(value = "lastUpdateBy")
  84 + @ApiModelProperty(value="更新用户")
  85 + private String lastUpdateBy;
  86 +
  87 + /**
  88 + * 是否有效
  89 + */
  90 + @TableField(value = "enable")
  91 + @ApiModelProperty(value="是否有效")
  92 + private Boolean enable;
  93 +
  94 + /**
  95 + * 自定义字段
  96 + */
  97 + @TableField(value = "userDef1")
  98 + @ApiModelProperty(value="自定义字段")
  99 + private String userDef1;
  100 +
  101 + private static final long serialVersionUID = 1L;
  102 +}
0 103 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/alarmLevel/mapper/AlarmLevelMapper.java 0 → 100644
  View file @45137af
  1 +package com.huaheng.pc.config.alarmLevel.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.config.alarmLevel.domain.AlarmLevel;
  5 +
  6 +public interface AlarmLevelMapper extends BaseMapper<AlarmLevel> {
  7 +}
0 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/general/warehouseCopany/service/WarehouseCompanyServiceImpl.java renamed to src/main/java/com/huaheng/pc/config/alarmLevel/service/AlarmLevelService.java
  View file @45137af
1   -package com.huaheng.pc.general.warehouseCopany.service;
  1 +package com.huaheng.pc.config.alarmLevel.service;
2 2  
3 3 import org.springframework.stereotype.Service;
4 4 import javax.annotation.Resource;
5 5 import java.util.List;
6 6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7   -import com.huaheng.pc.general.warehouseCopany.mapper.WarehouseCompanyMapper;
8   -import com.huaheng.pc.general.warehouseCopany.domain.WarehouseCompany;
9   -import com.huaheng.pc.general.warehouseCopany.service.WarehouseCompanyService;
  7 +import com.huaheng.pc.config.alarmLevel.domain.AlarmLevel;
  8 +import com.huaheng.pc.config.alarmLevel.mapper.AlarmLevelMapper;
10 9 @Service
11   -public class WarehouseCompanyServiceImpl extends ServiceImpl<WarehouseCompanyMapper, WarehouseCompany> implements WarehouseCompanyService{
  10 +public class AlarmLevelService extends ServiceImpl<AlarmLevelMapper, AlarmLevel> {
12 11  
13 12 }
... ...
src/main/java/com/huaheng/pc/general/bom/controller/BomDetailController.java renamed to src/main/java/com/huaheng/pc/config/bom/controller/BomDetailController.java
  View file @45137af
1   -package com.huaheng.pc.general.bom.controller;
  1 +package com.huaheng.pc.config.bom.controller;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.metadata.IPage;
... ... @@ -14,10 +14,10 @@ import com.huaheng.framework.web.domain.AjaxResult;
14 14 import com.huaheng.framework.web.page.PageDomain;
15 15 import com.huaheng.framework.web.page.TableDataInfo;
16 16 import com.huaheng.framework.web.page.TableSupport;
17   -import com.huaheng.pc.general.bom.domain.BomDetail;
18   -import com.huaheng.pc.general.bom.service.BomDetailService;
19   -import com.huaheng.pc.general.material.domain.Material;
20   -import com.huaheng.pc.general.material.service.MaterialService;
  17 +import com.huaheng.pc.config.bom.domain.BomDetail;
  18 +import com.huaheng.pc.config.bom.service.BomDetailService;
  19 +import com.huaheng.pc.config.material.domain.Material;
  20 +import com.huaheng.pc.config.material.service.MaterialService;
21 21 import io.swagger.annotations.ApiOperation;
22 22 import io.swagger.annotations.ApiParam;
23 23 import org.apache.shiro.authz.annotation.RequiresPermissions;
... ... @@ -30,17 +30,17 @@ import java.util.ArrayList;
30 30 import java.util.List;
31 31  
32 32 @Controller
33   -@RequestMapping("/general/bomDetail")
  33 +@RequestMapping("/config/bomDetail")
34 34 public class BomDetailController extends BaseController {
35 35  
36   - private String prefix = "general/bomDetail";
  36 + private String prefix = "config/bomDetail";
37 37  
38 38 @Resource
39 39 private BomDetailService bomDetailService;
40 40 @Resource
41 41 private MaterialService materialService;
42 42  
43   - @RequiresPermissions("general:bomHeader:view")
  43 + @RequiresPermissions("config:bomHeader:view")
44 44 @Log(title = "管理-推送详情列表", operating = "推送详情列表", action = BusinessType.GRANT)
45 45 @GetMapping("/list/{id}")
46 46 public String list(@PathVariable("id")Integer id, ModelMap mmap) {
... ... @@ -52,7 +52,7 @@ public class BomDetailController extends BaseController {
52 52 * 查询商品详情
53 53 */
54 54 @ApiOperation(value="查看商品列表", notes="根据商品id获取商品详情信息", httpMethod = "POST")
55   - @RequiresPermissions("general:bomHeader:list")
  55 + @RequiresPermissions("config:bomHeader:list")
56 56 @Log(title = "通用-商品管理", operating = "查看商品列表", action = BusinessType.GRANT)
57 57 @PostMapping("/list")
58 58 @ResponseBody
... ... @@ -85,7 +85,7 @@ public class BomDetailController extends BaseController {
85 85 * 新增保存商品
86 86 */
87 87 @ApiOperation(value="新增商品详情", notes="新增商品详情", httpMethod = "POST")
88   - @RequiresPermissions("general:bomDetail:add")
  88 + @RequiresPermissions("config:bomDetail:add")
89 89 @Log(title = "通用-商品", operating = "新增商品", action = BusinessType.INSERT)
90 90 @PostMapping("/add")
91 91 @ResponseBody
... ... @@ -121,7 +121,7 @@ public class BomDetailController extends BaseController {
121 121 * 修改保存商品详情
122 122 */
123 123 @ApiOperation(value="修改商品详情", notes="修改商品详情", httpMethod = "POST")
124   - @RequiresPermissions("general:BomDetail:edit")
  124 + @RequiresPermissions("config:BomDetail:edit")
125 125 @Log(title = "通用-商品详情", operating = "修改商品详情", action = BusinessType.UPDATE)
126 126 @PostMapping("/edit")
127 127 @ResponseBody
... ... @@ -134,7 +134,7 @@ public class BomDetailController extends BaseController {
134 134 * 删除商品详情
135 135 */
136 136 @ApiOperation(value="删除商品详情", notes="根据id批量删除商品详情，参数示例1,2,3", httpMethod = "POST")
137   - @RequiresPermissions("general:BomDetail:remove")
  137 + @RequiresPermissions("config:BomDetail:remove")
138 138 @Log(title = "通用-商品", operating = "删除商品", action = BusinessType.DELETE)
139 139 @PostMapping( "/remove")
140 140 @ResponseBody
... ...
src/main/java/com/huaheng/pc/general/bom/controller/BomHeaderController.java renamed to src/main/java/com/huaheng/pc/config/bom/controller/BomHeaderController.java
  View file @45137af
1   -package com.huaheng.pc.general.bom.controller;
  1 +package com.huaheng.pc.config.bom.controller;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.metadata.IPage;
... ... @@ -14,12 +14,12 @@ import com.huaheng.framework.web.domain.AjaxResult;
14 14 import com.huaheng.framework.web.page.PageDomain;
15 15 import com.huaheng.framework.web.page.TableDataInfo;
16 16 import com.huaheng.framework.web.page.TableSupport;
17   -import com.huaheng.pc.general.bom.domain.BomDetail;
18   -import com.huaheng.pc.general.bom.domain.BomHeader;
19   -import com.huaheng.pc.general.bom.service.BomDetailService;
20   -import com.huaheng.pc.general.bom.service.BomHeaderService;
21   -import com.huaheng.pc.general.material.domain.Material;
22   -import com.huaheng.pc.general.material.service.MaterialService;
  17 +import com.huaheng.pc.config.bom.domain.BomDetail;
  18 +import com.huaheng.pc.config.bom.domain.BomHeader;
  19 +import com.huaheng.pc.config.bom.service.BomDetailService;
  20 +import com.huaheng.pc.config.bom.service.BomHeaderService;
  21 +import com.huaheng.pc.config.material.domain.Material;
  22 +import com.huaheng.pc.config.material.service.MaterialService;
23 23 import io.swagger.annotations.ApiOperation;
24 24 import io.swagger.annotations.ApiParam;
25 25 import org.apache.shiro.authz.annotation.RequiresPermissions;
... ... @@ -32,10 +32,10 @@ import java.util.ArrayList;
32 32 import java.util.List;
33 33  
34 34 @Controller
35   -@RequestMapping("/general/bomHeader")
  35 +@RequestMapping("/config/bomHeader")
36 36 public class BomHeaderController extends BaseController {
37 37  
38   - private String prefix = "general/bomHeader";
  38 + private String prefix = "config/bomHeader";
39 39  
40 40 @Resource
41 41 private BomHeaderService bomHeaderService;
... ... @@ -46,7 +46,7 @@ public class BomHeaderController extends BaseController {
46 46 @Resource
47 47 private MaterialService materialService;
48 48  
49   - @RequiresPermissions("general:bomHeader:view")
  49 + @RequiresPermissions("config:bomHeader:view")
50 50 @GetMapping()
51 51 public String bomHeader() {
52 52 System.out.println("商品管理");
... ... @@ -57,7 +57,7 @@ public class BomHeaderController extends BaseController {
57 57 * 查询商品列表
58 58 */
59 59 @ApiOperation(value="查看商品列表", notes="根据物料编码、物料名称、货主编码、创建时间获取商品信息", httpMethod = "POST")
60   - @RequiresPermissions("general:bomHeader:list")
  60 + @RequiresPermissions("config:bomHeader:list")
61 61 @Log(title = "通用-商品管理", operating = "查看商品列表", action = BusinessType.GRANT)
62 62 @PostMapping("/list")
63 63 @ResponseBody
... ... @@ -98,7 +98,7 @@ public class BomHeaderController extends BaseController {
98 98 * 新增保存商品
99 99 */
100 100 @ApiOperation(value="新增商品", notes="新增商品", httpMethod = "POST")
101   - @RequiresPermissions("general:bomHeader:add")
  101 + @RequiresPermissions("config:bomHeader:add")
102 102 @Log(title = "通用-商品", operating = "新增商品", action = BusinessType.INSERT)
103 103 @PostMapping("/add")
104 104 @ResponseBody
... ... @@ -136,7 +136,7 @@ public class BomHeaderController extends BaseController {
136 136 * 修改保存商品
137 137 */
138 138 @ApiOperation(value="修改商品", notes="修改商品", httpMethod = "POST")
139   - @RequiresPermissions("general:bomHeader:edit")
  139 + @RequiresPermissions("config:bomHeader:edit")
140 140 @Log(title = "通用-商品", operating = "修改商品", action = BusinessType.UPDATE)
141 141 @PostMapping("/edit")
142 142 @ResponseBody
... ... @@ -149,7 +149,7 @@ public class BomHeaderController extends BaseController {
149 149 * 删除容器
150 150 */
151 151 @ApiOperation(value="删除商品", notes="根据id批量删除商品，参数示例1,2,3", httpMethod = "POST")
152   - @RequiresPermissions("general:bomHeader:remove")
  152 + @RequiresPermissions("config:bomHeader:remove")
153 153 @Log(title = "通用-商品", operating = "删除商品", action = BusinessType.DELETE)
154 154 @PostMapping( "/remove")
155 155 @ResponseBody
... ...
src/main/java/com/huaheng/pc/general/bom/domain/BomDetail.java renamed to src/main/java/com/huaheng/pc/config/bom/domain/BomDetail.java
  View file @45137af
1   -package com.huaheng.pc.general.bom.domain;
  1 +package com.huaheng.pc.config.bom.domain;
2 2  
3 3 import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
... ... @@ -10,7 +10,7 @@ import java.io.Serializable;
10 10 import java.util.Date;
11 11 import lombok.Data;
12 12  
13   -@ApiModel(value="com.huaheng.pc.general.bom.domain.BomDetail")
  13 +@ApiModel(value="com.huaheng.pc.config.bom.domain.BomDetail")
14 14 @Data
15 15 @TableName(value = "bom_detail")
16 16 public class BomDetail implements Serializable {
... ...
src/main/java/com/huaheng/pc/general/bom/domain/BomHeader.java renamed to src/main/java/com/huaheng/pc/config/bom/domain/BomHeader.java
  View file @45137af
1   -package com.huaheng.pc.general.bom.domain;
  1 +package com.huaheng.pc.config.bom.domain;
2 2  
3 3 import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
... ... @@ -10,7 +10,7 @@ import java.io.Serializable;
10 10 import java.util.Date;
11 11 import lombok.Data;
12 12  
13   -@ApiModel(value="com.huaheng.pc.general.bom.domain.BomHeader")
  13 +@ApiModel(value="com.huaheng.pc.config.bom.domain.BomHeader")
14 14 @Data
15 15 @TableName(value = "bom_header")
16 16 public class BomHeader implements Serializable {
... ...
src/main/java/com/huaheng/pc/general/bom/mapper/BomDetailMapper.java renamed to src/main/java/com/huaheng/pc/config/bom/mapper/BomDetailMapper.java
  View file @45137af
1   -package com.huaheng.pc.general.bom.mapper;
  1 +package com.huaheng.pc.config.bom.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.general.bom.domain.BomDetail;
  4 +import com.huaheng.pc.config.bom.domain.BomDetail;
5 5  
6 6 public interface BomDetailMapper extends BaseMapper<BomDetail> {
7 7 }
8 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/general/bom/mapper/BomHeaderMapper.java renamed to src/main/java/com/huaheng/pc/config/bom/mapper/BomHeaderMapper.java
  View file @45137af
1   -package com.huaheng.pc.general.bom.mapper;
  1 +package com.huaheng.pc.config.bom.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.general.bom.domain.BomHeader;
  4 +import com.huaheng.pc.config.bom.domain.BomHeader;
5 5  
6 6 public interface BomHeaderMapper extends BaseMapper<BomHeader> {
7 7 }
8 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/general/bom/service/BomDetailService.java renamed to src/main/java/com/huaheng/pc/config/bom/service/BomDetailService.java
  View file @45137af
1   -package com.huaheng.pc.general.bom.service;
  1 +package com.huaheng.pc.config.bom.service;
2 2  
3   -import com.huaheng.pc.general.bom.domain.BomDetail;
  3 +import com.huaheng.pc.config.bom.domain.BomDetail;
4 4 import com.baomidou.mybatisplus.extension.service.IService;
5 5 public interface BomDetailService extends IService<BomDetail>{
6 6  
... ...
src/main/java/com/huaheng/pc/general/bom/service/BomDetailServiceImpl.java renamed to src/main/java/com/huaheng/pc/config/bom/service/BomDetailServiceImpl.java
  View file @45137af
1   -package com.huaheng.pc.general.bom.service;
  1 +package com.huaheng.pc.config.bom.service;
2 2  
3 3 import org.springframework.stereotype.Service;
4 4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5   -import com.huaheng.pc.general.bom.domain.BomDetail;
6   -import com.huaheng.pc.general.bom.mapper.BomDetailMapper;
  5 +import com.huaheng.pc.config.bom.domain.BomDetail;
  6 +import com.huaheng.pc.config.bom.mapper.BomDetailMapper;
7 7  
8 8 @Service
9 9 public class BomDetailServiceImpl extends ServiceImpl<BomDetailMapper, BomDetail> implements BomDetailService{
... ...
src/main/java/com/huaheng/pc/general/bom/service/BomHeaderService.java renamed to src/main/java/com/huaheng/pc/config/bom/service/BomHeaderService.java
  View file @45137af
1   -package com.huaheng.pc.general.bom.service;
  1 +package com.huaheng.pc.config.bom.service;
2 2  
3   -import com.huaheng.pc.general.bom.domain.BomHeader;
  3 +import com.huaheng.pc.config.bom.domain.BomHeader;
4 4 import com.baomidou.mybatisplus.extension.service.IService;
5 5 public interface BomHeaderService extends IService<BomHeader>{
6 6  
... ...
src/main/java/com/huaheng/pc/general/bom/service/BomHeaderServiceImpl.java renamed to src/main/java/com/huaheng/pc/config/bom/service/BomHeaderServiceImpl.java
  View file @45137af
1   -package com.huaheng.pc.general.bom.service;
  1 +package com.huaheng.pc.config.bom.service;
2 2  
3 3 import org.springframework.stereotype.Service;
4   -import javax.annotation.Resource;
5   -import java.util.List;
6 4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7   -import com.huaheng.pc.general.bom.domain.BomHeader;
8   -import com.huaheng.pc.general.bom.mapper.BomHeaderMapper;
9   -import com.huaheng.pc.general.bom.service.BomHeaderService;
  5 +import com.huaheng.pc.config.bom.domain.BomHeader;
  6 +import com.huaheng.pc.config.bom.mapper.BomHeaderMapper;
  7 +
10 8 @Service
11 9 public class BomHeaderServiceImpl extends ServiceImpl<BomHeaderMapper, BomHeader> implements BomHeaderService{
12 10  
... ...
src/main/java/com/huaheng/pc/general/carrier/controller/CarrierController.java renamed to src/main/java/com/huaheng/pc/config/carrier/controller/CarrierController.java
  View file @45137af
1   -package com.huaheng.pc.general.carrier.controller;
  1 +package com.huaheng.pc.config.carrier.controller;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.metadata.IPage;
... ... @@ -14,8 +14,8 @@ import com.huaheng.framework.web.domain.AjaxResult;
14 14 import com.huaheng.framework.web.page.PageDomain;
15 15 import com.huaheng.framework.web.page.TableDataInfo;
16 16 import com.huaheng.framework.web.page.TableSupport;
17   -import com.huaheng.pc.general.carrier.domain.Carrier;
18   -import com.huaheng.pc.general.carrier.service.CarrierService;
  17 +import com.huaheng.pc.config.carrier.domain.Carrier;
  18 +import com.huaheng.pc.config.carrier.service.CarrierService;
19 19 import io.swagger.annotations.ApiOperation;
20 20 import io.swagger.annotations.ApiParam;
21 21 import org.apache.shiro.authz.annotation.RequiresPermissions;
... ... @@ -31,15 +31,15 @@ import java.util.List;
31 31 * 承运商
32 32 */
33 33 @Controller
34   -@RequestMapping("/general/carrier")
  34 +@RequestMapping("/config/carrier")
35 35 public class CarrierController extends BaseController {
36 36  
37   - private String prefix = "general/carrier";
  37 + private String prefix = "config/carrier";
38 38  
39 39 @Resource
40 40 private CarrierService carrierService;
41 41  
42   - @RequiresPermissions("general:carrier:view")
  42 + @RequiresPermissions("config:carrier:view")
43 43 @GetMapping()
44 44 public String bomHeader() {
45 45 return prefix + "/carrier";
... ... @@ -49,7 +49,7 @@ public class CarrierController extends BaseController {
49 49 * 查询承运商列表
50 50 */
51 51 @ApiOperation(value="查看承运商列表", notes="根据承运商编码、名称、创建时间获取承运商信息", httpMethod = "POST")
52   - @RequiresPermissions("general:carrier:list")
  52 + @RequiresPermissions("config:carrier:list")
53 53 @Log(title = "通用-承运商管理", operating = "查看承运商列表", action = BusinessType.GRANT)
54 54 @PostMapping("/list")
55 55 @ResponseBody
... ... @@ -90,7 +90,7 @@ public class CarrierController extends BaseController {
90 90 * 新增保存承运商
91 91 */
92 92 @ApiOperation(value="新增承运商", notes="新增承运商", httpMethod = "POST")
93   - @RequiresPermissions("general:carrier:add")
  93 + @RequiresPermissions("config:carrier:add")
94 94 @Log(title = "通用-承运商", operating = "新增承运商", action = BusinessType.INSERT)
95 95 @PostMapping("/add")
96 96 @ResponseBody
... ... @@ -115,7 +115,7 @@ public class CarrierController extends BaseController {
115 115 * 修改保存承运商
116 116 */
117 117 @ApiOperation(value="修改承运商", notes="修改承运商", httpMethod = "POST")
118   - @RequiresPermissions("general:carrier:edit")
  118 + @RequiresPermissions("config:carrier:edit")
119 119 @Log(title = "通用-承运商", operating = "修改承运商", action = BusinessType.UPDATE)
120 120 @PostMapping("/edit")
121 121 @ResponseBody
... ... @@ -129,7 +129,7 @@ public class CarrierController extends BaseController {
129 129 * 删除承运商
130 130 */
131 131 @ApiOperation(value="删除承运商", notes="根据id批量删除承运商，参数示例1,2,3", httpMethod = "POST")
132   - @RequiresPermissions("general:carrier:remove")
  132 + @RequiresPermissions("config:carrier:remove")
133 133 @Log(title = "通用-承运商", operating = "删除承运商", action = BusinessType.DELETE)
134 134 @PostMapping( "/remove")
135 135 @ResponseBody
... ...
src/main/java/com/huaheng/pc/general/carrier/domain/Carrier.java renamed to src/main/java/com/huaheng/pc/config/carrier/domain/Carrier.java
  View file @45137af
1   -package com.huaheng.pc.general.carrier.domain;
  1 +package com.huaheng.pc.config.carrier.domain;
2 2  
3 3 import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
... ... @@ -13,7 +13,7 @@ import lombok.Data;
13 13 /**
14 14 * 承运商
15 15 */
16   -@ApiModel(value="com.huaheng.pc.general.carrier.domain.Carrier")
  16 +@ApiModel(value="com.huaheng.pc.config.carrier.domain.Carrier")
17 17 @Data
18 18 @TableName(value = "carrier")
19 19 public class Carrier implements Serializable {
... ...
src/main/java/com/huaheng/pc/general/carrier/mapper/CarrierMapper.java renamed to src/main/java/com/huaheng/pc/config/carrier/mapper/CarrierMapper.java
  View file @45137af
1   -package com.huaheng.pc.general.carrier.mapper;
  1 +package com.huaheng.pc.config.carrier.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.general.carrier.domain.Carrier;
  4 +import com.huaheng.pc.config.carrier.domain.Carrier;
5 5  
6 6 public interface CarrierMapper extends BaseMapper<Carrier> {
7 7 }
8 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/general/carrier/service/CarrierService.java renamed to src/main/java/com/huaheng/pc/config/carrier/service/CarrierService.java
  View file @45137af
1   -package com.huaheng.pc.general.carrier.service;
  1 +package com.huaheng.pc.config.carrier.service;
2 2  
3   -import com.huaheng.pc.general.carrier.domain.Carrier;
  3 +import com.huaheng.pc.config.carrier.domain.Carrier;
4 4 import com.baomidou.mybatisplus.extension.service.IService;
5 5 public interface CarrierService extends IService<Carrier>{
6 6  
... ...
src/main/java/com/huaheng/pc/general/carrier/service/CarrierServiceImpl.java renamed to src/main/java/com/huaheng/pc/config/carrier/service/CarrierServiceImpl.java
  View file @45137af
1   -package com.huaheng.pc.general.carrier.service;
  1 +package com.huaheng.pc.config.carrier.service;
2 2  
3 3 import org.springframework.stereotype.Service;
4   -import javax.annotation.Resource;
5   -import java.util.List;
6 4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7   -import com.huaheng.pc.general.carrier.mapper.CarrierMapper;
8   -import com.huaheng.pc.general.carrier.domain.Carrier;
9   -import com.huaheng.pc.general.carrier.service.CarrierService;
  5 +import com.huaheng.pc.config.carrier.mapper.CarrierMapper;
  6 +import com.huaheng.pc.config.carrier.domain.Carrier;
  7 +
10 8 @Service
11 9 public class CarrierServiceImpl extends ServiceImpl<CarrierMapper, Carrier> implements CarrierService{
12 10  
... ...
src/main/java/com/huaheng/pc/general/company/controller/CompanyController.java renamed to src/main/java/com/huaheng/pc/config/company/controller/CompanyController.java
  View file @45137af
1   -package com.huaheng.pc.general.company.controller;
  1 +package com.huaheng.pc.config.company.controller;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.metadata.IPage;
... ... @@ -14,10 +14,10 @@ import com.huaheng.framework.web.domain.AjaxResult;
14 14 import com.huaheng.framework.web.page.PageDomain;
15 15 import com.huaheng.framework.web.page.TableDataInfo;
16 16 import com.huaheng.framework.web.page.TableSupport;
17   -import com.huaheng.pc.general.company.domain.Company;
18   -import com.huaheng.pc.general.company.service.CompanyService;
19   -import com.huaheng.pc.general.warehouse.domain.Warehouse;
20   -import com.huaheng.pc.general.warehouse.service.WarehouseService;
  17 +import com.huaheng.pc.config.company.domain.Company;
  18 +import com.huaheng.pc.config.company.service.CompanyService;
  19 +import com.huaheng.pc.config.warehouse.domain.Warehouse;
  20 +import com.huaheng.pc.config.warehouse.service.WarehouseService;
21 21 import org.apache.shiro.authz.annotation.RequiresPermissions;
22 22 import org.springframework.stereotype.Controller;
23 23 import org.springframework.transaction.annotation.Transactional;
... ... @@ -25,21 +25,20 @@ import org.springframework.ui.ModelMap;
25 25 import org.springframework.web.bind.annotation.*;
26 26  
27 27 import javax.annotation.Resource;
28   -import java.util.Arrays;
29 28 import java.util.List;
30 29 import java.util.Map;
31 30  
32 31 @Controller
33   -@RequestMapping("/general/company")
  32 +@RequestMapping("/config/company")
34 33 public class CompanyController extends BaseController {
35 34 @Resource
36 35 private CompanyService companyService;
37 36 @Resource
38 37 private WarehouseService warehouseService;
39 38  
40   - private String prefix = "general/company";
  39 + private String prefix = "config/company";
41 40  
42   - @RequiresPermissions("general:company:view")
  41 + @RequiresPermissions("config:company:view")
43 42 @GetMapping()
44 43 public String company() {
45 44 return prefix + "/company";
... ... @@ -48,7 +47,7 @@ public class CompanyController extends BaseController {
48 47 /**
49 48 * 查询货主列表
50 49 */
51   - @RequiresPermissions("general:company:list")
  50 + @RequiresPermissions("config:company:list")
52 51 @Log(title = "通用-货主管理", operating = "查看货主列表", action = BusinessType.GRANT)
53 52 @PostMapping("/list")
54 53 @ResponseBody
... ... @@ -58,7 +57,7 @@ public class CompanyController extends BaseController {
58 57 Integer pageNum = pageDomain.getPageNum();
59 58 Integer pageSize = pageDomain.getPageSize();
60 59  
61   - lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin),Company::getCreated, createdBegin)
  60 + lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), Company::getCreated, createdBegin)
62 61 .lt(StringUtils.isNotEmpty(createdEnd), Company::getCreated, createdEnd)
63 62 .eq(StringUtils.isNotEmpty(company.getCode()), Company::getCode, company.getCode())
64 63 .eq(StringUtils.isNotEmpty(company.getName()), Company::getName, company.getName())
... ... @@ -95,7 +94,7 @@ public class CompanyController extends BaseController {
95 94 /**
96 95 * 新增保存货主
97 96 */
98   - @RequiresPermissions("general:company:add")
  97 + @RequiresPermissions("config:company:add")
99 98 @Log(title = "通用-货主管理", operating = "新增货主", action = BusinessType.INSERT)
100 99 @PostMapping("/add")
101 100 @ResponseBody
... ... @@ -119,7 +118,7 @@ public class CompanyController extends BaseController {
119 118 /**
120 119 * 修改保存货主
121 120 */
122   - @RequiresPermissions("general:company:edit")
  121 + @RequiresPermissions("config:company:edit")
123 122 @Log(title = "通用-货主管理", operating = "修改货主", action = BusinessType.UPDATE)
124 123 @PostMapping("/edit")
125 124 @ResponseBody
... ... @@ -131,7 +130,7 @@ public class CompanyController extends BaseController {
131 130 /**
132 131 * 删除货主
133 132 */
134   - @RequiresPermissions("general:company:remove")
  133 + @RequiresPermissions("config:company:remove")
135 134 @Log(title = "通用-货主管理", operating ="删除货主", action = BusinessType.DELETE)
136 135 @PostMapping( "/remove")
137 136 @ResponseBody
... ...
src/main/java/com/huaheng/pc/general/company/domain/Company.java renamed to src/main/java/com/huaheng/pc/config/company/domain/Company.java
  View file @45137af
1   -package com.huaheng.pc.general.company.domain;
  1 +package com.huaheng.pc.config.company.domain;
2 2  
3 3 import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
... ...
src/main/java/com/huaheng/pc/general/company/mapper/CompanyMapper.java renamed to src/main/java/com/huaheng/pc/config/company/mapper/CompanyMapper.java
  View file @45137af
1   -package com.huaheng.pc.general.company.mapper;
2   -import java.util.Date;
  1 +package com.huaheng.pc.config.company.mapper;
3 2  
4 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5   -import com.huaheng.pc.general.company.domain.Company;
  4 +import com.huaheng.pc.config.company.domain.Company;
6 5 import org.apache.ibatis.annotations.Param;
7 6  
8 7 import java.util.List;
... ...
src/main/java/com/huaheng/pc/general/company/service/CompanyService.java renamed to src/main/java/com/huaheng/pc/config/company/service/CompanyService.java
  View file @45137af
1   -package com.huaheng.pc.general.company.service;
  1 +package com.huaheng.pc.config.company.service;
2 2  
3   -import com.huaheng.framework.web.domain.AjaxResult;
4   -import com.huaheng.pc.general.company.domain.Company;
5 3 import com.baomidou.mybatisplus.extension.service.IService;
  4 +import com.huaheng.framework.web.domain.AjaxResult;
  5 +import com.huaheng.pc.config.company.domain.Company;
6 6  
7 7 import java.util.List;
8 8 import java.util.Map;
... ...
src/main/java/com/huaheng/pc/general/company/service/CompanyServiceImpl.java renamed to src/main/java/com/huaheng/pc/config/company/service/CompanyServiceImpl.java
  View file @45137af
1   -package com.huaheng.pc.general.company.service;
  1 +package com.huaheng.pc.config.company.service;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  5 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 6 import com.huaheng.common.utils.security.ShiroUtils;
6 7 import com.huaheng.framework.web.domain.AjaxResult;
7   -import com.huaheng.pc.config.containerType.domain.ContainerType;
8   -import com.huaheng.pc.general.warehouseCopany.domain.WarehouseCompany;
9   -import com.huaheng.pc.general.warehouseCopany.service.WarehouseCompanyService;
  8 +import com.huaheng.pc.config.company.domain.Company;
  9 +import com.huaheng.pc.config.company.mapper.CompanyMapper;
  10 +import com.huaheng.pc.config.warehouseCompany.domain.WarehouseCompany;
  11 +import com.huaheng.pc.config.warehouseCompany.service.WarehouseCompanyService;
10 12 import com.huaheng.pc.system.user.domain.UserCompany;
11 13 import com.huaheng.pc.system.user.mapper.UserCompanyMapper;
12 14 import org.springframework.stereotype.Service;
  15 +
13 16 import javax.annotation.Resource;
14 17 import java.util.List;
15 18 import java.util.Map;
16 19  
17   -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
18   -import com.huaheng.pc.general.company.mapper.CompanyMapper;
19   -import com.huaheng.pc.general.company.domain.Company;
20   -import com.huaheng.pc.general.company.service.CompanyService;
21 20 @Service("companyService")
22   -public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService{
  21 +public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService {
23 22  
24 23 @Resource
25 24 private CompanyMapper companyMapper;
... ... @@ -104,7 +103,7 @@ public class CompanyServiceImpl extends ServiceImpl&lt;CompanyMapper, Company&gt; impl
104 103  
105 104 public List<Map<String, Object>> getCode(){
106 105 LambdaQueryWrapper<Company> lambda = Wrappers.lambdaQuery();
107   - lambda.select(Company::getCode,Company::getId,Company::getName)
  106 + lambda.select(Company::getCode, Company::getId, Company::getName)
108 107 .eq(Company::getWarehouseCode, ShiroUtils.getWarehouseCode());
109 108 return this.listMaps(lambda);
110 109 }
... ...
src/main/java/com/huaheng/pc/general/container/controller/ContainerController.java renamed to src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java
  View file @45137af
1   -package com.huaheng.pc.general.container.controller;
  1 +package com.huaheng.pc.config.container.controller;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.metadata.IPage;
... ... @@ -15,9 +15,8 @@ import com.huaheng.framework.web.domain.AjaxResult;
15 15 import com.huaheng.framework.web.page.PageDomain;
16 16 import com.huaheng.framework.web.page.TableDataInfo;
17 17 import com.huaheng.framework.web.page.TableSupport;
18   -import com.huaheng.pc.general.container.domain.Container;
19   -import com.huaheng.pc.general.container.service.ContainerService;
20   -import com.huaheng.pc.general.material.domain.Material;
  18 +import com.huaheng.pc.config.container.domain.Container;
  19 +import com.huaheng.pc.config.container.service.ContainerService;
21 20 import io.swagger.annotations.Api;
22 21 import io.swagger.annotations.ApiOperation;
23 22 import io.swagger.annotations.ApiParam;
... ... @@ -32,15 +31,15 @@ import java.util.List;
32 31  
33 32 @Api(tags={"容器操作类"})
34 33 @Controller
35   -@RequestMapping("/general/container")
  34 +@RequestMapping("/config/container")
36 35 public class ContainerController extends BaseController {
37 36  
38   - private String prefix = "general/container";
  37 + private String prefix = "config/container";
39 38  
40 39 @Resource
41 40 private ContainerService containerService;
42 41  
43   - @RequiresPermissions("general:container:view")
  42 + @RequiresPermissions("config:container:view")
44 43 @GetMapping()
45 44 public String container() {
46 45 return prefix + "/container";
... ... @@ -52,7 +51,7 @@ public class ContainerController extends BaseController {
52 51 @ApiOperation(value="查看容器列表",
53 52 notes="根据容器编号、库位编码、容器状态、容器类型、创建时间获取库位的详细信息",
54 53 httpMethod = "POST")
55   - @RequiresPermissions("general:location:list")
  54 + @RequiresPermissions("config:container:list")
56 55 @Log(title = "通用-库位管理", operating = "查看库位列表", action = BusinessType.GRANT)
57 56 @PostMapping("/list")
58 57 @ResponseBody
... ... @@ -98,7 +97,7 @@ public class ContainerController extends BaseController {
98 97 * 新增保存容器
99 98 */
100 99 @ApiOperation(value="新增容器", notes="根据容器类型、数量批量新增容器", httpMethod = "POST")
101   - @RequiresPermissions("general:container:add")
  100 + @RequiresPermissions("config:container:add")
102 101 @Log(title = "通用-容器", operating = "新增容器", action = BusinessType.INSERT)
103 102 @PostMapping("/add")
104 103 @ResponseBody
... ... @@ -124,7 +123,7 @@ public class ContainerController extends BaseController {
124 123 * 修改保存容器
125 124 */
126 125 @ApiOperation(value="修改容器", notes="修改容器", httpMethod = "POST")
127   - @RequiresPermissions("general:container:edit")
  126 + @RequiresPermissions("config:container:edit")
128 127 @Log(title = "通用-容器", operating = "修改容器", action = BusinessType.UPDATE)
129 128 @PostMapping("/edit")
130 129 @ResponseBody
... ... @@ -137,7 +136,7 @@ public class ContainerController extends BaseController {
137 136 * 删除容器
138 137 */
139 138 @ApiOperation(value="删除容器", notes="根据id批量删除容器，参数示例1,2,3", httpMethod = "POST")
140   - @RequiresPermissions("general:container:remove")
  139 + @RequiresPermissions("config:container:remove")
141 140 @Log(title = "通用-容器", operating = "删除容器", action = BusinessType.DELETE)
142 141 @PostMapping( "/remove")
143 142 @ResponseBody
... ...
src/main/java/com/huaheng/pc/general/container/domain/Container.java renamed to src/main/java/com/huaheng/pc/config/container/domain/Container.java
  View file @45137af
1   -package com.huaheng.pc.general.container.domain;
  1 +package com.huaheng.pc.config.container.domain;
2 2  
3 3 import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
... ... @@ -13,7 +13,7 @@ import java.io.Serializable;
13 13 import java.util.Date;
14 14  
15 15 @Data
16   -@ApiModel(value="com.huaheng.pc.general.container.domain.Container")
  16 +@ApiModel(value="com.huaheng.pc.config.container.domain.Container")
17 17 @TableName(value = "container")
18 18 public class Container implements Serializable {
19 19 /**
... ...
src/main/java/com/huaheng/pc/general/container/domain/ContainerStatus.java renamed to src/main/java/com/huaheng/pc/config/container/domain/ContainerStatus.java
  View file @45137af
1   -package com.huaheng.pc.general.container.domain;
  1 +package com.huaheng.pc.config.container.domain;
2 2  
3 3 public enum ContainerStatus {
4 4 empty,
... ...
src/main/java/com/huaheng/pc/general/container/mapper/ContainerMapper.java renamed to src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java
  View file @45137af
1   -package com.huaheng.pc.general.container.mapper;
  1 +package com.huaheng.pc.config.container.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.general.container.domain.Container;
  4 +import com.huaheng.pc.config.container.domain.Container;
5 5  
6 6 public interface ContainerMapper extends BaseMapper<Container> {
7 7  
... ...
src/main/java/com/huaheng/pc/general/container/service/ContainerService.java renamed to src/main/java/com/huaheng/pc/config/container/service/ContainerService.java
  View file @45137af
1   -package com.huaheng.pc.general.container.service;
  1 +package com.huaheng.pc.config.container.service;
2 2  
3 3 import com.huaheng.framework.web.domain.AjaxResult;
4   -import com.huaheng.pc.general.container.domain.Container;
  4 +import com.huaheng.pc.config.container.domain.Container;
5 5 import com.baomidou.mybatisplus.extension.service.IService;
6   -import com.huaheng.pc.general.material.domain.Material;
7 6  
8 7 import java.util.List;
9 8  
... ...
src/main/java/com/huaheng/pc/general/container/service/ContainerServiceImpl.java renamed to src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java
  View file @45137af
1   -package com.huaheng.pc.general.container.service;
  1 +package com.huaheng.pc.config.container.service;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
... ... @@ -7,20 +7,17 @@ import com.huaheng.common.exception.service.ServiceException;
7 7 import com.huaheng.common.utils.StringUtils;
8 8 import com.huaheng.common.utils.security.ShiroUtils;
9 9 import com.huaheng.framework.web.domain.AjaxResult;
10   -import com.huaheng.pc.config.containerType.domain.ContainerType;
11 10 import com.huaheng.pc.config.containerType.service.ContainerTypeService;
12   -import com.huaheng.pc.general.container.domain.ContainerStatus;
13   -import com.huaheng.pc.general.material.domain.Material;
14   -import org.apache.commons.collections.functors.ConstantFactory;
  11 +import com.huaheng.pc.config.container.domain.ContainerStatus;
15 12 import org.springframework.stereotype.Service;
16 13 import javax.annotation.Resource;
17 14 import java.util.ArrayList;
18 15 import java.util.Date;
19 16 import java.util.List;
20 17 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
21   -import com.huaheng.pc.general.container.domain.Container;
22   -import com.huaheng.pc.general.container.mapper.ContainerMapper;
23   -import com.huaheng.pc.general.container.service.ContainerService;
  18 +import com.huaheng.pc.config.container.domain.Container;
  19 +import com.huaheng.pc.config.container.mapper.ContainerMapper;
  20 +
24 21 @Service
25 22 public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container> implements ContainerService{
26 23  
... ...
src/main/java/com/huaheng/pc/config/containerCapacity/controller/ContainerCapacityController.java
  View file @45137af
... ... @@ -16,8 +16,7 @@ import com.huaheng.framework.web.page.TableDataInfo;
16 16 import com.huaheng.framework.web.page.TableSupport;
17 17 import com.huaheng.pc.config.containerCapacity.domain.ContainerCapacity;
18 18 import com.huaheng.pc.config.containerCapacity.service.ContainerCapacityService;
19   -import com.huaheng.pc.general.material.domain.Material;
20   -import com.huaheng.pc.general.material.service.MaterialService;
  19 +import com.huaheng.pc.config.material.service.MaterialService;
21 20 import org.apache.shiro.authz.annotation.RequiresPermissions;
22 21 import org.springframework.beans.factory.annotation.Autowired;
23 22 import org.springframework.stereotype.Controller;
... ...
src/main/java/com/huaheng/pc/config/containerCapacity/service/ContainerCapacityServiceImpl.java
  View file @45137af
... ... @@ -7,8 +7,8 @@ import com.huaheng.common.utils.security.ShiroUtils;
7 7 import com.huaheng.framework.web.domain.AjaxResult;
8 8 import com.huaheng.pc.config.containerType.domain.ContainerType;
9 9 import com.huaheng.pc.config.containerType.service.ContainerTypeService;
10   -import com.huaheng.pc.general.material.domain.Material;
11   -import com.huaheng.pc.general.material.service.MaterialService;
  10 +import com.huaheng.pc.config.material.domain.Material;
  11 +import com.huaheng.pc.config.material.service.MaterialService;
12 12 import org.springframework.beans.factory.annotation.Autowired;
13 13 import org.springframework.stereotype.Service;
14 14 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
... ...
src/main/java/com/huaheng/pc/general/customer/controller/CustomerController.java renamed to src/main/java/com/huaheng/pc/config/customer/controller/CustomerController.java
  View file @45137af
1   -package com.huaheng.pc.general.customer.controller;
  1 +package com.huaheng.pc.config.customer.controller;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.metadata.IPage;
... ... @@ -14,8 +14,8 @@ import com.huaheng.framework.web.domain.AjaxResult;
14 14 import com.huaheng.framework.web.page.PageDomain;
15 15 import com.huaheng.framework.web.page.TableDataInfo;
16 16 import com.huaheng.framework.web.page.TableSupport;
17   -import com.huaheng.pc.general.customer.domain.Customer;
18   -import com.huaheng.pc.general.customer.service.CustomerService;
  17 +import com.huaheng.pc.config.customer.domain.Customer;
  18 +import com.huaheng.pc.config.customer.service.CustomerServiceImpl;
19 19 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
20 20 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
21 21 import io.swagger.annotations.Api;
... ... @@ -32,17 +32,17 @@ import java.util.Map;
32 32  
33 33 @Api(tags={"客户操作类"})
34 34 @Controller
35   -@RequestMapping("/general/customer")
  35 +@RequestMapping("/config/customer")
36 36 public class CustomerController extends BaseController {
37 37  
38   - private String prefix = "general/customer";
  38 + private String prefix = "config/customer";
39 39  
40 40 @Resource
41   - private CustomerService customerService;
  41 + private CustomerServiceImpl customerService;
42 42 @Resource
43 43 private ShipmentHeaderService shipmentHeaderService;
44 44  
45   - @RequiresPermissions("general:customer:view")
  45 + @RequiresPermissions("config:customer:view")
46 46 @GetMapping()
47 47 public String customer(){
48 48 return prefix + "/customer";
... ... @@ -52,11 +52,11 @@ public class CustomerController extends BaseController {
52 52 * 查询客户列表
53 53 */
54 54 @ApiOperation(value="查看客户列表", notes="根据编码、名称、创建时间获取客户的详细信息", httpMethod = "POST")
55   - @RequiresPermissions("general:customer:list")
  55 + @RequiresPermissions("config:customer:list")
56 56 @Log(title = "通用-客户管理",operating = "查看客户信息", action = BusinessType.GRANT)
57 57 @PostMapping("/list")
58 58 @ResponseBody
59   - public TableDataInfo list(@ApiParam(name="customer",value="编码、名称")Customer customer,
  59 + public TableDataInfo list(@ApiParam(name="customer",value="编码、名称") Customer customer,
60 60 @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
61 61 @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd){
62 62 LambdaQueryWrapper<Customer> lambdaQueryWrapper = Wrappers.lambdaQuery();
... ... @@ -94,7 +94,7 @@ public class CustomerController extends BaseController {
94 94 * 新增保存客户
95 95 */
96 96 @ApiOperation(value="新增客户", notes="新增客户", httpMethod = "POST")
97   - @RequiresPermissions("general:customer:add")
  97 + @RequiresPermissions("config:customer:add")
98 98 @Log(title = "通用-客户管理",operating = "新增客户", action = BusinessType.INSERT)
99 99 @PostMapping("/add")
100 100 @ResponseBody
... ... @@ -120,7 +120,7 @@ public class CustomerController extends BaseController {
120 120 * 修改保存客户
121 121 */
122 122 @ApiOperation(value="修改客户信息", notes="修改客户信息", httpMethod = "POST")
123   - @RequiresPermissions("general:customer:edit")
  123 + @RequiresPermissions("config:customer:edit")
124 124 @Log(title = "通用-客户管理",operating = "修改客户信息", action = BusinessType.UPDATE)
125 125 @PostMapping("/edit")
126 126 @ResponseBody
... ... @@ -133,7 +133,7 @@ public class CustomerController extends BaseController {
133 133 * 删除客户
134 134 */
135 135 @ApiOperation(value="删除客户信息", notes="单条删除或批量删除客户信息，示例1或1,2,3", httpMethod = "POST")
136   - @RequiresPermissions("general:customer:remove")
  136 + @RequiresPermissions("config:customer:remove")
137 137 @Log(title = "通用-客户管理",operating = "修改客户", action = BusinessType.DELETE)
138 138 @PostMapping( "/remove")
139 139 @ResponseBody
... ...
src/main/java/com/huaheng/pc/general/customer/domain/Customer.java renamed to src/main/java/com/huaheng/pc/config/customer/domain/Customer.java
  View file @45137af
1   -package com.huaheng.pc.general.customer.domain;
  1 +package com.huaheng.pc.config.customer.domain;
2 2  
3 3 import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
... ...
src/main/java/com/huaheng/pc/general/customer/mapper/CustomerMapper.java renamed to src/main/java/com/huaheng/pc/config/customer/mapper/CustomerMapper.java
  View file @45137af
1   -package com.huaheng.pc.general.customer.mapper;
  1 +package com.huaheng.pc.config.customer.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.general.customer.domain.Customer;
  4 +import com.huaheng.pc.config.customer.domain.Customer;
5 5  
6 6 public interface CustomerMapper extends BaseMapper<Customer> {
7 7 }
8 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/customer/service/CustomerServiceImpl.java 0 → 100644
  View file @45137af
  1 +package com.huaheng.pc.config.customer.service;
  2 +
  3 +import com.baomidou.mybatisplus.extension.service.IService;
  4 +import com.huaheng.pc.config.customer.domain.Customer;
  5 +import com.huaheng.pc.config.customer.mapper.CustomerMapper;
  6 +import org.springframework.stereotype.Service;
  7 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  8 +
  9 +@Service
  10 +public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements IService<Customer> {
  11 +
  12 +}
... ...
src/main/java/com/huaheng/pc/general/location/controller/LocationController.java renamed to src/main/java/com/huaheng/pc/config/location/controller/LocationController.java
  View file @45137af
1   -package com.huaheng.pc.general.location.controller;
  1 +package com.huaheng.pc.config.location.controller;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.metadata.IPage;
... ... @@ -14,8 +14,8 @@ import com.huaheng.framework.web.domain.AjaxResult;
14 14 import com.huaheng.framework.web.page.PageDomain;
15 15 import com.huaheng.framework.web.page.TableDataInfo;
16 16 import com.huaheng.framework.web.page.TableSupport;
17   -import com.huaheng.pc.general.location.domain.Location;
18   -import com.huaheng.pc.general.location.service.LocationService;
  17 +import com.huaheng.pc.config.location.domain.Location;
  18 +import com.huaheng.pc.config.location.service.LocationService;
19 19 import io.swagger.annotations.Api;
20 20 import io.swagger.annotations.ApiOperation;
21 21 import io.swagger.annotations.ApiParam;
... ... @@ -29,15 +29,15 @@ import java.util.List;
29 29  
30 30 @Api(tags={"库位操作类"})
31 31 @Controller
32   -@RequestMapping("/general/location")
  32 +@RequestMapping("/config/location")
33 33 public class LocationController extends BaseController {
34 34  
35   - private String prefix = "general/location";
  35 + private String prefix = "config/location";
36 36  
37 37 @Resource
38 38 private LocationService locationService;
39 39  
40   - @RequiresPermissions("general:location:view")
  40 + @RequiresPermissions("config:location:view")
41 41 @GetMapping()
42 42 public String location() {
43 43 return prefix + "/location";
... ... @@ -49,7 +49,7 @@ public class LocationController extends BaseController {
49 49 @ApiOperation(value="查看库位列表",
50 50 notes="根据行、列、层、格、库位类型、库区、库位状态、容器编码、库位名称、库位编码、创建时间获取库位的详细信息",
51 51 httpMethod = "POST")
52   - @RequiresPermissions("general:location:list")
  52 + @RequiresPermissions("config:location:list")
53 53 @Log(title = "通用-库位管理", operating = "查看库位列表", action = BusinessType.GRANT)
54 54 @PostMapping("/list")
55 55 @ResponseBody
... ... @@ -99,7 +99,7 @@ public class LocationController extends BaseController {
99 99 * 新增保存库位
100 100 */
101 101 @ApiOperation(value="新增库位", notes="新增单个库位", httpMethod = "POST")
102   - @RequiresPermissions("general:location:add")
  102 + @RequiresPermissions("config:location:add")
103 103 @Log(title = "通用-库位管理", operating = "新增库位", action = BusinessType.INSERT)
104 104 @PostMapping("/add")
105 105 @ResponseBody
... ... @@ -122,7 +122,7 @@ public class LocationController extends BaseController {
122 122 /**
123 123 * 批量新增保存库位
124 124 */
125   - @RequiresPermissions("general:location:add")
  125 + @RequiresPermissions("config:location:add")
126 126 @ApiOperation(value="新增库位", notes="批量新增库位", httpMethod = "POST")
127 127 @Log(title = "通用-库位管理", operating = "新增库位", action = BusinessType.INSERT)
128 128 @PostMapping("/addBatchSave")
... ... @@ -143,7 +143,7 @@ public class LocationController extends BaseController {
143 143 /**
144 144 * 修改保存库位
145 145 */
146   - @RequiresPermissions("general:location:edit")
  146 + @RequiresPermissions("config:location:edit")
147 147 @ApiOperation(value="修改库位", notes="批量修改库位", httpMethod = "POST")
148 148 @Log(title = "通用-库位管理", operating = "修改库位", action = BusinessType.UPDATE)
149 149 @PostMapping("/edit")
... ... @@ -156,7 +156,7 @@ public class LocationController extends BaseController {
156 156 /**
157 157 * 删除库位
158 158 */
159   - @RequiresPermissions("general:location:remove")
  159 + @RequiresPermissions("config:location:remove")
160 160 @Log(title = "通用-库位管理", operating = "删除库位", action = BusinessType.DELETE)
161 161 @ApiOperation(value="删除库位", notes="批量删除库位", httpMethod = "POST")
162 162 @PostMapping( "/remove")
... ...
src/main/java/com/huaheng/pc/general/location/domain/Location.java renamed to src/main/java/com/huaheng/pc/config/location/domain/Location.java
  View file @45137af
1   -package com.huaheng.pc.general.location.domain;
  1 +package com.huaheng.pc.config.location.domain;
2 2  
3 3 import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
... ...
src/main/java/com/huaheng/pc/general/location/mapper/LocationMapper.java renamed to src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java
  View file @45137af
1   -package com.huaheng.pc.general.location.mapper;
  1 +package com.huaheng.pc.config.location.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.general.location.domain.Location;
  4 +import com.huaheng.pc.config.location.domain.Location;
5 5 import org.apache.ibatis.annotations.Param;
6 6  
7 7 public interface LocationMapper extends BaseMapper<Location> {
... ...
src/main/java/com/huaheng/pc/general/location/service/LocationService.java renamed to src/main/java/com/huaheng/pc/config/location/service/LocationService.java
  View file @45137af
1   -package com.huaheng.pc.general.location.service;
  1 +package com.huaheng.pc.config.location.service;
2 2  
3   -import com.huaheng.pc.general.location.domain.Location;
  3 +import com.huaheng.pc.config.location.domain.Location;
4 4 import com.baomidou.mybatisplus.extension.service.IService;
5 5 public interface LocationService extends IService<Location>{
6 6  
... ...
src/main/java/com/huaheng/pc/general/location/service/LocationServiceImpl.java renamed to src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
  View file @45137af
1   -package com.huaheng.pc.general.location.service;
  1 +package com.huaheng.pc.config.location.service;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
... ... @@ -18,9 +18,9 @@ import java.util.List;
18 18 import java.util.Map;
19 19  
20 20 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
21   -import com.huaheng.pc.general.location.domain.Location;
22   -import com.huaheng.pc.general.location.mapper.LocationMapper;
23   -import com.huaheng.pc.general.location.service.LocationService;
  21 +import com.huaheng.pc.config.location.domain.Location;
  22 +import com.huaheng.pc.config.location.mapper.LocationMapper;
  23 +
24 24 @Service("LocationService")
25 25 public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> implements LocationService{
26 26  
... ...
src/main/java/com/huaheng/pc/general/material/controller/MaterialController.java renamed to src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java
  View file @45137af
1   -package com.huaheng.pc.general.material.controller;
  1 +package com.huaheng.pc.config.material.controller;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
6 6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7   -import com.huaheng.common.support.Convert;
8 7 import com.huaheng.common.utils.StringUtils;
9 8 import com.huaheng.common.utils.poi.ExcelUtil;
10 9 import com.huaheng.common.utils.security.ShiroUtils;
... ... @@ -15,13 +14,10 @@ import com.huaheng.framework.web.domain.AjaxResult;
15 14 import com.huaheng.framework.web.page.PageDomain;
16 15 import com.huaheng.framework.web.page.TableDataInfo;
17 16 import com.huaheng.framework.web.page.TableSupport;
18   -import com.huaheng.pc.general.location.domain.Location;
19   -import com.huaheng.pc.general.location.service.LocationService;
20   -import com.huaheng.pc.general.material.domain.Material;
21   -import com.huaheng.pc.general.material.service.MaterialService;
22   -import com.huaheng.pc.general.materialUnit.domain.MaterialUnit;
23   -import com.huaheng.pc.general.materialUnit.service.MaterialUnitService;
24   -import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
  17 +import com.huaheng.pc.config.materialUnit.domain.MaterialUnit;
  18 +import com.huaheng.pc.config.materialUnit.service.MaterialUnitService;
  19 +import com.huaheng.pc.config.material.domain.Material;
  20 +import com.huaheng.pc.config.material.service.MaterialService;
25 21 import io.swagger.annotations.Api;
26 22 import io.swagger.annotations.ApiOperation;
27 23 import io.swagger.annotations.ApiParam;
... ... @@ -37,10 +33,10 @@ import java.util.Map;
37 33  
38 34 @Api(tags={"物料控制类"})
39 35 @Controller
40   -@RequestMapping("/general/material")
  36 +@RequestMapping("/config/material")
41 37 public class MaterialController extends BaseController {
42 38  
43   - private String prefix = "general/material";
  39 + private String prefix = "config/material";
44 40  
45 41 @Resource
46 42 private MaterialService materialService;
... ... @@ -48,7 +44,7 @@ public class MaterialController extends BaseController {
48 44 @Resource
49 45 private MaterialUnitService materialUnitService;
50 46  
51   - @RequiresPermissions("general:material:view")
  47 + @RequiresPermissions("config:material:view")
52 48 @GetMapping()
53 49 public String material() {
54 50 return prefix + "/material";
... ... @@ -60,7 +56,7 @@ public class MaterialController extends BaseController {
60 56 @ApiOperation(value="查看物料列表",
61 57 notes="根据物料编码、名称、规格、物料类别、创建时间获取物料的详细信息",
62 58 httpMethod = "POST")
63   - @RequiresPermissions("general:material:list")
  59 + @RequiresPermissions("config:material:list")
64 60 @Log(title = "通用-物料管理", operating = "查看物料列表", action = BusinessType.GRANT)
65 61 @PostMapping("/list")
66 62 @ResponseBody
... ... @@ -106,7 +102,7 @@ public class MaterialController extends BaseController {
106 102 * 新增保存物料
107 103 */
108 104 @ApiOperation(value="新增物料", notes="新增物料", httpMethod = "POST")
109   - @RequiresPermissions("general:material:add")
  105 + @RequiresPermissions("config:material:add")
110 106 @Log(title = "通用-物料管理", operating = "新增物料", action = BusinessType.INSERT)
111 107 @PostMapping("/add")
112 108 @ResponseBody
... ... @@ -157,7 +153,7 @@ public class MaterialController extends BaseController {
157 153 * 修改保存物料
158 154 */
159 155 @ApiOperation(value="修改物料", notes="修改物料", httpMethod = "POST")
160   - @RequiresPermissions("general:material:edit")
  156 + @RequiresPermissions("config:material:edit")
161 157 @Log(title = "通用-物料管理", operating = "修改物料", action = BusinessType.UPDATE)
162 158 @PostMapping("/edit")
163 159 @ResponseBody
... ... @@ -169,7 +165,7 @@ public class MaterialController extends BaseController {
169 165 /**
170 166 * 删除物料
171 167 */
172   - @RequiresPermissions("general:material:remove")
  168 + @RequiresPermissions("config:material:remove")
173 169 @Log(title = "通用-物料管理", operating = "删除物料", action = BusinessType.DELETE)
174 170 @PostMapping( "/remove")
175 171 @ResponseBody
... ...
src/main/java/com/huaheng/pc/general/material/domain/Material.java renamed to src/main/java/com/huaheng/pc/config/material/domain/Material.java
  View file @45137af
1   -package com.huaheng.pc.general.material.domain;
  1 +package com.huaheng.pc.config.material.domain;
2 2  
3 3 import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
... ... @@ -11,7 +11,7 @@ import java.io.Serializable;
11 11 import java.util.Date;
12 12 import lombok.Data;
13 13  
14   -@ApiModel(value="com.huaheng.pc.general.material.domain.Material")
  14 +@ApiModel(value="com.huaheng.pc.config.material.domain.Material")
15 15 @Data
16 16 @TableName(value = "material")
17 17 public class Material implements Serializable {
... ...
src/main/java/com/huaheng/pc/general/material/mapper/MaterialMapper.java renamed to src/main/java/com/huaheng/pc/config/material/mapper/MaterialMapper.java
  View file @45137af
1   -package com.huaheng.pc.general.material.mapper;
  1 +package com.huaheng.pc.config.material.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.general.material.domain.Material;
  4 +import com.huaheng.pc.config.material.domain.Material;
5 5  
6 6 public interface MaterialMapper extends BaseMapper<Material> {
7 7 }
8 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/general/material/service/MaterialService.java renamed to src/main/java/com/huaheng/pc/config/material/service/MaterialService.java
  View file @45137af
1   -package com.huaheng.pc.general.material.service;
  1 +package com.huaheng.pc.config.material.service;
2 2  
3 3 import com.huaheng.framework.web.domain.AjaxResult;
4   -import com.huaheng.pc.general.material.domain.Material;
  4 +import com.huaheng.pc.config.material.domain.Material;
5 5 import com.baomidou.mybatisplus.extension.service.IService;
6 6  
7 7 import java.util.List;
... ...
src/main/java/com/huaheng/pc/general/material/service/MaterialServiceImpl.java renamed to src/main/java/com/huaheng/pc/config/material/service/MaterialServiceImpl.java
  View file @45137af
1   -package com.huaheng.pc.general.material.service;
  1 +package com.huaheng.pc.config.material.service;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
... ... @@ -15,10 +15,8 @@ import java.util.List;
15 15 import java.util.Map;
16 16  
17 17 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
18   -import com.huaheng.pc.general.material.mapper.MaterialMapper;
19   -import com.huaheng.pc.general.material.domain.Material;
20   -import com.huaheng.pc.general.material.service.MaterialService;
21   -import org.springframework.transaction.annotation.Transactional;
  18 +import com.huaheng.pc.config.material.mapper.MaterialMapper;
  19 +import com.huaheng.pc.config.material.domain.Material;
22 20  
23 21 @Service
24 22 public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> implements MaterialService{
... ...
src/main/java/com/huaheng/pc/config/materialMultiple/controller/MaterialMultipleController.java 0 → 100644
  View file @45137af
  1 +package com.huaheng.pc.config.materialMultiple.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.materialMultiple.domain.MaterialMultiple;
  18 +import com.huaheng.pc.config.materialMultiple.service.MaterialMultipleServiceImpl;
  19 +import io.swagger.annotations.ApiOperation;
  20 +import io.swagger.annotations.ApiParam;
  21 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  22 +import org.springframework.stereotype.Controller;
  23 +import org.springframework.ui.ModelMap;
  24 +import org.springframework.web.bind.annotation.*;
  25 +
  26 +import javax.annotation.Resource;
  27 +import java.util.ArrayList;
  28 +import java.util.List;
  29 +
  30 +@Controller
  31 +@RequestMapping("/config/materialMultiple")
  32 +public class MaterialMultipleController extends BaseController {
  33 +
  34 + @Resource
  35 + private MaterialMultipleServiceImpl materialMultipleService;
  36 +
  37 + private String prefix = "config/materialMultiple";
  38 +
  39 + @RequiresPermissions("config:materialMultiple:view")
  40 + @GetMapping()
  41 + public String materialMultiple() {
  42 + return prefix + "/materialMultiple";
  43 + }
  44 +
  45 + /**
  46 + * 查询单位转换列表
  47 + */
  48 + @ApiOperation(value="查看单位转换列表", notes="根据物料编码、名称、创建时间获取单位转换列表", httpMethod = "POST")
  49 + @RequiresPermissions("config:materialMultiple:list")
  50 + @Log(title = "配置-单位转换",operating = "单位转换列表", action = BusinessType.GRANT)
  51 + @PostMapping("/list")
  52 + @ResponseBody
  53 + public TableDataInfo list(@ApiParam(name="receiptType",value="物料编码、名称") MaterialMultiple materialMultiple,
  54 + @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
  55 + @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
  56 + LambdaQueryWrapper<MaterialMultiple> lambdaQueryWrapper = Wrappers.lambdaQuery();
  57 + PageDomain pageDomain = TableSupport.buildPageRequest();
  58 + Integer pageNum = pageDomain.getPageNum();
  59 + Integer pageSize = pageDomain.getPageSize();
  60 + lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), MaterialMultiple::getCreated, createdBegin)
  61 + .lt(StringUtils.isNotEmpty(createdEnd), MaterialMultiple::getCreated, createdEnd)
  62 + .eq(StringUtils.isNotEmpty(materialMultiple.getMaterialCode()), MaterialMultiple::getMaterialCode, materialMultiple.getMaterialCode())
  63 + .eq(StringUtils.isNotEmpty(materialMultiple.getMaterialName()), MaterialMultiple::getMaterialName, materialMultiple.getMaterialName())
  64 + .in(MaterialMultiple::getCompanyCode, ShiroUtils.getCompanyCodeList())
  65 + .eq(MaterialMultiple::getWarehouseCode, ShiroUtils.getWarehouseCode());
  66 +
  67 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  68 + /*使用分页查询*/
  69 + Page<MaterialMultiple> page = new Page<>(pageNum, pageSize);
  70 + IPage<MaterialMultiple> iPage = materialMultipleService.page(page, lambdaQueryWrapper);
  71 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
  72 + } else {
  73 + List<MaterialMultiple> list = materialMultipleService.list(lambdaQueryWrapper);
  74 + return getDataTable(list);
  75 + }
  76 + }
  77 +
  78 + /**
  79 + * 新增单位转换
  80 + */
  81 + @GetMapping("/add")
  82 + public String add() {
  83 + return prefix + "/add";
  84 + }
  85 +
  86 + /**
  87 + * 新增保存单位转换
  88 + */
  89 + @ApiOperation(value="新增单位转换", notes="新增单位转换", httpMethod = "POST")
  90 + @RequiresPermissions("config:materialMultiple:add")
  91 + @Log(title = "配置-单位转换",operating = "新增单位转换", action = BusinessType.INSERT)
  92 + @PostMapping("/add")
  93 + @ResponseBody
  94 + public AjaxResult addSave(MaterialMultiple materialMultiple) {
  95 + LambdaQueryWrapper<MaterialMultiple> lambda = Wrappers.lambdaQuery();
  96 + lambda.eq(MaterialMultiple::getCompanyCode,materialMultiple.getCompanyCode())
  97 + .eq(MaterialMultiple::getMaterialCode, materialMultiple)
  98 + .eq(MaterialMultiple::getWarehouseCode, ShiroUtils.getWarehouseCode())
  99 + .eq(MaterialMultiple::getUnitId1, materialMultiple.getUnitId1())
  100 + .eq(MaterialMultiple::getUnitId2, materialMultiple.getUnitId2());
  101 + if (materialMultipleService.list(lambda) == null){
  102 + return AjaxResult.error("该信息已存在");
  103 + }
  104 + materialMultiple.setCreatedBy(ShiroUtils.getLoginName());
  105 + materialMultiple.setLastUpdatedBy(ShiroUtils.getLoginName());
  106 + return toAjax(materialMultipleService.save(materialMultiple));
  107 + }
  108 +
  109 + /**
  110 + * 修改单位转换
  111 + */
  112 + @GetMapping("/edit/{id}")
  113 + public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
  114 + MaterialMultiple materialMultiple = materialMultipleService.getById(id);
  115 + mmap.put("materialMultiple", materialMultiple);
  116 + return prefix + "/edit";
  117 + }
  118 +
  119 + /**
  120 + * 修改保存单位转换
  121 + */
  122 + @ApiOperation(value="修改单位转换信息", notes="修改单位转换信息", httpMethod = "POST")
  123 + @RequiresPermissions("config:materialMultiple:edit")
  124 + @Log(title = "配置-单位转换",operating = "修改单位转换", action = BusinessType.UPDATE)
  125 + @PostMapping("/edit")
  126 + @ResponseBody
  127 + public AjaxResult editSave(MaterialMultiple materialMultiple) {
  128 + materialMultiple.setLastUpdatedBy(ShiroUtils.getLoginName());
  129 + return toAjax(materialMultipleService.updateById(materialMultiple));
  130 + }
  131 +
  132 + /**
  133 + * 删除单位转换
  134 + */
  135 + @ApiOperation(value="删除单位转换", notes="单条删除或批量删除单位转换，示例1或1,2,3", httpMethod = "POST")
  136 + @RequiresPermissions("config:materialMultiple:remove")
  137 + @Log(title = "配置-单位转换",operating = "删除单位转换", action = BusinessType.DELETE)
  138 + @PostMapping( "/remove")
  139 + @ResponseBody
  140 + public AjaxResult remove(String ids) {
  141 + if (StringUtils.isEmpty(ids)) {
  142 + return AjaxResult.error("id不能为空");
  143 + }
  144 + List<Integer> list = new ArrayList<>();
  145 + for (Integer id : Convert.toIntArray(ids)) {
  146 + list.add(id);
  147 + }
  148 + return toAjax(materialMultipleService.removeByIds(list));
  149 + }
  150 +}
... ...
src/main/java/com/huaheng/pc/config/materialMultiple/domain/MaterialMultiple.java 0 → 100644
  View file @45137af
  1 +package com.huaheng.pc.config.materialMultiple.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.util.Date;
  11 +import lombok.Data;
  12 +
  13 +@ApiModel(value="com.huaheng.pc.config.materialMultiple.domain.MaterialMultiple")
  14 +@Data
  15 +@TableName(value = "material_multiple")
  16 +public class MaterialMultiple implements Serializable {
  17 + /**
  18 + * ID
  19 + */
  20 + @TableId(value = "id", type = IdType.AUTO)
  21 + @ApiModelProperty(value="ID")
  22 + private Integer id;
  23 +
  24 + /**
  25 + * 编码
  26 + */
  27 + @TableField(value = "materialCode")
  28 + @ApiModelProperty(value="编码")
  29 + private String materialCode;
  30 +
  31 + /**
  32 + * 名称
  33 + */
  34 + @TableField(value = "materialName")
  35 + @ApiModelProperty(value="名称")
  36 + private String materialName;
  37 +
  38 + /**
  39 + * 规格
  40 + */
  41 + @TableField(value = "materialSpec")
  42 + @ApiModelProperty(value="规格")
  43 + private String materialSpec;
  44 +
  45 + /**
  46 + * 货主编码
  47 + */
  48 + @TableField(value = "companyCode")
  49 + @ApiModelProperty(value="货主编码")
  50 + private String companyCode;
  51 +
  52 + /**
  53 + * 仓库编码
  54 + */
  55 + @TableField(value = "warehouseCode")
  56 + @ApiModelProperty(value="仓库编码")
  57 + private String warehouseCode;
  58 +
  59 + /**
  60 + * 单位1
  61 + */
  62 + @TableField(value = "unitId1")
  63 + @ApiModelProperty(value="单位1")
  64 + private String unitId1;
  65 +
  66 + /**
  67 + * 单位2
  68 + */
  69 + @TableField(value = "unitId2")
  70 + @ApiModelProperty(value="单位2")
  71 + private String unitId2;
  72 +
  73 + /**
  74 + * 单位1转单位2换算倍数
  75 + */
  76 + @TableField(value = "multiple")
  77 + @ApiModelProperty(value="单位1转单位2换算倍数")
  78 + private Double multiple;
  79 +
  80 + /**
  81 + * 状态
  82 + */
  83 + @TableField(value = "enable")
  84 + @ApiModelProperty(value="状态")
  85 + private Integer enable;
  86 +
  87 + /**
  88 + * 创建时间
  89 + */
  90 + @TableField(value = "created")
  91 + @ApiModelProperty(value="创建时间")
  92 + private Date created;
  93 +
  94 + /**
  95 + * 创建用户
  96 + */
  97 + @TableField(value = "createdBy")
  98 + @ApiModelProperty(value="创建用户")
  99 + private String createdBy;
  100 +
  101 + /**
  102 + * 创建时间
  103 + */
  104 + @TableField(value = "lastUpdated")
  105 + @ApiModelProperty(value="创建时间")
  106 + private Date lastUpdated;
  107 +
  108 + /**
  109 + * 更新用户
  110 + */
  111 + @TableField(value = "lastUpdatedBy")
  112 + @ApiModelProperty(value="更新用户")
  113 + private String lastUpdatedBy;
  114 +
  115 + /**
  116 + * 数据版本
  117 + */
  118 + @TableField(value = "version")
  119 + @ApiModelProperty(value="数据版本")
  120 + private Integer version;
  121 +
  122 + /**
  123 + * 自定义字段1
  124 + */
  125 + @TableField(value = "userDef1")
  126 + @ApiModelProperty(value="自定义字段1")
  127 + private String userDef1;
  128 +
  129 + /**
  130 + * 自定义字段2
  131 + */
  132 + @TableField(value = "userDef2")
  133 + @ApiModelProperty(value="自定义字段2")
  134 + private String userDef2;
  135 +
  136 + /**
  137 + * 自定义字段3
  138 + */
  139 + @TableField(value = "userDef3")
  140 + @ApiModelProperty(value="自定义字段3")
  141 + private String userDef3;
  142 +
  143 + /**
  144 + * 自定义字段4
  145 + */
  146 + @TableField(value = "userDef4")
  147 + @ApiModelProperty(value="自定义字段4")
  148 + private String userDef4;
  149 +
  150 + /**
  151 + * 自定义字段5
  152 + */
  153 + @TableField(value = "userDef5")
  154 + @ApiModelProperty(value="自定义字段5")
  155 + private String userDef5;
  156 +
  157 + /**
  158 + * 自定义字段6
  159 + */
  160 + @TableField(value = "userDef6")
  161 + @ApiModelProperty(value="自定义字段6")
  162 + private String userDef6;
  163 +
  164 + /**
  165 + * 自定义字段7
  166 + */
  167 + @TableField(value = "userDef7")
  168 + @ApiModelProperty(value="自定义字段7")
  169 + private String userDef7;
  170 +
  171 + /**
  172 + * 自定义字段8
  173 + */
  174 + @TableField(value = "userDef8")
  175 + @ApiModelProperty(value="自定义字段8")
  176 + private String userDef8;
  177 +
  178 + private static final long serialVersionUID = 1L;
  179 +}
0 180 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/materialMultiple/mapper/MaterialMultipleMapper.java 0 → 100644
  View file @45137af
  1 +package com.huaheng.pc.config.materialMultiple.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.config.materialMultiple.domain.MaterialMultiple;
  5 +
  6 +public interface MaterialMultipleMapper extends BaseMapper<MaterialMultiple> {
  7 +}
0 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/materialMultiple/service/MaterialMultipleServiceImpl.java 0 → 100644
  View file @45137af
  1 +package com.huaheng.pc.config.materialMultiple.service;
  2 +
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  5 +import com.baomidou.mybatisplus.extension.service.IService;
  6 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  7 +import com.huaheng.common.utils.security.ShiroUtils;
  8 +import com.huaheng.pc.config.materialMultiple.domain.MaterialMultiple;
  9 +import com.huaheng.pc.config.materialMultiple.mapper.MaterialMultipleMapper;
  10 +import org.slf4j.Logger;
  11 +import org.slf4j.LoggerFactory;
  12 +import org.springframework.stereotype.Service;
  13 +
  14 +@Service
  15 +public class MaterialMultipleServiceImpl extends ServiceImpl<MaterialMultipleMapper, MaterialMultiple> implements IService<MaterialMultiple> {
  16 +
  17 + private static final Logger log = LoggerFactory.getLogger(MaterialMultipleServiceImpl.class);
  18 +
  19 + /**
  20 + * 单位转换
  21 + * @param materialCode 物料编码
  22 + * @param unit1 单位1
  23 + * @param unit2 单位2
  24 + * @param value 转换值
  25 + * @return 转换后的值，异常返回""
  26 + */
  27 + public String multiple(String materialCode, String unit1, String unit2, String value){
  28 + LambdaQueryWrapper<MaterialMultiple> lambda = Wrappers.lambdaQuery();
  29 + lambda.select(MaterialMultiple::getMultiple)
  30 + .eq(MaterialMultiple::getMaterialCode, materialCode)
  31 + .eq(MaterialMultiple::getUnitId1, unit1)
  32 + .eq(MaterialMultiple::getUnitId2, unit2)
  33 + .eq(MaterialMultiple::getEnable, 1)
  34 + .eq(MaterialMultiple::getWarehouseCode, ShiroUtils.getWarehouseCode());
  35 + try {
  36 + Double multiple = this.getOne(lambda).getMultiple();
  37 + return String.valueOf(Double.parseDouble(value)*multiple);
  38 + } catch (NullPointerException e){
  39 + log.info("查询不到物料编码："+materialCode+"，单位："+unit1+", "+unit2+"的转换系数");
  40 + } catch (Exception e){
  41 + log.info("查询不到物料编码："+materialCode+"，单位："+unit1+", "+unit2+"的转换系数出错");
  42 + }
  43 +
  44 + return "";
  45 + }
  46 +}
... ...
src/main/java/com/huaheng/pc/config/materialUnit/controller/MaterialUnitController.java 0 → 100644
  View file @45137af
  1 +package com.huaheng.pc.config.materialUnit.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.materialUnit.domain.MaterialUnit;
  18 +import com.huaheng.pc.config.materialUnit.service.MaterialUnitService;
  19 +import com.huaheng.pc.config.material.domain.Material;
  20 +import com.huaheng.pc.config.material.service.MaterialService;
  21 +import io.swagger.annotations.Api;
  22 +import io.swagger.annotations.ApiOperation;
  23 +import io.swagger.annotations.ApiParam;
  24 +import org.apache.shiro.authz.annotation.RequiresPermissions;
  25 +import org.springframework.stereotype.Controller;
  26 +import org.springframework.ui.ModelMap;
  27 +import org.springframework.web.bind.annotation.*;
  28 +
  29 +import javax.annotation.Resource;
  30 +import java.util.ArrayList;
  31 +import java.util.List;
  32 +
  33 +@Api(tags = "单位 ")
  34 +@Controller
  35 +@RequestMapping("/config/materialUnit")
  36 +public class MaterialUnitController extends BaseController {
  37 +
  38 + @Resource
  39 + private MaterialUnitService materialUnitService;
  40 + @Resource
  41 + private MaterialService materialService;
  42 +
  43 + private String prefix = "config/materialUnit";
  44 +
  45 + @RequiresPermissions("config:materialUnit:view")
  46 + @GetMapping()
  47 + public String materialUnit() {
  48 + return prefix + "/materialUnit";
  49 + }
  50 +
  51 + /**
  52 + * 查询单位 列表
  53 + */
  54 + @ApiOperation(value="查看单位 列表", notes="根据物料编码、名称、单位、创建时间获取单位 列表", httpMethod = "POST")
  55 + @RequiresPermissions("config:materialUnit:list")
  56 + @Log(title = "配置-单位 ",operating = "单位 列表", action = BusinessType.GRANT)
  57 + @PostMapping("/list")
  58 + @ResponseBody
  59 + public TableDataInfo list(@ApiParam(name="receiptType",value="料编码、名称、单位") MaterialUnit materialUnit,
  60 + @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
  61 + @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
  62 + LambdaQueryWrapper<MaterialUnit> lambdaQueryWrapper = Wrappers.lambdaQuery();
  63 + PageDomain pageDomain = TableSupport.buildPageRequest();
  64 + Integer pageNum = pageDomain.getPageNum();
  65 + Integer pageSize = pageDomain.getPageSize();
  66 + lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), MaterialUnit::getCreated, createdBegin)
  67 + .lt(StringUtils.isNotEmpty(createdEnd), MaterialUnit::getCreated, createdEnd)
  68 + .eq(StringUtils.isNotEmpty(materialUnit.getMaterialCode()), MaterialUnit::getMaterialCode, materialUnit.getMaterialCode())
  69 + .eq(StringUtils.isNotEmpty(materialUnit.getMaterialName()), MaterialUnit::getMaterialName, materialUnit.getMaterialName())
  70 + .eq(StringUtils.isNotEmpty(materialUnit.getUnit()), MaterialUnit::getUnit, materialUnit.getUnit())
  71 + .in(MaterialUnit::getCompanyCode, ShiroUtils.getCompanyCodeList())
  72 + .eq(MaterialUnit::getWarehouseCode, ShiroUtils.getWarehouseCode());
  73 +
  74 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  75 + /*使用分页查询*/
  76 + Page<MaterialUnit> page = new Page<>(pageNum, pageSize);
  77 + IPage<MaterialUnit> iPage = materialUnitService.page(page, lambdaQueryWrapper);
  78 + return getMpDataTable(iPage.getRecords(), iPage.getTotal());
  79 + } else {
  80 + List<MaterialUnit> list = materialUnitService.list(lambdaQueryWrapper);
  81 + return getDataTable(list);
  82 + }
  83 + }
  84 +
  85 + /**
  86 + * 新增单位
  87 + */
  88 + @GetMapping("/add")
  89 + public String add() {
  90 + return prefix + "/add";
  91 + }
  92 +
  93 + /**
  94 + * 新增保存单位
  95 + */
  96 + @ApiOperation(value="新增单位 ", notes="新增单位 ", httpMethod = "POST")
  97 + @RequiresPermissions("config:materialUnit:add")
  98 + @Log(title = "配置-单位 ",operating = "新增单位 ", action = BusinessType.INSERT)
  99 + @PostMapping("/add")
  100 + @ResponseBody
  101 + public AjaxResult addSave(MaterialUnit materialUnit) {
  102 + LambdaQueryWrapper<Material> lambdaQueryWrapper = Wrappers.lambdaQuery();
  103 + lambdaQueryWrapper.eq(Material::getCode, materialUnit.getMaterialCode());
  104 + Material material = materialService.getOne(lambdaQueryWrapper);
  105 + if (material == null){
  106 + return AjaxResult.error(" 该物料编码不存在");
  107 + }
  108 +
  109 + LambdaQueryWrapper<MaterialUnit> lambda = Wrappers.lambdaQuery();
  110 + lambda.eq(MaterialUnit::getWarehouseCode, ShiroUtils.getWarehouseCode())
  111 + .eq(MaterialUnit::getCompanyCode, materialUnit.getCompanyCode())
  112 + .eq(MaterialUnit::getMaterialCode, materialUnit.getMaterialCode())
  113 + .eq(MaterialUnit::getUnit, materialUnit.getUnit());
  114 + if (materialUnitService.getOne(lambda) != null){
  115 + return AjaxResult.error("当前新增记录已存在");
  116 + }
  117 +
  118 + materialUnit.setMaterialName(material.getName());
  119 + materialUnit.setMaterialSpec(material.getSpec());
  120 + materialUnit.setCreatedBy(ShiroUtils.getLoginName());
  121 + materialUnit.setLastUpdatedBy(ShiroUtils.getLoginName());
  122 + return toAjax(materialUnitService.save(materialUnit));
  123 + }
  124 +
  125 + /**
  126 + * 修改单位
  127 + */
  128 + @GetMapping("/edit/{id}")
  129 + public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
  130 + MaterialUnit materialUnit = materialUnitService.getById(id);
  131 + mmap.put("materialUnit", materialUnit);
  132 + return prefix + "/edit";
  133 + }
  134 +
  135 + /**
  136 + * 修改保存单位
  137 + */
  138 + @ApiOperation(value="修改单位信息", notes="修改单位信息", httpMethod = "POST")
  139 + @RequiresPermissions("config:warehouse:edit")
  140 + @Log(title = "配置-单位 ",operating = "修改单位 ", action = BusinessType.UPDATE)
  141 + @PostMapping("/edit")
  142 + @ResponseBody
  143 + public AjaxResult editSave(MaterialUnit materialUnit) {
  144 + LambdaQueryWrapper<Material> lambdaQueryWrapper = Wrappers.lambdaQuery();
  145 + lambdaQueryWrapper.eq(Material::getCode, materialUnit.getMaterialCode());
  146 + Material material = materialService.getOne(lambdaQueryWrapper);
  147 + if (material == null){
  148 + return AjaxResult.error(" 该物料编码不存在");
  149 + }
  150 +
  151 + LambdaQueryWrapper<MaterialUnit> lambda = Wrappers.lambdaQuery();
  152 + lambda.eq(MaterialUnit::getWarehouseCode, ShiroUtils.getWarehouseCode())
  153 + .eq(MaterialUnit::getCompanyCode, materialUnit.getCompanyCode())
  154 + .eq(MaterialUnit::getMaterialCode, materialUnit.getMaterialCode())
  155 + .eq(MaterialUnit::getUnit, materialUnit.getUnit());
  156 + if (materialUnitService.getOne(lambda) != null){
  157 + return AjaxResult.error("物料编码"+materialUnit.getMaterialCode()+"，d 单位"+material.getUnit()+"已存在记录");
  158 + }
  159 +
  160 + materialUnit.setLastUpdatedBy(ShiroUtils.getLoginName());
  161 + return toAjax(materialUnitService.updateById(materialUnit));
  162 + }
  163 +
  164 + /**
  165 + * 删除单位
  166 + */
  167 + @ApiOperation(value="删除单位 ", notes="单条删除或批量删除单位 ，示例1或1,2,3", httpMethod = "POST")
  168 + @RequiresPermissions("config:receiptType:remove")
  169 + @Log(title = "配置-单位 ",operating = "删除单位 ", action = BusinessType.DELETE)
  170 + @PostMapping( "/remove")
  171 + @ResponseBody
  172 + public AjaxResult remove(String ids) {
  173 + if (StringUtils.isEmpty(ids)) {
  174 + return AjaxResult.error("id不能为空");
  175 + }
  176 + List<Integer> list = new ArrayList<>();
  177 + for (Integer id : Convert.toIntArray(ids)) {
  178 + list.add(id);
  179 + }
  180 + return toAjax(materialUnitService.removeByIds(list));
  181 + }
  182 +}
... ...
src/main/java/com/huaheng/pc/config/materialUnit/domain/MaterialUnit.java 0 → 100644
  View file @45137af
  1 +package com.huaheng.pc.config.materialUnit.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.util.Date;
  11 +import lombok.Data;
  12 +
  13 +@ApiModel(value="com.huaheng.pc.config.materialUnit.domain.MaterialUnit")
  14 +@Data
  15 +@TableName(value = "material_unit")
  16 +public class MaterialUnit implements Serializable {
  17 + /**
  18 + * ID
  19 + */
  20 + @TableId(value = "id", type = IdType.AUTO)
  21 + @ApiModelProperty(value="ID")
  22 + private Integer id;
  23 +
  24 + /**
  25 + * 编码
  26 + */
  27 + @TableField(value = "materialCode")
  28 + @ApiModelProperty(value="编码")
  29 + private String materialCode;
  30 +
  31 + /**
  32 + * 名称
  33 + */
  34 + @TableField(value = "materialName")
  35 + @ApiModelProperty(value="名称")
  36 + private String materialName;
  37 +
  38 + /**
  39 + * 规格
  40 + */
  41 + @TableField(value = "materialSpec")
  42 + @ApiModelProperty(value="规格")
  43 + private String materialSpec;
  44 +
  45 + /**
  46 + * 货主编码
  47 + */
  48 + @TableField(value = "companyCode")
  49 + @ApiModelProperty(value="货主编码")
  50 + private String companyCode;
  51 +
  52 + /**
  53 + * 仓库编码
  54 + */
  55 + @TableField(value = "warehouseCode")
  56 + @ApiModelProperty(value="仓库编码")
  57 + private String warehouseCode;
  58 +
  59 + /**
  60 + * 单位
  61 + */
  62 + @TableField(value = "unit")
  63 + @ApiModelProperty(value="单位")
  64 + private String unit;
  65 +
  66 + /**
  67 + * 顺序
  68 + */
  69 + @TableField(value = "sequence")
  70 + @ApiModelProperty(value="顺序")
  71 + private String sequence;
  72 +
  73 + /**
  74 + * 状态
  75 + */
  76 + @TableField(value = "enable")
  77 + @ApiModelProperty(value="状态")
  78 + private Integer enable;
  79 +
  80 + /**
  81 + * 创建时间
  82 + */
  83 + @TableField(value = "created")
  84 + @ApiModelProperty(value="创建时间")
  85 + private Date created;
  86 +
  87 + /**
  88 + * 创建用户
  89 + */
  90 + @TableField(value = "createdBy")
  91 + @ApiModelProperty(value="创建用户")
  92 + private String createdBy;
  93 +
  94 + /**
  95 + * 创建时间
  96 + */
  97 + @TableField(value = "lastUpdated")
  98 + @ApiModelProperty(value="创建时间")
  99 + private Date lastUpdated;
  100 +
  101 + /**
  102 + * 更新用户
  103 + */
  104 + @TableField(value = "lastUpdatedBy")
  105 + @ApiModelProperty(value="更新用户")
  106 + private String lastUpdatedBy;
  107 +
  108 + /**
  109 + * 数据版本
  110 + */
  111 + @TableField(value = "version")
  112 + @ApiModelProperty(value="数据版本")
  113 + private Integer version;
  114 +
  115 + /**
  116 + * 自定义字段1
  117 + */
  118 + @TableField(value = "userDef1")
  119 + @ApiModelProperty(value="自定义字段1")
  120 + private String userDef1;
  121 +
  122 + /**
  123 + * 自定义字段2
  124 + */
  125 + @TableField(value = "userDef2")
  126 + @ApiModelProperty(value="自定义字段2")
  127 + private String userDef2;
  128 +
  129 + /**
  130 + * 自定义字段3
  131 + */
  132 + @TableField(value = "userDef3")
  133 + @ApiModelProperty(value="自定义字段3")
  134 + private String userDef3;
  135 +
  136 + /**
  137 + * 自定义字段4
  138 + */
  139 + @TableField(value = "userDef4")
  140 + @ApiModelProperty(value="自定义字段4")
  141 + private String userDef4;
  142 +
  143 + /**
  144 + * 自定义字段5
  145 + */
  146 + @TableField(value = "userDef5")
  147 + @ApiModelProperty(value="自定义字段5")
  148 + private String userDef5;
  149 +
  150 + /**
  151 + * 自定义字段6
  152 + */
  153 + @TableField(value = "userDef6")
  154 + @ApiModelProperty(value="自定义字段6")
  155 + private String userDef6;
  156 +
  157 + /**
  158 + * 自定义字段7
  159 + */
  160 + @TableField(value = "userDef7")
  161 + @ApiModelProperty(value="自定义字段7")
  162 + private String userDef7;
  163 +
  164 + /**
  165 + * 自定义字段8
  166 + */
  167 + @TableField(value = "userDef8")
  168 + @ApiModelProperty(value="自定义字段8")
  169 + private String userDef8;
  170 +
  171 + private static final long serialVersionUID = 1L;
  172 +}
0 173 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/general/materialUnit/mapper/MaterialUnitMapper.java renamed to src/main/java/com/huaheng/pc/config/materialUnit/mapper/MaterialUnitMapper.java
  View file @45137af
1   -package com.huaheng.pc.general.materialUnit.mapper;
  1 +package com.huaheng.pc.config.materialUnit.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.general.materialUnit.domain.MaterialUnit;
  4 +import com.huaheng.pc.config.materialUnit.domain.MaterialUnit;
5 5  
6 6 public interface MaterialUnitMapper extends BaseMapper<MaterialUnit> {
7 7 }
8 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/materialUnit/service/MaterialUnitService.java 0 → 100644
  View file @45137af
  1 +package com.huaheng.pc.config.materialUnit.service;
  2 +
  3 +import com.huaheng.pc.config.materialUnit.domain.MaterialUnit;
  4 +import com.baomidou.mybatisplus.extension.service.IService;
  5 +public interface MaterialUnitService extends IService<MaterialUnit>{
  6 +
  7 +
  8 +}
... ...
src/main/java/com/huaheng/pc/config/materialUnit/service/MaterialUnitServiceImpl.java 0 → 100644
  View file @45137af
  1 +package com.huaheng.pc.config.materialUnit.service;
  2 +
  3 +import org.springframework.stereotype.Service;
  4 +import javax.annotation.Resource;
  5 +import java.util.List;
  6 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  7 +import com.huaheng.pc.config.materialUnit.mapper.MaterialUnitMapper;
  8 +import com.huaheng.pc.config.materialUnit.domain.MaterialUnit;
  9 +import com.huaheng.pc.config.materialUnit.service.MaterialUnitService;
  10 +@Service
  11 +public class MaterialUnitServiceImpl extends ServiceImpl<MaterialUnitMapper, MaterialUnit> implements MaterialUnitService{
  12 +
  13 +}
... ...
src/main/java/com/huaheng/pc/config/sendMail/domain/SendMail.java 0 → 100644
  View file @45137af
  1 +package com.huaheng.pc.config.sendMail.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.util.Date;
  11 +import lombok.Data;
  12 +
  13 +@ApiModel(value="com.huaheng.pc.config.sendMail.domain.SendMail")
  14 +@Data
  15 +@TableName(value = "send_mail")
  16 +public class SendMail implements Serializable {
  17 + /**
  18 + * 主键，自增字段
  19 + */
  20 + @TableId(value = "id", type = IdType.AUTO)
  21 + @ApiModelProperty(value="主键，自增字段")
  22 + private Integer id;
  23 +
  24 + /**
  25 + * 仓库编码
  26 + */
  27 + @TableField(value = "warehouseCode")
  28 + @ApiModelProperty(value="仓库编码")
  29 + private String warehouseCode;
  30 +
  31 + /**
  32 + * 货主编码
  33 + */
  34 + @TableField(value = "companyCode")
  35 + @ApiModelProperty(value="货主编码")
  36 + private String companyCode;
  37 +
  38 + /**
  39 + * 类别
  40 + */
  41 + @TableField(value = "type")
  42 + @ApiModelProperty(value="类别")
  43 + private Integer type;
  44 +
  45 + /**
  46 + * 预警id
  47 + */
  48 + @TableField(value = "alarmId")
  49 + @ApiModelProperty(value="预警id")
  50 + private Integer alarmId;
  51 +
  52 + /**
  53 + * 预警级别
  54 + */
  55 + @TableField(value = "warningLevel")
  56 + @ApiModelProperty(value="预警级别")
  57 + private Integer warningLevel;
  58 +
  59 + /**
  60 + * 发送级别
  61 + */
  62 + @TableField(value = "sendingLevel")
  63 + @ApiModelProperty(value="发送级别")
  64 + private Integer sendingLevel;
  65 +
  66 + /**
  67 + * 收件人
  68 + */
  69 + @TableField(value = "addressee")
  70 + @ApiModelProperty(value="收件人")
  71 + private String addressee;
  72 +
  73 + /**
  74 + * 邮箱
  75 + */
  76 + @TableField(value = "email")
  77 + @ApiModelProperty(value="邮箱")
  78 + private String email;
  79 +
  80 + /**
  81 + * 预警时间
  82 + */
  83 + @TableField(value = "alarmTime")
  84 + @ApiModelProperty(value="预警时间")
  85 + private Date alarmTime;
  86 +
  87 + /**
  88 + * 标题
  89 + */
  90 + @TableField(value = "title")
  91 + @ApiModelProperty(value="标题")
  92 + private String title;
  93 +
  94 + /**
  95 + * 正文
  96 + */
  97 + @TableField(value = "body")
  98 + @ApiModelProperty(value="正文")
  99 + private String body;
  100 +
  101 + /**
  102 + * 创建时间
  103 + */
  104 + @TableField(value = "created")
  105 + @ApiModelProperty(value="创建时间")
  106 + private Date created;
  107 +
  108 + /**
  109 + * 更新时间
  110 + */
  111 + @TableField(value = "lastUpdated")
  112 + @ApiModelProperty(value="更新时间")
  113 + private Date lastUpdated;
  114 +
  115 + /**
  116 + * 是否发送
  117 + */
  118 + @TableField(value = "enable")
  119 + @ApiModelProperty(value="是否发送")
  120 + private Boolean enable;
  121 +
  122 + /**
  123 + * 是否处理
  124 + */
  125 + @TableField(value = "handle")
  126 + @ApiModelProperty(value="是否处理")
  127 + private Boolean handle;
  128 +
  129 + /**
  130 + * 是否删除
  131 + */
  132 + @TableField(value = "deleted")
  133 + @ApiModelProperty(value="是否删除")
  134 + private Boolean deleted;
  135 +
  136 + private static final long serialVersionUID = 1L;
  137 +}
0 138 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/sendMail/mapper/SendMailMapper.java 0 → 100644
  View file @45137af
  1 +package com.huaheng.pc.config.sendMail.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.config.sendMail.domain.SendMail;
  5 +
  6 +public interface SendMailMapper extends BaseMapper<SendMail> {
  7 +}
0 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/general/customer/service/CustomerServiceImpl.java renamed to src/main/java/com/huaheng/pc/config/sendMail/service/SendMailService.java
  View file @45137af
1   -package com.huaheng.pc.general.customer.service;
  1 +package com.huaheng.pc.config.sendMail.service;
2 2  
3 3 import org.springframework.stereotype.Service;
4 4 import javax.annotation.Resource;
5 5 import java.util.List;
6 6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7   -import com.huaheng.pc.general.customer.mapper.CustomerMapper;
8   -import com.huaheng.pc.general.customer.domain.Customer;
9   -import com.huaheng.pc.general.customer.service.CustomerService;
  7 +import com.huaheng.pc.config.sendMail.domain.SendMail;
  8 +import com.huaheng.pc.config.sendMail.mapper.SendMailMapper;
10 9 @Service
11   -public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements CustomerService{
  10 +public class SendMailService extends ServiceImpl<SendMailMapper, SendMail> {
12 11  
13 12 }
... ...
src/main/java/com/huaheng/pc/general/supplier/controller/SupplierController.java renamed to src/main/java/com/huaheng/pc/config/supplier/controller/SupplierController.java
  View file @45137af
1   -package com.huaheng.pc.general.supplier.controller;
  1 +package com.huaheng.pc.config.supplier.controller;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.metadata.IPage;
... ... @@ -14,8 +14,8 @@ import com.huaheng.framework.web.domain.AjaxResult;
14 14 import com.huaheng.framework.web.page.PageDomain;
15 15 import com.huaheng.framework.web.page.TableDataInfo;
16 16 import com.huaheng.framework.web.page.TableSupport;
17   -import com.huaheng.pc.general.supplier.domain.Supplier;
18   -import com.huaheng.pc.general.supplier.service.SupplierService;
  17 +import com.huaheng.pc.config.supplier.domain.Supplier;
  18 +import com.huaheng.pc.config.supplier.service.SupplierService;
19 19 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
20 20 import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
21 21 import io.swagger.annotations.Api;
... ... @@ -32,17 +32,17 @@ import java.util.Map;
32 32  
33 33 @Api(tags={"供应商操作类"})
34 34 @Controller
35   -@RequestMapping("/general/supplier")
  35 +@RequestMapping("/config/supplier")
36 36 public class SupplierController extends BaseController {
37 37  
38   - private String prefix = "general/supplier";
  38 + private String prefix = "config/supplier";
39 39  
40 40 @Resource
41 41 private SupplierService supplierService;
42 42 @Resource
43 43 private ReceiptDetailService receiptDetailService;
44 44  
45   - @RequiresPermissions("general:supplier:view")
  45 + @RequiresPermissions("config:supplier:view")
46 46 @GetMapping()
47 47 public String supplier() {
48 48 return prefix + "/supplier";
... ... @@ -52,7 +52,7 @@ public class SupplierController extends BaseController {
52 52 * 查询供应商列表
53 53 */
54 54 @ApiOperation(value="查询供应商列表", notes="根据编码、名称、创建时间获取库位的详细信息", httpMethod = "POST")
55   - @RequiresPermissions("general:supplier:list")
  55 + @RequiresPermissions("config:supplier:list")
56 56 @Log(title = "通用-供应商管理", operating = "查看供应商列表", action = BusinessType.GRANT)
57 57 @PostMapping("/list")
58 58 @ResponseBody
... ... @@ -94,7 +94,7 @@ public class SupplierController extends BaseController {
94 94 * 新增保存供应商
95 95 */
96 96 @ApiOperation(value="新增供应商", notes="新增供应商", httpMethod = "POST")
97   - @RequiresPermissions("general:supplier:add")
  97 + @RequiresPermissions("config:supplier:add")
98 98 @Log(title = "通用-供应商管理", operating = "新增供应商", action = BusinessType.INSERT)
99 99 @PostMapping("/add")
100 100 @ResponseBody
... ... @@ -120,7 +120,7 @@ public class SupplierController extends BaseController {
120 120 * 修改保存供应商
121 121 */
122 122 @ApiOperation(value="修改供应商", notes="修改供应商", httpMethod = "POST")
123   - @RequiresPermissions("general:supplier:edit")
  123 + @RequiresPermissions("config:supplier:edit")
124 124 @Log(title = "通用-供应商管理", operating = "修改供应商", action = BusinessType.UPDATE)
125 125 @PostMapping("/edit")
126 126 @ResponseBody
... ... @@ -134,7 +134,7 @@ public class SupplierController extends BaseController {
134 134 * 删除供应商
135 135 */
136 136 @ApiOperation(value="删除供应商", notes="单条删除或批量删除供应商信息，示例1或1,2,3", httpMethod = "POST")
137   - @RequiresPermissions("general:supplier:remove")
  137 + @RequiresPermissions("config:supplier:remove")
138 138 @Log(title = "通用-供应商管理", operating = "删除供应商", action = BusinessType.DELETE)
139 139 @PostMapping( "/remove")
140 140 @ResponseBody
... ...
src/main/java/com/huaheng/pc/general/supplier/domain/Supplier.java renamed to src/main/java/com/huaheng/pc/config/supplier/domain/Supplier.java
  View file @45137af
1   -package com.huaheng.pc.general.supplier.domain;
  1 +package com.huaheng.pc.config.supplier.domain;
2 2  
3 3 import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
... ... @@ -10,7 +10,7 @@ import java.io.Serializable;
10 10 import java.util.Date;
11 11 import lombok.Data;
12 12  
13   -@ApiModel(value = "com.huaheng.pc.general.supplier.domain.Supplier")
  13 +@ApiModel(value = "com.huaheng.pc.config.supplier.domain.Supplier")
14 14 @Data
15 15 @TableName(value = "supplier")
16 16 public class Supplier implements Serializable {
... ...
src/main/java/com/huaheng/pc/general/supplier/mapper/SupplierMapper.java renamed to src/main/java/com/huaheng/pc/config/supplier/mapper/SupplierMapper.java
  View file @45137af
1   -package com.huaheng.pc.general.supplier.mapper;
  1 +package com.huaheng.pc.config.supplier.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.general.supplier.domain.Supplier;
  4 +import com.huaheng.pc.config.supplier.domain.Supplier;
5 5  
6 6 public interface SupplierMapper extends BaseMapper<Supplier> {
7 7 }
8 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/general/supplier/service/SupplierService.java renamed to src/main/java/com/huaheng/pc/config/supplier/service/SupplierService.java
  View file @45137af
1   -package com.huaheng.pc.general.supplier.service;
  1 +package com.huaheng.pc.config.supplier.service;
2 2  
3   -import com.huaheng.pc.general.supplier.domain.Supplier;
  3 +import com.huaheng.pc.config.supplier.domain.Supplier;
4 4 import com.baomidou.mybatisplus.extension.service.IService;
5 5 public interface SupplierService extends IService<Supplier>{
6 6  
... ...
src/main/java/com/huaheng/pc/general/supplier/service/SupplierServiceImpl.java renamed to src/main/java/com/huaheng/pc/config/supplier/service/SupplierServiceImpl.java
  View file @45137af
1   -package com.huaheng.pc.general.supplier.service;
  1 +package com.huaheng.pc.config.supplier.service;
2 2  
3 3 import org.springframework.stereotype.Service;
4   -import javax.annotation.Resource;
5   -import java.util.List;
6 4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7   -import com.huaheng.pc.general.supplier.mapper.SupplierMapper;
8   -import com.huaheng.pc.general.supplier.domain.Supplier;
9   -import com.huaheng.pc.general.supplier.service.SupplierService;
  5 +import com.huaheng.pc.config.supplier.mapper.SupplierMapper;
  6 +import com.huaheng.pc.config.supplier.domain.Supplier;
  7 +
10 8 @Service
11 9 public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> implements SupplierService{
12 10  
... ...
src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java renamed to src/main/java/com/huaheng/pc/config/warehouse/controller/WareHouseController.java
  View file @45137af
1   -package com.huaheng.pc.general.warehouse.controller;
  1 +package com.huaheng.pc.config.warehouse.controller;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.metadata.IPage;
... ... @@ -14,9 +14,9 @@ import com.huaheng.framework.web.domain.AjaxResult;
14 14 import com.huaheng.framework.web.page.PageDomain;
15 15 import com.huaheng.framework.web.page.TableDataInfo;
16 16 import com.huaheng.framework.web.page.TableSupport;
17   -import com.huaheng.pc.general.company.service.CompanyService;
18   -import com.huaheng.pc.general.warehouse.service.WarehouseService;
19   -import com.huaheng.pc.general.warehouse.domain.Warehouse;
  17 +import com.huaheng.pc.config.company.service.CompanyService;
  18 +import com.huaheng.pc.config.warehouse.domain.Warehouse;
  19 +import com.huaheng.pc.config.warehouse.service.WarehouseService;
20 20 import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
21 21 import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
22 22 import com.huaheng.pc.system.dict.service.IDictDataService;
... ... @@ -30,7 +30,7 @@ import javax.annotation.Resource;
30 30 import java.util.List;
31 31  
32 32 @Controller
33   -@RequestMapping("/general/warehouse")
  33 +@RequestMapping("/config/warehouse")
34 34 public class WareHouseController extends BaseController {
35 35  
36 36 @Resource
... ... @@ -44,9 +44,9 @@ public class WareHouseController extends BaseController {
44 44 @Resource
45 45 private CompanyService companyService;
46 46  
47   - private String prefix = "general/warehouse";
  47 + private String prefix = "config/warehouse";
48 48  
49   - @RequiresPermissions("general:warehouse:view")
  49 + @RequiresPermissions("config:warehouse:view")
50 50 @GetMapping()
51 51 public String warehouse() {
52 52 return prefix + "/warehouse";
... ... @@ -55,7 +55,7 @@ public class WareHouseController extends BaseController {
55 55 /**
56 56 * 查询仓库列表
57 57 */
58   - @RequiresPermissions("general:warehouse:list")
  58 + @RequiresPermissions("config:warehouse:list")
59 59 @Log(title = "通用-仓库管理", operating = "查看仓库列表", action = BusinessType.GRANT)
60 60 @PostMapping("/list")
61 61 @ResponseBody
... ... @@ -64,10 +64,10 @@ public class WareHouseController extends BaseController {
64 64 PageDomain pageDomain = TableSupport.buildPageRequest();
65 65 Integer pageNum = pageDomain.getPageNum();
66 66 Integer pageSize = pageDomain.getPageSize();
67   - lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin),Warehouse::getCreated, createdBegin)
68   - .lt(StringUtils.isNotEmpty(createdEnd),Warehouse::getCreated, createdEnd)
69   - .eq(StringUtils.isNotEmpty(warehouse.getCode()),Warehouse::getCode, warehouse.getCode())
70   - .eq(StringUtils.isNotEmpty(warehouse.getName()),Warehouse::getName,warehouse.getName())
  67 + lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), Warehouse::getCreated, createdBegin)
  68 + .lt(StringUtils.isNotEmpty(createdEnd), Warehouse::getCreated, createdEnd)
  69 + .eq(StringUtils.isNotEmpty(warehouse.getCode()), Warehouse::getCode, warehouse.getCode())
  70 + .eq(StringUtils.isNotEmpty(warehouse.getName()), Warehouse::getName,warehouse.getName())
71 71 .orderByDesc(Warehouse::getCreated)
72 72 .eq(Warehouse::getDeleted,0);
73 73 /**
... ... @@ -95,7 +95,7 @@ public class WareHouseController extends BaseController {
95 95 /**
96 96 * 新增保存仓库
97 97 */
98   - @RequiresPermissions("general:warehouse:add")
  98 + @RequiresPermissions("config:warehouse:add")
99 99 @Log(title = "通用-仓库管理", operating = "新增仓库", action = BusinessType.INSERT)
100 100 @PostMapping("/add")
101 101 @ResponseBody
... ... @@ -119,7 +119,7 @@ public class WareHouseController extends BaseController {
119 119 /**
120 120 * 修改保存仓库
121 121 */
122   - @RequiresPermissions("general:warehouse:edit")
  122 + @RequiresPermissions("config:warehouse:edit")
123 123 @Log(title = "通用-仓库管理", operating = "修改仓库", action = BusinessType.UPDATE)
124 124 @PostMapping("/edit")
125 125 @ResponseBody
... ... @@ -131,7 +131,7 @@ public class WareHouseController extends BaseController {
131 131 /**
132 132 * 删除仓库
133 133 */
134   - @RequiresPermissions("general:warehouse:remove")
  134 + @RequiresPermissions("config:warehouse:remove")
135 135 @Log(title = "通用-仓库管理", operating = "删除仓库", action = BusinessType.DELETE)
136 136 @PostMapping( "/remove")
137 137 @ResponseBody
... ...
src/main/java/com/huaheng/pc/general/warehouse/domain/Warehouse.java renamed to src/main/java/com/huaheng/pc/config/warehouse/domain/Warehouse.java
  View file @45137af
1   -package com.huaheng.pc.general.warehouse.domain;
  1 +package com.huaheng.pc.config.warehouse.domain;
2 2  
3 3 import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
5 5 import com.baomidou.mybatisplus.annotation.TableId;
6 6 import com.baomidou.mybatisplus.annotation.TableName;
7 7 import lombok.Data;
8   -import org.springframework.transaction.annotation.Transactional;
9 8  
10 9 import java.io.Serializable;
11 10 import java.util.Date;
... ...
src/main/java/com/huaheng/pc/general/warehouse/mapper/WarehouseMapper.java renamed to src/main/java/com/huaheng/pc/config/warehouse/mapper/WarehouseMapper.java
  View file @45137af
1   -package com.huaheng.pc.general.warehouse.mapper;
  1 +package com.huaheng.pc.config.warehouse.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.general.warehouse.domain.Warehouse;
5   -import com.huaheng.pc.system.role.domain.Role;
  4 +import com.huaheng.pc.config.warehouse.domain.Warehouse;
6 5 import com.huaheng.pc.system.user.domain.SysUserWarehouse;
7 6  
8 7 import java.util.List;
... ...
src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseService.java renamed to src/main/java/com/huaheng/pc/config/warehouse/service/WarehouseService.java
  View file @45137af
1   -package com.huaheng.pc.general.warehouse.service;
  1 +package com.huaheng.pc.config.warehouse.service;
2 2  
3   -import com.huaheng.pc.general.warehouse.domain.Warehouse;
4 3 import com.baomidou.mybatisplus.extension.service.IService;
5   -import com.huaheng.pc.system.user.domain.SysUserWarehouse;
  4 +import com.huaheng.pc.config.warehouse.domain.Warehouse;
6 5  
7 6 import java.util.List;
8 7 import java.util.Map;
... ...
src/main/java/com/huaheng/pc/general/warehouse/service/WarehouseServiceImpl.java renamed to src/main/java/com/huaheng/pc/config/warehouse/service/WarehouseServiceImpl.java
  View file @45137af
1   -package com.huaheng.pc.general.warehouse.service;
  1 +package com.huaheng.pc.config.warehouse.service;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5   -import com.huaheng.common.utils.security.ShiroUtils;
6   -import com.huaheng.pc.general.warehouseCopany.domain.WarehouseCompany;
7   -import com.huaheng.pc.general.warehouseCopany.service.WarehouseCompanyService;
8   -import com.huaheng.pc.system.role.domain.Role;
9   -import com.huaheng.pc.system.user.domain.SysUserWarehouse;
10   -import org.springframework.stereotype.Service;
11 5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
12   -import com.huaheng.pc.general.warehouse.mapper.WarehouseMapper;
13   -import com.huaheng.pc.general.warehouse.domain.Warehouse;
  6 +import com.huaheng.pc.config.warehouse.domain.Warehouse;
  7 +import com.huaheng.pc.config.warehouse.mapper.WarehouseMapper;
  8 +import com.huaheng.pc.config.warehouseCompany.domain.WarehouseCompany;
  9 +import com.huaheng.pc.config.warehouseCompany.service.WarehouseCompanyService;
  10 +import org.springframework.stereotype.Service;
14 11  
15 12 import javax.annotation.Resource;
16 13 import java.util.List;
17 14 import java.util.Map;
18 15  
19 16 @Service("WarehouseService")
20   -public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse> implements WarehouseService{
  17 +public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse> implements WarehouseService {
21 18  
22 19 @Resource
23 20 private WarehouseMapper warehouseMapper;
... ... @@ -58,7 +55,7 @@ public class WarehouseServiceImpl extends ServiceImpl&lt;WarehouseMapper, Warehouse
58 55 List<Warehouse> warehouses = warehouseMapper.selectWarehouseAll();
59 56 for (Warehouse warehouse : warehouses)
60 57 {
61   - for (Warehouse userWarehouse: userWarhouses)
  58 + for (Warehouse userWarehouse: userWarhouses)
62 59 {
63 60 if (warehouse.getCode().equals(userWarehouse.getCode()))
64 61 {
... ...
src/main/java/com/huaheng/pc/general/warehouseCopany/domain/WarehouseCompany.java renamed to src/main/java/com/huaheng/pc/config/warehouseCompany/domain/WarehouseCompany.java
  View file @45137af
1   -package com.huaheng.pc.general.warehouseCopany.domain;
  1 +package com.huaheng.pc.config.warehouseCompany.domain;
2 2  
3 3 import com.baomidou.mybatisplus.annotation.IdType;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
5 5 import com.baomidou.mybatisplus.annotation.TableId;
6 6 import com.baomidou.mybatisplus.annotation.TableName;
7   -import java.io.Serializable;
8 7 import lombok.Data;
9 8  
  9 +import java.io.Serializable;
  10 +
10 11 @Data
11 12 @TableName(value = "warehouse_company")
12 13 public class WarehouseCompany implements Serializable {
... ...
src/main/java/com/huaheng/pc/general/warehouseCopany/mapper/WarehouseCompanyMapper.java renamed to src/main/java/com/huaheng/pc/config/warehouseCompany/mapper/WarehouseCompanyMapper.java
  View file @45137af
1   -package com.huaheng.pc.general.warehouseCopany.mapper;
  1 +package com.huaheng.pc.config.warehouseCompany.mapper;
2 2  
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4   -import com.huaheng.pc.general.warehouseCopany.domain.WarehouseCompany;
  4 +import com.huaheng.pc.config.warehouseCompany.domain.WarehouseCompany;
5 5  
6 6 public interface WarehouseCompanyMapper extends BaseMapper<WarehouseCompany> {
7 7 }
8 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/general/warehouseCopany/service/WarehouseCompanyService.java renamed to src/main/java/com/huaheng/pc/config/warehouseCompany/service/WarehouseCompanyService.java
  View file @45137af
1   -package com.huaheng.pc.general.warehouseCopany.service;
  1 +package com.huaheng.pc.config.warehouseCompany.service;
2 2  
3   -import com.huaheng.pc.general.warehouseCopany.domain.WarehouseCompany;
4 3 import com.baomidou.mybatisplus.extension.service.IService;
  4 +import com.huaheng.pc.config.warehouseCompany.domain.WarehouseCompany;
  5 +
5 6 public interface WarehouseCompanyService extends IService<WarehouseCompany>{
6 7  
7 8  
... ...
src/main/java/com/huaheng/pc/config/warehouseCompany/service/WarehouseCompanyServiceImpl.java 0 → 100644
  View file @45137af
  1 +package com.huaheng.pc.config.warehouseCompany.service;
  2 +
  3 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  4 +import com.huaheng.pc.config.warehouseCompany.domain.WarehouseCompany;
  5 +import com.huaheng.pc.config.warehouseCompany.mapper.WarehouseCompanyMapper;
  6 +import org.springframework.stereotype.Service;
  7 +
  8 +@Service
  9 +public class WarehouseCompanyServiceImpl extends ServiceImpl<WarehouseCompanyMapper, WarehouseCompany> implements WarehouseCompanyService {
  10 +
  11 +}
... ...
src/main/java/com/huaheng/pc/config/warehouseConfig/controller/WarehouseConfigController.java
  View file @45137af
... ... @@ -26,15 +26,15 @@ import javax.annotation.Resource;
26 26 import java.util.List;
27 27  
28 28 @Controller
29   -@RequestMapping("/config/warehouse")
  29 +@RequestMapping("/config/warehouseConfig")
30 30 public class WarehouseConfigController extends BaseController {
31 31  
32   - private String prefix = "config/warehouse";
  32 + private String prefix = "config/warehouseConfig";
33 33  
34 34 @Resource
35 35 private WarehouseConfigService warehouseConfigService;
36 36  
37   - @RequiresPermissions("config:warehouse:view")
  37 + @RequiresPermissions("config:warehouseConfig:view")
38 38 @GetMapping()
39 39 public String receiptDetailHistory() {
40 40 return prefix + "/warehouse";
... ... @@ -44,7 +44,7 @@ public class WarehouseConfigController extends BaseController {
44 44 * 查询仓库配置
45 45 */
46 46 @ApiOperation(value="查看仓库配置", notes="根据编码获取仓库配置", httpMethod = "POST")
47   - @RequiresPermissions("config:warehouse:list")
  47 + @RequiresPermissions("config:warehouseConfig:list")
48 48 @Log(title = "配置-仓库配置",operating = "仓库配置列表", action = BusinessType.GRANT)
49 49 @PostMapping("/list")
50 50 @ResponseBody
... ... @@ -79,7 +79,7 @@ public class WarehouseConfigController extends BaseController {
79 79 * 新增保存仓库配置
80 80 */
81 81 @ApiOperation(value="新增仓库配置", notes="新增仓库配置", httpMethod = "POST")
82   - @RequiresPermissions("config:warehouse:add")
  82 + @RequiresPermissions("config:warehouseConfig:add")
83 83 @Log(title = "配置-仓库配置",operating = "新增仓库配置", action = BusinessType.INSERT)
84 84 @PostMapping("/add")
85 85 @ResponseBody
... ... @@ -108,7 +108,7 @@ public class WarehouseConfigController extends BaseController {
108 108 * 修改保存仓库配置
109 109 */
110 110 @ApiOperation(value="修改仓库配置信息", notes="修改仓库配置信息", httpMethod = "POST")
111   - @RequiresPermissions("config:warehouse:edit")
  111 + @RequiresPermissions("config:warehouseConfig:edit")
112 112 @Log(title = "配置-仓库配置",operating = "修改仓库配置", action = BusinessType.UPDATE)
113 113 @PostMapping("/edit")
114 114 @ResponseBody
... ...
src/main/java/com/huaheng/pc/config/zoneCapacity/service/ZoneCapacityServiceImpl.java
  View file @45137af
... ... @@ -8,8 +8,8 @@ import com.huaheng.common.utils.security.ShiroUtils;
8 8 import com.huaheng.framework.web.domain.AjaxResult;
9 9 import com.huaheng.pc.config.zoneCapacity.domain.ZoneCapacity;
10 10 import com.huaheng.pc.config.zoneCapacity.mapper.ZoneCapacityMapper;
11   -import com.huaheng.pc.general.material.domain.Material;
12   -import com.huaheng.pc.general.material.service.MaterialService;
  11 +import com.huaheng.pc.config.material.domain.Material;
  12 +import com.huaheng.pc.config.material.service.MaterialService;
13 13 import org.springframework.beans.factory.annotation.Autowired;
14 14 import org.springframework.stereotype.Service;
15 15  
... ...
src/main/java/com/huaheng/pc/general/customer/service/CustomerService.java deleted
View file @f2ae016
1   -package com.huaheng.pc.general.customer.service;
2   -
3   -import com.huaheng.pc.general.customer.domain.Customer;
4   -import com.baomidou.mybatisplus.extension.service.IService;
5   -public interface CustomerService extends IService<Customer>{
6   -
7   -
8   -}
src/main/java/com/huaheng/pc/general/materialUnit/domain/MaterialUnit.java deleted
View file @f2ae016
1   -package com.huaheng.pc.general.materialUnit.domain;
2   -
3   -import com.baomidou.mybatisplus.annotation.IdType;
4   -import com.baomidou.mybatisplus.annotation.TableField;
5   -import com.baomidou.mybatisplus.annotation.TableId;
6   -import com.baomidou.mybatisplus.annotation.TableName;
7   -import io.swagger.annotations.ApiModel;
8   -import io.swagger.annotations.ApiModelProperty;
9   -import java.io.Serializable;
10   -import java.util.Date;
11   -
12   -@ApiModel(value="com.huaheng.pc.general.materialUnit.domain.MaterialUnit")
13   -@TableName(value = "material_unit")
14   -public class MaterialUnit implements Serializable {
15   - /**
16   - * ID
17   - */
18   - @TableId(value = "id", type = IdType.AUTO)
19   - @ApiModelProperty(value="ID")
20   - private Integer id;
21   -
22   - /**
23   - * 编码
24   - */
25   - @TableField(value = "materialCode")
26   - @ApiModelProperty(value="编码")
27   - private String materialCode;
28   -
29   - /**
30   - * 名称
31   - */
32   - @TableField(value = "materialName")
33   - @ApiModelProperty(value="名称")
34   - private String materialName;
35   -
36   - /**
37   - * 规格
38   - */
39   - @TableField(value = "materialSpec")
40   - @ApiModelProperty(value="规格")
41   - private String materialSpec;
42   -
43   - /**
44   - * 货主编码
45   - */
46   - @TableField(value = "companyCode")
47   - @ApiModelProperty(value="货主编码")
48   - private String companyCode;
49   -
50   - /**
51   - * 仓库编码
52   - */
53   - @TableField(value = "warehouseCode")
54   - @ApiModelProperty(value="仓库编码")
55   - private String warehouseCode;
56   -
57   - /**
58   - * 单位
59   - */
60   - @TableField(value = "unit")
61   - @ApiModelProperty(value="单位")
62   - private String unit;
63   -
64   - /**
65   - * 顺序
66   - */
67   - @TableField(value = "sequence")
68   - @ApiModelProperty(value="顺序")
69   - private String sequence;
70   -
71   - /**
72   - * 状态
73   - */
74   - @TableField(value = "enable")
75   - @ApiModelProperty(value="状态")
76   - private Integer enable;
77   -
78   - /**
79   - * 创建时间
80   - */
81   - @TableField(value = "created")
82   - @ApiModelProperty(value="创建时间")
83   - private Date created;
84   -
85   - /**
86   - * 创建用户
87   - */
88   - @TableField(value = "createdBy")
89   - @ApiModelProperty(value="创建用户")
90   - private String createdBy;
91   -
92   - /**
93   - * 创建时间
94   - */
95   - @TableField(value = "lastUpdated")
96   - @ApiModelProperty(value="创建时间")
97   - private Date lastUpdated;
98   -
99   - /**
100   - * 更新用户
101   - */
102   - @TableField(value = "lastUpdatedBy")
103   - @ApiModelProperty(value="更新用户")
104   - private String lastUpdatedBy;
105   -
106   - /**
107   - * 数据版本
108   - */
109   - @TableField(value = "version")
110   - @ApiModelProperty(value="数据版本")
111   - private Integer version;
112   -
113   - /**
114   - * 自定义字段1
115   - */
116   - @TableField(value = "userDef1")
117   - @ApiModelProperty(value="自定义字段1")
118   - private String userDef1;
119   -
120   - /**
121   - * 自定义字段2
122   - */
123   - @TableField(value = "userDef2")
124   - @ApiModelProperty(value="自定义字段2")
125   - private String userDef2;
126   -
127   - /**
128   - * 自定义字段3
129   - */
130   - @TableField(value = "userDef3")
131   - @ApiModelProperty(value="自定义字段3")
132   - private String userDef3;
133   -
134   - /**
135   - * 自定义字段4
136   - */
137   - @TableField(value = "userDef4")
138   - @ApiModelProperty(value="自定义字段4")
139   - private String userDef4;
140   -
141   - /**
142   - * 自定义字段5
143   - */
144   - @TableField(value = "userDef5")
145   - @ApiModelProperty(value="自定义字段5")
146   - private String userDef5;
147   -
148   - /**
149   - * 自定义字段6
150   - */
151   - @TableField(value = "userDef6")
152   - @ApiModelProperty(value="自定义字段6")
153   - private String userDef6;
154   -
155   - /**
156   - * 自定义字段7
157   - */
158   - @TableField(value = "userDef7")
159   - @ApiModelProperty(value="自定义字段7")
160   - private String userDef7;
161   -
162   - /**
163   - * 自定义字段8
164   - */
165   - @TableField(value = "userDef8")
166   - @ApiModelProperty(value="自定义字段8")
167   - private String userDef8;
168   -
169   - private static final long serialVersionUID = 1L;
170   -
171   - public static final String COL_MATERIALCODE = "materialCode";
172   -
173   - public static final String COL_MATERIALNAME = "materialName";
174   -
175   - public static final String COL_MATERIALSPEC = "materialSpec";
176   -
177   - public static final String COL_COMPANYCODE = "companyCode";
178   -
179   - public static final String COL_WAREHOUSECODE = "warehouseCode";
180   -
181   - public static final String COL_UNIT = "unit";
182   -
183   - public static final String COL_SEQUENCE = "sequence";
184   -
185   - public static final String COL_ENABLE = "enable";
186   -
187   - public static final String COL_CREATED = "created";
188   -
189   - public static final String COL_CREATEDBY = "createdBy";
190   -
191   - public static final String COL_LASTUPDATED = "lastUpdated";
192   -
193   - public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
194   -
195   - public static final String COL_VERSION = "version";
196   -
197   - public static final String COL_USERDEF1 = "userDef1";
198   -
199   - public static final String COL_USERDEF2 = "userDef2";
200   -
201   - public static final String COL_USERDEF3 = "userDef3";
202   -
203   - public static final String COL_USERDEF4 = "userDef4";
204   -
205   - public static final String COL_USERDEF5 = "userDef5";
206   -
207   - public static final String COL_USERDEF6 = "userDef6";
208   -
209   - public static final String COL_USERDEF7 = "userDef7";
210   -
211   - public static final String COL_USERDEF8 = "userDef8";
212   -
213   - /**
214   - * 获取ID
215   - *
216   - * @return id - ID
217   - */
218   - public Integer getId() {
219   - return id;
220   - }
221   -
222   - /**
223   - * 设置ID
224   - *
225   - * @param id ID
226   - */
227   - public void setId(Integer id) {
228   - this.id = id;
229   - }
230   -
231   - /**
232   - * 获取编码
233   - *
234   - * @return materialCode - 编码
235   - */
236   - public String getMaterialCode() {
237   - return materialCode;
238   - }
239   -
240   - /**
241   - * 设置编码
242   - *
243   - * @param materialCode 编码
244   - */
245   - public void setMaterialCode(String materialCode) {
246   - this.materialCode = materialCode;
247   - }
248   -
249   - /**
250   - * 获取名称
251   - *
252   - * @return materialName - 名称
253   - */
254   - public String getMaterialName() {
255   - return materialName;
256   - }
257   -
258   - /**
259   - * 设置名称
260   - *
261   - * @param materialName 名称
262   - */
263   - public void setMaterialName(String materialName) {
264   - this.materialName = materialName;
265   - }
266   -
267   - /**
268   - * 获取规格
269   - *
270   - * @return materialSpec - 规格
271   - */
272   - public String getMaterialSpec() {
273   - return materialSpec;
274   - }
275   -
276   - /**
277   - * 设置规格
278   - *
279   - * @param materialSpec 规格
280   - */
281   - public void setMaterialSpec(String materialSpec) {
282   - this.materialSpec = materialSpec;
283   - }
284   -
285   - /**
286   - * 获取货主编码
287   - *
288   - * @return companyCode - 货主编码
289   - */
290   - public String getCompanyCode() {
291   - return companyCode;
292   - }
293   -
294   - /**
295   - * 设置货主编码
296   - *
297   - * @param companyCode 货主编码
298   - */
299   - public void setCompanyCode(String companyCode) {
300   - this.companyCode = companyCode;
301   - }
302   -
303   - /**
304   - * 获取仓库编码
305   - *
306   - * @return warehouseCode - 仓库编码
307   - */
308   - public String getWarehouseCode() {
309   - return warehouseCode;
310   - }
311   -
312   - /**
313   - * 设置仓库编码
314   - *
315   - * @param warehouseCode 仓库编码
316   - */
317   - public void setWarehouseCode(String warehouseCode) {
318   - this.warehouseCode = warehouseCode;
319   - }
320   -
321   - /**
322   - * 获取单位
323   - *
324   - * @return unit - 单位
325   - */
326   - public String getUnit() {
327   - return unit;
328   - }
329   -
330   - /**
331   - * 设置单位
332   - *
333   - * @param unit 单位
334   - */
335   - public void setUnit(String unit) {
336   - this.unit = unit;
337   - }
338   -
339   - /**
340   - * 获取顺序
341   - *
342   - * @return sequence - 顺序
343   - */
344   - public String getSequence() {
345   - return sequence;
346   - }
347   -
348   - /**
349   - * 设置顺序
350   - *
351   - * @param sequence 顺序
352   - */
353   - public void setSequence(String sequence) {
354   - this.sequence = sequence;
355   - }
356   -
357   - /**
358   - * 获取状态
359   - *
360   - * @return enable - 状态
361   - */
362   - public Integer getEnable() {
363   - return enable;
364   - }
365   -
366   - /**
367   - * 设置状态
368   - *
369   - * @param enable 状态
370   - */
371   - public void setEnable(Integer enable) {
372   - this.enable = enable;
373   - }
374   -
375   - /**
376   - * 获取创建时间
377   - *
378   - * @return created - 创建时间
379   - */
380   - public Date getCreated() {
381   - return created;
382   - }
383   -
384   - /**
385   - * 设置创建时间
386   - *
387   - * @param created 创建时间
388   - */
389   - public void setCreated(Date created) {
390   - this.created = created;
391   - }
392   -
393   - /**
394   - * 获取创建用户
395   - *
396   - * @return createdBy - 创建用户
397   - */
398   - public String getCreatedBy() {
399   - return createdBy;
400   - }
401   -
402   - /**
403   - * 设置创建用户
404   - *
405   - * @param createdBy 创建用户
406   - */
407   - public void setCreatedBy(String createdBy) {
408   - this.createdBy = createdBy;
409   - }
410   -
411   - /**
412   - * 获取创建时间
413   - *
414   - * @return lastUpdated - 创建时间
415   - */
416   - public Date getLastUpdated() {
417   - return lastUpdated;
418   - }
419   -
420   - /**
421   - * 设置创建时间
422   - *
423   - * @param lastUpdated 创建时间
424   - */
425   - public void setLastUpdated(Date lastUpdated) {
426   - this.lastUpdated = lastUpdated;
427   - }
428   -
429   - /**
430   - * 获取更新用户
431   - *
432   - * @return lastUpdatedBy - 更新用户
433   - */
434   - public String getLastUpdatedBy() {
435   - return lastUpdatedBy;
436   - }
437   -
438   - /**
439   - * 设置更新用户
440   - *
441   - * @param lastUpdatedBy 更新用户
442   - */
443   - public void setLastUpdatedBy(String lastUpdatedBy) {
444   - this.lastUpdatedBy = lastUpdatedBy;
445   - }
446   -
447   - /**
448   - * 获取数据版本
449   - *
450   - * @return version - 数据版本
451   - */
452   - public Integer getVersion() {
453   - return version;
454   - }
455   -
456   - /**
457   - * 设置数据版本
458   - *
459   - * @param version 数据版本
460   - */
461   - public void setVersion(Integer version) {
462   - this.version = version;
463   - }
464   -
465   - /**
466   - * 获取自定义字段1
467   - *
468   - * @return userDef1 - 自定义字段1
469   - */
470   - public String getUserDef1() {
471   - return userDef1;
472   - }
473   -
474   - /**
475   - * 设置自定义字段1
476   - *
477   - * @param userDef1 自定义字段1
478   - */
479   - public void setUserDef1(String userDef1) {
480   - this.userDef1 = userDef1;
481   - }
482   -
483   - /**
484   - * 获取自定义字段2
485   - *
486   - * @return userDef2 - 自定义字段2
487   - */
488   - public String getUserDef2() {
489   - return userDef2;
490   - }
491   -
492   - /**
493   - * 设置自定义字段2
494   - *
495   - * @param userDef2 自定义字段2
496   - */
497   - public void setUserDef2(String userDef2) {
498   - this.userDef2 = userDef2;
499   - }
500   -
501   - /**
502   - * 获取自定义字段3
503   - *
504   - * @return userDef3 - 自定义字段3
505   - */
506   - public String getUserDef3() {
507   - return userDef3;
508   - }
509   -
510   - /**
511   - * 设置自定义字段3
512   - *
513   - * @param userDef3 自定义字段3
514   - */
515   - public void setUserDef3(String userDef3) {
516   - this.userDef3 = userDef3;
517   - }
518   -
519   - /**
520   - * 获取自定义字段4
521   - *
522   - * @return userDef4 - 自定义字段4
523   - */
524   - public String getUserDef4() {
525   - return userDef4;
526   - }
527   -
528   - /**
529   - * 设置自定义字段4
530   - *
531   - * @param userDef4 自定义字段4
532   - */
533   - public void setUserDef4(String userDef4) {
534   - this.userDef4 = userDef4;
535   - }
536   -
537   - /**
538   - * 获取自定义字段5
539   - *
540   - * @return userDef5 - 自定义字段5
541   - */
542   - public String getUserDef5() {
543   - return userDef5;
544   - }
545   -
546   - /**
547   - * 设置自定义字段5
548   - *
549   - * @param userDef5 自定义字段5
550   - */
551   - public void setUserDef5(String userDef5) {
552   - this.userDef5 = userDef5;
553   - }
554   -
555   - /**
556   - * 获取自定义字段6
557   - *
558   - * @return userDef6 - 自定义字段6
559   - */
560   - public String getUserDef6() {
561   - return userDef6;
562   - }
563   -
564   - /**
565   - * 设置自定义字段6
566   - *
567   - * @param userDef6 自定义字段6
568   - */
569   - public void setUserDef6(String userDef6) {
570   - this.userDef6 = userDef6;
571   - }
572   -
573   - /**
574   - * 获取自定义字段7
575   - *
576   - * @return userDef7 - 自定义字段7
577   - */
578   - public String getUserDef7() {
579   - return userDef7;
580   - }
581   -
582   - /**
583   - * 设置自定义字段7
584   - *
585   - * @param userDef7 自定义字段7
586   - */
587   - public void setUserDef7(String userDef7) {
588   - this.userDef7 = userDef7;
589   - }
590   -
591   - /**
592   - * 获取自定义字段8
593   - *
594   - * @return userDef8 - 自定义字段8
595   - */
596   - public String getUserDef8() {
597   - return userDef8;
598   - }
599   -
600   - /**
601   - * 设置自定义字段8
602   - *
603   - * @param userDef8 自定义字段8
604   - */
605   - public void setUserDef8(String userDef8) {
606   - this.userDef8 = userDef8;
607   - }
608   -
609   - @Override
610   - public String toString() {
611   - StringBuilder sb = new StringBuilder();
612   - sb.append(getClass().getSimpleName());
613   - sb.append(" [");
614   - sb.append("Hash = ").append(hashCode());
615   - sb.append(", id=").append(id);
616   - sb.append(", materialCode=").append(materialCode);
617   - sb.append(", materialName=").append(materialName);
618   - sb.append(", materialSpec=").append(materialSpec);
619   - sb.append(", companyCode=").append(companyCode);
620   - sb.append(", warehouseCode=").append(warehouseCode);
621   - sb.append(", unit=").append(unit);
622   - sb.append(", sequence=").append(sequence);
623   - sb.append(", enable=").append(enable);
624   - sb.append(", created=").append(created);
625   - sb.append(", createdBy=").append(createdBy);
626   - sb.append(", lastUpdated=").append(lastUpdated);
627   - sb.append(", lastUpdatedBy=").append(lastUpdatedBy);
628   - sb.append(", version=").append(version);
629   - sb.append(", userDef1=").append(userDef1);
630   - sb.append(", userDef2=").append(userDef2);
631   - sb.append(", userDef3=").append(userDef3);
632   - sb.append(", userDef4=").append(userDef4);
633   - sb.append(", userDef5=").append(userDef5);
634   - sb.append(", userDef6=").append(userDef6);
635   - sb.append(", userDef7=").append(userDef7);
636   - sb.append(", userDef8=").append(userDef8);
637   - sb.append("]");
638   - return sb.toString();
639   - }
640   -}
641 0 \ No newline at end of file
src/main/java/com/huaheng/pc/general/materialUnit/service/MaterialUnitService.java deleted
View file @f2ae016
1   -package com.huaheng.pc.general.materialUnit.service;
2   -
3   -import com.huaheng.pc.general.materialUnit.domain.MaterialUnit;
4   -import com.baomidou.mybatisplus.extension.service.IService;
5   -
6   -import java.util.List;
7   -import java.util.Map;
8   -
9   -public interface MaterialUnitService extends IService<MaterialUnit>{
10   -
11   - public List<Map<String, Object>> getUnit();
12   -
13   -}
src/main/java/com/huaheng/pc/general/materialUnit/service/MaterialUnitServiceImpl.java deleted
View file @f2ae016
1   -package com.huaheng.pc.general.materialUnit.service;
2   -
3   -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4   -import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5   -import org.springframework.stereotype.Service;
6   -import javax.annotation.Resource;
7   -import java.util.List;
8   -import java.util.Map;
9   -
10   -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
11   -import com.huaheng.pc.general.materialUnit.domain.MaterialUnit;
12   -import com.huaheng.pc.general.materialUnit.mapper.MaterialUnitMapper;
13   -import com.huaheng.pc.general.materialUnit.service.MaterialUnitService;
14   -@Service("materialUnitService")
15   -public class MaterialUnitServiceImpl extends ServiceImpl<MaterialUnitMapper, MaterialUnit> implements MaterialUnitService{
16   -
17   - @Override
18   - public List<Map<String, Object>> getUnit(){
19   - LambdaQueryWrapper<MaterialUnit> lambda = Wrappers.lambdaQuery();
20   - return this.listMaps(lambda);
21   - }
22   -}
src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
  View file @45137af
1 1 package com.huaheng.pc.inventory.inventoryDetail.controller;
2 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;
3 7 import com.huaheng.common.utils.StringUtils;
  8 +import com.huaheng.common.utils.security.ShiroUtils;
4 9 import com.huaheng.framework.aspectj.lang.annotation.Log;
5 10 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
6 11 import com.huaheng.framework.web.controller.BaseController;
7 12 import com.huaheng.framework.web.domain.AjaxResult;
  13 +import com.huaheng.framework.web.page.PageDomain;
8 14 import com.huaheng.framework.web.page.TableDataInfo;
9   -import com.huaheng.pc.general.material.service.MaterialServiceImpl;
  15 +import com.huaheng.framework.web.page.TableSupport;
  16 +import com.huaheng.pc.config.material.service.MaterialServiceImpl;
  17 +import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
  18 +import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
10 19 import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
11   -import org.apache.shiro.authz.annotation.RequiresPermissions;
12 20 import org.springframework.stereotype.Controller;
13 21 import org.springframework.web.bind.annotation.GetMapping;
14 22 import org.springframework.web.bind.annotation.PostMapping;
... ... @@ -16,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
16 24 import org.springframework.web.bind.annotation.ResponseBody;
17 25  
18 26 import javax.annotation.Resource;
  27 +import java.util.List;
19 28  
20 29 /**
21 30 * 库存明细控制层
... ... @@ -31,7 +40,8 @@ public class InventoryDetailController extends BaseController
31 40 private MaterialServiceImpl materialService;
32 41 @Resource
33 42 private InventoryHeaderService inventoryHeaderService;
34   -
  43 + @Resource
  44 + private InventoryDetailService inventoryDetailService;
35 45  
36 46  
37 47 //@RequiresPermissions("inventory:inventoryDetail:view")
... ... @@ -48,10 +58,56 @@ public class InventoryDetailController extends BaseController
48 58 @Log(title = "库存-库存明细查看",operating = "查看库存明细列表", action = BusinessType.GRANT)
49 59 @PostMapping("/inventoryDetailLook")
50 60 @ResponseBody
51   - public TableDataInfo list()
  61 + public TableDataInfo detailList(InventoryDetail inventoryDetail, String createdBegin, String createdEnd)
52 62 {
  63 + LambdaQueryWrapper<InventoryDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
  64 + PageDomain pageDomain = TableSupport.buildPageRequest();
  65 + Integer pageNum = pageDomain.getPageNum();
  66 + Integer pageSize = pageDomain.getPageSize();
  67 +
  68 + lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),InventoryDetail::getCreated, createdBegin)
  69 + .le(StringUtils.isNotEmpty(createdEnd), InventoryDetail::getCreated, createdEnd)//创建时间范围
  70 + .eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode())//仓库
  71 + .eq(inventoryDetail.getInventoryHeaderId() != null,InventoryDetail::getInventoryHeaderId,inventoryDetail.getInventoryHeaderId()) //ID
  72 + .eq(StringUtils.isNotEmpty(inventoryDetail.getLocationCode()),InventoryDetail::getLocationCode,inventoryDetail.getLocationCode()) //库位
  73 + .eq(StringUtils.isNotEmpty(inventoryDetail.getContainerCode()),InventoryDetail::getContainerCode,inventoryDetail.getContainerCode())//容器
  74 + .eq(StringUtils.isNotEmpty(inventoryDetail.getCompanyCode()),InventoryDetail::getCompanyCode,inventoryDetail.getCompanyCode())//货主
  75 + .eq(StringUtils.isNotEmpty(inventoryDetail.getSupplierCode()),InventoryDetail::getSupplierCode,inventoryDetail.getSupplierCode())//供应商
  76 + .eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialCode()),InventoryDetail::getMaterialCode,inventoryDetail.getMaterialCode())//物料编码
  77 + .like(StringUtils.isNotEmpty(inventoryDetail.getMaterialName()),InventoryDetail::getMaterialName,inventoryDetail.getMaterialName())//物料名称
  78 + .like(StringUtils.isNotEmpty(inventoryDetail.getMaterialSpec()),InventoryDetail::getMaterialSpec,inventoryDetail.getMaterialSpec())//物料规格
  79 + .eq(StringUtils.isNotEmpty(inventoryDetail.getInventorySts()),InventoryDetail::getInventorySts,inventoryDetail.getInventorySts())//库存状态
  80 + .eq(StringUtils.isNotEmpty(inventoryDetail.getBatch()),InventoryDetail::getBatch,inventoryDetail.getBatch())//批次
  81 + .eq(StringUtils.isNotEmpty(inventoryDetail.getProjectNo()),InventoryDetail::getProjectNo,inventoryDetail.getProjectNo())//项目号
  82 + .eq(StringUtils.isNotEmpty(inventoryDetail.getLot()),InventoryDetail::getLot,inventoryDetail.getLot())//批号
  83 + .eq(StringUtils.isNotEmpty(inventoryDetail.getReceiptCode()),InventoryDetail::getReceiptCode,inventoryDetail.getReceiptCode())//入库单编码
  84 + .eq(inventoryDetail.getReceiptDetailId() != null,InventoryDetail::getReceiptDetailId,inventoryDetail.getReceiptDetailId()) // 入库单明细ID
  85 + .eq(StringUtils.isNotEmpty(inventoryDetail.getReferCode()),InventoryDetail::getReferCode,inventoryDetail.getReferCode())//上游单号
  86 + .eq(StringUtils.isNotEmpty(inventoryDetail.getReferDetailId()),InventoryDetail::getReferDetailId,inventoryDetail.getReferDetailId())//上游行号
  87 + .orderByDesc(InventoryDetail::getId);
53 88  
54   - return getDataTable(null);
  89 + if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
  90 + //分页查询
  91 + Page<InventoryDetail> page = new Page<>(pageNum, pageSize);
  92 + IPage<InventoryDetail> iPage = inventoryDetailService.page(page, lambdaQueryWrapper);
  93 + return getMpDataTable(iPage.getRecords(),iPage.getTotal());
  94 + } else {
  95 + List<InventoryDetail> list = inventoryDetailService.list(lambdaQueryWrapper);
  96 + return getDataTable(list);
  97 + }
55 98 }
  99 +
  100 + /**出库查看*/
  101 + //@RequiresPermissions("inventory:inventoryHeader:seeOut")
  102 + @PostMapping("/createCheckOutTask")
  103 + @ResponseBody
  104 + public AjaxResult createCheckOutTask(String ids){
  105 + if(StringUtils.isEmpty(ids)){
  106 + return AjaxResult.error("ids不能为空");
  107 + }
  108 + return inventoryHeaderService.createCheckOutTask(ids);
  109 + }
  110 +
  111 +
56 112  
57 113 }
... ...