wms / wms_henanqingyuan · Commits

Commit 4348475650def7e56a1a9b343c85c51c466e64bc

Authored by pengcheng
2 parents 91a2e0b2 92d2f029

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

Inline Side-by-side
Showing 17 changed files with 341 additions and 337 deletions
.idea/workspace.xml
  View file @4348475
... ... @@ -3,15 +3,16 @@
3 3 <component name="ChangeListManager">
4 4 <list default="true" id="908d8a6f-e3e4-4fdc-b674-e523a3e2b520" name="Default Changelist" comment="">
5 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java" afterDir="false" />
7   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java" afterDir="false" />
8   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java" afterDir="false" />
9   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java" afterDir="false" />
10   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java" afterDir="false" />
11   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java" afterDir="false" />
  6 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" afterDir="false" />
12 9 <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" afterDir="false" />
13   - <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml" afterDir="false" />
14   - <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/config/LocationMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/LocationMapper.xml" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/addAdjust.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/addAdjust.html" afterDir="false" />
  11 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html" afterDir="false" />
  12 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/adjustEdit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustEdit.html" afterDir="false" />
  13 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html" afterDir="false" />
  14 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" afterDir="false" />
  15 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" afterDir="false" />
15 16 </list>
16 17 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
17 18 <option name="SHOW_DIALOG" value="false" />
... ... @@ -52,30 +53,39 @@
52 53 <component name="FileEditorManager">
53 54 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
54 55 <file pinned="false" current-in-tab="false">
55   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
  56 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java">
56 57 <provider selected="true" editor-type-id="text-editor">
57   - <state relative-caret-position="448">
58   - <caret line="117" column="42" selection-start-line="117" selection-start-column="42" selection-end-line="117" selection-end-column="42" />
  58 + <state relative-caret-position="-567">
  59 + <caret line="44" column="51" selection-start-line="44" selection-start-column="51" selection-end-line="44" selection-end-column="51" />
  60 + </state>
  61 + </provider>
  62 + </entry>
  63 + </file>
  64 + <file pinned="false" current-in-tab="true">
  65 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java">
  66 + <provider selected="true" editor-type-id="text-editor">
  67 + <state relative-caret-position="8">
  68 + <caret line="64" column="52" lean-forward="true" selection-start-line="64" selection-start-column="52" selection-end-line="64" selection-end-column="52" />
59 69 </state>
60 70 </provider>
61 71 </entry>
62 72 </file>
63 73 <file pinned="false" current-in-tab="false">
64   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
  74 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html">
65 75 <provider selected="true" editor-type-id="text-editor">
66   - <state relative-caret-position="216">
67   - <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
  76 + <state relative-caret-position="-12">
  77 + <caret line="273" column="18" selection-start-line="273" selection-start-column="18" selection-end-line="273" selection-end-column="18" />
68 78 </state>
69 79 </provider>
70 80 </entry>
71 81 </file>
72   - <file pinned="false" current-in-tab="true">
73   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
  82 + <file pinned="false" current-in-tab="false">
  83 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html">
74 84 <provider selected="true" editor-type-id="text-editor">
75   - <state relative-caret-position="230">
76   - <caret line="666" lean-forward="true" selection-start-line="666" selection-end-line="666" />
  85 + <state relative-caret-position="-87">
  86 + <caret line="122" selection-start-line="122" selection-end-line="122" />
77 87 <folding>
78   - <element signature="imports" expanded="true" />
  88 + <element signature="e#6120#12518#0" />
79 89 </folding>
80 90 </state>
81 91 </provider>
... ... @@ -118,7 +128,6 @@
118 128 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" />
119 129 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java" />
120 130 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java" />
121   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" />
122 131 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java" />
123 132 <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" />
124 133 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java" />
... ... @@ -128,10 +137,17 @@
128 137 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerServiceImpl.java" />
129 138 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java" />
130 139 <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/LocationMapper.xml" />
131   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java" />
132 140 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/mapper/ContainerMapper.java" />
133 141 <option value="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml" />
  142 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java" />
134 143 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" />
  144 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" />
  145 + <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html" />
  146 + <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html" />
  147 + <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html" />
  148 + <option value="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html" />
  149 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java" />
  150 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java" />
135 151 </list>
136 152 </option>
137 153 </component>
... ... @@ -229,55 +245,6 @@
229 245 <item name="com" type="462c0819:PsiDirectoryNode" />
230 246 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
231 247 <item name="pc" type="462c0819:PsiDirectoryNode" />
232   - <item name="config" type="462c0819:PsiDirectoryNode" />
233   - </path>
234   - <path>
235   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
236   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
237   - <item name="src" type="462c0819:PsiDirectoryNode" />
238   - <item name="main" type="462c0819:PsiDirectoryNode" />
239   - <item name="java" type="462c0819:PsiDirectoryNode" />
240   - <item name="com" type="462c0819:PsiDirectoryNode" />
241   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
242   - <item name="pc" type="462c0819:PsiDirectoryNode" />
243   - <item name="config" type="462c0819:PsiDirectoryNode" />
244   - <item name="container" type="462c0819:PsiDirectoryNode" />
245   - </path>
246   - <path>
247   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
248   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
249   - <item name="src" type="462c0819:PsiDirectoryNode" />
250   - <item name="main" type="462c0819:PsiDirectoryNode" />
251   - <item name="java" type="462c0819:PsiDirectoryNode" />
252   - <item name="com" type="462c0819:PsiDirectoryNode" />
253   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
254   - <item name="pc" type="462c0819:PsiDirectoryNode" />
255   - <item name="config" type="462c0819:PsiDirectoryNode" />
256   - <item name="container" type="462c0819:PsiDirectoryNode" />
257   - <item name="mapper" type="462c0819:PsiDirectoryNode" />
258   - </path>
259   - <path>
260   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
261   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
262   - <item name="src" type="462c0819:PsiDirectoryNode" />
263   - <item name="main" type="462c0819:PsiDirectoryNode" />
264   - <item name="java" type="462c0819:PsiDirectoryNode" />
265   - <item name="com" type="462c0819:PsiDirectoryNode" />
266   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
267   - <item name="pc" type="462c0819:PsiDirectoryNode" />
268   - <item name="config" type="462c0819:PsiDirectoryNode" />
269   - <item name="container" type="462c0819:PsiDirectoryNode" />
270   - <item name="service" type="462c0819:PsiDirectoryNode" />
271   - </path>
272   - <path>
273   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
274   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
275   - <item name="src" type="462c0819:PsiDirectoryNode" />
276   - <item name="main" type="462c0819:PsiDirectoryNode" />
277   - <item name="java" type="462c0819:PsiDirectoryNode" />
278   - <item name="com" type="462c0819:PsiDirectoryNode" />
279   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
280   - <item name="pc" type="462c0819:PsiDirectoryNode" />
281 248 <item name="inventory" type="462c0819:PsiDirectoryNode" />
282 249 </path>
283 250 <path>
... ... @@ -290,45 +257,7 @@
290 257 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
291 258 <item name="pc" type="462c0819:PsiDirectoryNode" />
292 259 <item name="inventory" type="462c0819:PsiDirectoryNode" />
293   - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
294   - </path>
295   - <path>
296   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
297   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
298   - <item name="src" type="462c0819:PsiDirectoryNode" />
299   - <item name="main" type="462c0819:PsiDirectoryNode" />
300   - <item name="java" type="462c0819:PsiDirectoryNode" />
301   - <item name="com" type="462c0819:PsiDirectoryNode" />
302   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
303   - <item name="pc" type="462c0819:PsiDirectoryNode" />
304   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
305   - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
306   - <item name="controller" type="462c0819:PsiDirectoryNode" />
307   - </path>
308   - <path>
309   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
310   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
311   - <item name="src" type="462c0819:PsiDirectoryNode" />
312   - <item name="main" type="462c0819:PsiDirectoryNode" />
313   - <item name="java" type="462c0819:PsiDirectoryNode" />
314   - <item name="com" type="462c0819:PsiDirectoryNode" />
315   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
316   - <item name="pc" type="462c0819:PsiDirectoryNode" />
317   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
318   - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
319   - <item name="service" type="462c0819:PsiDirectoryNode" />
320   - </path>
321   - <path>
322   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
323   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
324   - <item name="src" type="462c0819:PsiDirectoryNode" />
325   - <item name="main" type="462c0819:PsiDirectoryNode" />
326   - <item name="java" type="462c0819:PsiDirectoryNode" />
327   - <item name="com" type="462c0819:PsiDirectoryNode" />
328   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
329   - <item name="pc" type="462c0819:PsiDirectoryNode" />
330   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
331   - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  260 + <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
332 261 </path>
333 262 <path>
334 263 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -340,7 +269,7 @@
340 269 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
341 270 <item name="pc" type="462c0819:PsiDirectoryNode" />
342 271 <item name="inventory" type="462c0819:PsiDirectoryNode" />
343   - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  272 + <item name="cycleCountDetail" type="462c0819:PsiDirectoryNode" />
344 273 <item name="controller" type="462c0819:PsiDirectoryNode" />
345 274 </path>
346 275 <path>
... ... @@ -353,33 +282,7 @@
353 282 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
354 283 <item name="pc" type="462c0819:PsiDirectoryNode" />
355 284 <item name="inventory" type="462c0819:PsiDirectoryNode" />
356   - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
357   - <item name="mapper" type="462c0819:PsiDirectoryNode" />
358   - </path>
359   - <path>
360   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
361   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
362   - <item name="src" type="462c0819:PsiDirectoryNode" />
363   - <item name="main" type="462c0819:PsiDirectoryNode" />
364   - <item name="java" type="462c0819:PsiDirectoryNode" />
365   - <item name="com" type="462c0819:PsiDirectoryNode" />
366   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
367   - <item name="pc" type="462c0819:PsiDirectoryNode" />
368   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
369   - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
370   - <item name="service" type="462c0819:PsiDirectoryNode" />
371   - </path>
372   - <path>
373   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
374   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
375   - <item name="src" type="462c0819:PsiDirectoryNode" />
376   - <item name="main" type="462c0819:PsiDirectoryNode" />
377   - <item name="java" type="462c0819:PsiDirectoryNode" />
378   - <item name="com" type="462c0819:PsiDirectoryNode" />
379   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
380   - <item name="pc" type="462c0819:PsiDirectoryNode" />
381   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
382   - <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
  285 + <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
383 286 </path>
384 287 <path>
385 288 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -391,7 +294,7 @@
391 294 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
392 295 <item name="pc" type="462c0819:PsiDirectoryNode" />
393 296 <item name="inventory" type="462c0819:PsiDirectoryNode" />
394   - <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
  297 + <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
395 298 <item name="controller" type="462c0819:PsiDirectoryNode" />
396 299 </path>
397 300 <path>
... ... @@ -403,45 +306,6 @@
403 306 <item name="com" type="462c0819:PsiDirectoryNode" />
404 307 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
405 308 <item name="pc" type="462c0819:PsiDirectoryNode" />
406   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
407   - <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
408   - <item name="domain" type="462c0819:PsiDirectoryNode" />
409   - </path>
410   - <path>
411   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
412   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
413   - <item name="src" type="462c0819:PsiDirectoryNode" />
414   - <item name="main" type="462c0819:PsiDirectoryNode" />
415   - <item name="java" type="462c0819:PsiDirectoryNode" />
416   - <item name="com" type="462c0819:PsiDirectoryNode" />
417   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
418   - <item name="pc" type="462c0819:PsiDirectoryNode" />
419   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
420   - <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
421   - <item name="mapper" type="462c0819:PsiDirectoryNode" />
422   - </path>
423   - <path>
424   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
425   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
426   - <item name="src" type="462c0819:PsiDirectoryNode" />
427   - <item name="main" type="462c0819:PsiDirectoryNode" />
428   - <item name="java" type="462c0819:PsiDirectoryNode" />
429   - <item name="com" type="462c0819:PsiDirectoryNode" />
430   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
431   - <item name="pc" type="462c0819:PsiDirectoryNode" />
432   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
433   - <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
434   - <item name="service" type="462c0819:PsiDirectoryNode" />
435   - </path>
436   - <path>
437   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
438   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
439   - <item name="src" type="462c0819:PsiDirectoryNode" />
440   - <item name="main" type="462c0819:PsiDirectoryNode" />
441   - <item name="java" type="462c0819:PsiDirectoryNode" />
442   - <item name="com" type="462c0819:PsiDirectoryNode" />
443   - <item name="huaheng" type="462c0819:PsiDirectoryNode" />
444   - <item name="pc" type="462c0819:PsiDirectoryNode" />
445 309 <item name="task" type="462c0819:PsiDirectoryNode" />
446 310 </path>
447 311 <path>
... ... @@ -507,14 +371,6 @@
507 371 <item name="src" type="462c0819:PsiDirectoryNode" />
508 372 <item name="main" type="462c0819:PsiDirectoryNode" />
509 373 <item name="resources" type="462c0819:PsiDirectoryNode" />
510   - <item name="i18n" type="462c0819:PsiDirectoryNode" />
511   - </path>
512   - <path>
513   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
514   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
515   - <item name="src" type="462c0819:PsiDirectoryNode" />
516   - <item name="main" type="462c0819:PsiDirectoryNode" />
517   - <item name="resources" type="462c0819:PsiDirectoryNode" />
518 374 <item name="templates" type="462c0819:PsiDirectoryNode" />
519 375 </path>
520 376 <path>
... ... @@ -524,7 +380,7 @@
524 380 <item name="main" type="462c0819:PsiDirectoryNode" />
525 381 <item name="resources" type="462c0819:PsiDirectoryNode" />
526 382 <item name="templates" type="462c0819:PsiDirectoryNode" />
527   - <item name="config" type="462c0819:PsiDirectoryNode" />
  383 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
528 384 </path>
529 385 <path>
530 386 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -534,6 +390,7 @@
534 390 <item name="resources" type="462c0819:PsiDirectoryNode" />
535 391 <item name="templates" type="462c0819:PsiDirectoryNode" />
536 392 <item name="inventory" type="462c0819:PsiDirectoryNode" />
  393 + <item name="adjustDetail" type="462c0819:PsiDirectoryNode" />
537 394 </path>
538 395 <path>
539 396 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -565,36 +422,6 @@
565 422 <item name="inventory" type="462c0819:PsiDirectoryNode" />
566 423 <item name="cycleCountHeader" type="462c0819:PsiDirectoryNode" />
567 424 </path>
568   - <path>
569   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
570   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
571   - <item name="src" type="462c0819:PsiDirectoryNode" />
572   - <item name="main" type="462c0819:PsiDirectoryNode" />
573   - <item name="resources" type="462c0819:PsiDirectoryNode" />
574   - <item name="templates" type="462c0819:PsiDirectoryNode" />
575   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
576   - <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
577   - </path>
578   - <path>
579   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
580   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
581   - <item name="src" type="462c0819:PsiDirectoryNode" />
582   - <item name="main" type="462c0819:PsiDirectoryNode" />
583   - <item name="resources" type="462c0819:PsiDirectoryNode" />
584   - <item name="templates" type="462c0819:PsiDirectoryNode" />
585   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
586   - <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
587   - </path>
588   - <path>
589   - <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
590   - <item name="wms2" type="462c0819:PsiDirectoryNode" />
591   - <item name="src" type="462c0819:PsiDirectoryNode" />
592   - <item name="main" type="462c0819:PsiDirectoryNode" />
593   - <item name="resources" type="462c0819:PsiDirectoryNode" />
594   - <item name="templates" type="462c0819:PsiDirectoryNode" />
595   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
596   - <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
597   - </path>
598 425 </expand>
599 426 <select />
600 427 </subPane>
... ... @@ -624,6 +451,12 @@
624 451 <property name="nodejs_package_manager_path" value="npm" />
625 452 <property name="settings.editor.selected.configurable" value="Settings.JavaScript" />
626 453 </component>
  454 + <component name="RecentsManager">
  455 + <key name="MoveFile.RECENT_KEYS">
  456 + <recent name="C:\Project\wms2\src\main\resources\templates\inventory\adjustDetail" />
  457 + <recent name="C:\Project\wms2\src\main\resources\templates\inventory\adjustHeader" />
  458 + </key>
  459 + </component>
627 460 <component name="RunDashboard">
628 461 <option name="configurationTypes">
629 462 <set>
... ... @@ -754,7 +587,7 @@
754 587 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
755 588 <editor active="true" />
756 589 <layout>
757   - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27479893" />
  590 + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19839142" />
758 591 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
759 592 <window_info id="Web" order="2" side_tool="true" />
760 593 <window_info id="Designer" order="3" />
... ... @@ -768,14 +601,14 @@
768 601 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
769 602 <window_info anchor="bottom" id="TODO" order="6" />
770 603 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
771   - <window_info anchor="bottom" id="Version Control" order="8" weight="0.09773371" />
  604 + <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49932975" weight="0.08073654" />
772 605 <window_info anchor="bottom" id="Database Changes" order="9" weight="0.3286119" />
773 606 <window_info anchor="bottom" id="Spring" order="10" />
774 607 <window_info anchor="bottom" id="MyBatis Log" order="11" weight="0.3286119" />
775   - <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50067025" side_tool="true" weight="0.23796034" />
  608 + <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50067025" side_tool="true" weight="0.6090652" />
776 609 <window_info anchor="bottom" id="Messages" order="13" weight="0.04249292" />
777 610 <window_info anchor="bottom" id="Java Enterprise" order="14" />
778   - <window_info active="true" anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" visible="true" weight="0.04957507" />
  611 + <window_info active="true" anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.49932975" visible="true" weight="0.17280453" />
779 612 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
780 613 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
781 614 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
... ... @@ -875,6 +708,7 @@
875 708 <MESSAGE value="库存和任务移库相关" />
876 709 <MESSAGE value="库存移库生成和完成逻辑" />
877 710 <MESSAGE value="xml" />
  711 + <MESSAGE value="空托出入库，完成逻辑" />
878 712 <MESSAGE value="pull" />
879 713 <option name="LAST_COMMIT_MESSAGE" value="pull" />
880 714 </component>
... ... @@ -935,63 +769,10 @@
935 769 <properties />
936 770 <option name="timeStamp" value="26" />
937 771 </line-breakpoint>
938   - <line-breakpoint enabled="true" type="java-line">
939   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java</url>
940   - <line>47</line>
941   - <properties />
942   - <option name="timeStamp" value="37" />
943   - </line-breakpoint>
944 772 </breakpoints>
945 773 </breakpoint-manager>
946 774 </component>
947 775 <component name="editorHistoryManager">
948   - <entry file="file://$PROJECT_DIR$/.idea/WMSV1.iml">
949   - <provider selected="true" editor-type-id="text-editor" />
950   - </entry>
951   - <entry file="file://$PROJECT_DIR$/.idea/uiDesigner.xml">
952   - <provider selected="true" editor-type-id="text-editor">
953   - <state relative-caret-position="-828" />
954   - </provider>
955   - </entry>
956   - <entry file="file://$PROJECT_DIR$/.idea/MyBatisCodeHelperDatasource.xml" />
957   - <entry file="file://$PROJECT_DIR$/.idea/misc.xml">
958   - <provider selected="true" editor-type-id="text-editor" />
959   - </entry>
960   - <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
961   - <provider selected="true" editor-type-id="text-editor">
962   - <state relative-caret-position="164">
963   - <caret line="10" column="45" lean-forward="true" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
964   - </state>
965   - </provider>
966   - </entry>
967   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
968   - <provider selected="true" editor-type-id="text-editor">
969   - <state relative-caret-position="332">
970   - <caret line="283" column="13" selection-start-line="283" selection-start-column="13" selection-end-line="283" selection-end-column="13" />
971   - </state>
972   - </provider>
973   - </entry>
974   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/domain/Location.java">
975   - <provider selected="true" editor-type-id="text-editor">
976   - <state relative-caret-position="-456">
977   - <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
978   - </state>
979   - </provider>
980   - </entry>
981   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml">
982   - <provider selected="true" editor-type-id="text-editor">
983   - <state relative-caret-position="472">
984   - <caret line="48" lean-forward="true" selection-start-line="48" selection-end-line="48" />
985   - </state>
986   - </provider>
987   - </entry>
988   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java">
989   - <provider selected="true" editor-type-id="text-editor">
990   - <state relative-caret-position="260">
991   - <caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
992   - </state>
993   - </provider>
994   - </entry>
995 776 <entry file="jar://C:/Program Files/Java/jdk1.8.0_202/src.zip!/com/sun/jmx/snmp/tasks/Task.java">
996 777 <provider selected="true" editor-type-id="text-editor">
997 778 <state relative-caret-position="330">
... ... @@ -1181,41 +962,6 @@
1181 962 </state>
1182 963 </provider>
1183 964 </entry>
1184   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java">
1185   - <provider selected="true" editor-type-id="text-editor">
1186   - <state relative-caret-position="80">
1187   - <caret line="44" column="22" selection-start-line="44" selection-start-column="22" selection-end-line="44" selection-end-column="22" />
1188   - </state>
1189   - </provider>
1190   - </entry>
1191   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
1192   - <provider selected="true" editor-type-id="text-editor">
1193   - <state relative-caret-position="1994">
1194   - <caret line="214" column="20" selection-start-line="214" selection-start-column="20" selection-end-line="214" selection-end-column="20" />
1195   - </state>
1196   - </provider>
1197   - </entry>
1198   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java">
1199   - <provider selected="true" editor-type-id="text-editor">
1200   - <state relative-caret-position="1350">
1201   - <caret line="220" column="35" selection-start-line="220" selection-start-column="35" selection-end-line="220" selection-end-column="35" />
1202   - </state>
1203   - </provider>
1204   - </entry>
1205   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
1206   - <provider selected="true" editor-type-id="text-editor">
1207   - <state relative-caret-position="448">
1208   - <caret line="117" column="42" selection-start-line="117" selection-start-column="42" selection-end-line="117" selection-end-column="42" />
1209   - </state>
1210   - </provider>
1211   - </entry>
1212   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
1213   - <provider selected="true" editor-type-id="text-editor">
1214   - <state relative-caret-position="216">
1215   - <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
1216   - </state>
1217   - </provider>
1218   - </entry>
1219 965 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java">
1220 966 <provider selected="true" editor-type-id="text-editor">
1221 967 <state relative-caret-position="200">
... ... @@ -1276,15 +1022,133 @@
1276 1022 </state>
1277 1023 </provider>
1278 1024 </entry>
  1025 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java">
  1026 + <provider selected="true" editor-type-id="text-editor">
  1027 + <state relative-caret-position="216">
  1028 + <caret line="18" column="15" selection-start-line="18" selection-start-column="15" selection-end-line="18" selection-end-column="15" />
  1029 + </state>
  1030 + </provider>
  1031 + </entry>
1279 1032 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java">
1280 1033 <provider selected="true" editor-type-id="text-editor">
1281   - <state relative-caret-position="230">
1282   - <caret line="666" lean-forward="true" selection-start-line="666" selection-end-line="666" />
  1034 + <state relative-caret-position="363">
  1035 + <caret line="924" lean-forward="true" selection-start-line="924" selection-end-line="924" />
1283 1036 <folding>
1284 1037 <element signature="imports" expanded="true" />
1285 1038 </folding>
1286 1039 </state>
1287 1040 </provider>
1288 1041 </entry>
  1042 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/service/InventoryTransactionServiceImpl.java">
  1043 + <provider selected="true" editor-type-id="text-editor">
  1044 + <state relative-caret-position="80">
  1045 + <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
  1046 + </state>
  1047 + </provider>
  1048 + </entry>
  1049 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java">
  1050 + <provider selected="true" editor-type-id="text-editor">
  1051 + <state relative-caret-position="671">
  1052 + <caret line="60" column="12" selection-start-line="60" selection-start-column="12" selection-end-line="60" selection-end-column="12" />
  1053 + </state>
  1054 + </provider>
  1055 + </entry>
  1056 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java">
  1057 + <provider selected="true" editor-type-id="text-editor">
  1058 + <state relative-caret-position="-525">
  1059 + <caret line="44" column="22" selection-start-line="44" selection-start-column="22" selection-end-line="44" selection-end-column="22" />
  1060 + </state>
  1061 + </provider>
  1062 + </entry>
  1063 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java">
  1064 + <provider selected="true" editor-type-id="text-editor">
  1065 + <state relative-caret-position="-1060">
  1066 + <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
  1067 + </state>
  1068 + </provider>
  1069 + </entry>
  1070 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
  1071 + <provider selected="true" editor-type-id="text-editor">
  1072 + <state relative-caret-position="1531">
  1073 + <caret line="214" column="20" selection-start-line="214" selection-start-column="20" selection-end-line="214" selection-end-column="20" />
  1074 + </state>
  1075 + </provider>
  1076 + </entry>
  1077 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java">
  1078 + <provider selected="true" editor-type-id="text-editor">
  1079 + <state relative-caret-position="367">
  1080 + <caret line="117" column="42" selection-start-line="117" selection-start-column="42" selection-end-line="117" selection-end-column="42" />
  1081 + </state>
  1082 + </provider>
  1083 + </entry>
  1084 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html">
  1085 + <provider selected="true" editor-type-id="text-editor">
  1086 + <state relative-caret-position="-12">
  1087 + <caret line="273" column="18" selection-start-line="273" selection-start-column="18" selection-end-line="273" selection-end-column="18" />
  1088 + </state>
  1089 + </provider>
  1090 + </entry>
  1091 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js">
  1092 + <provider selected="true" editor-type-id="text-editor">
  1093 + <state relative-caret-position="304">
  1094 + <caret line="44" column="25" lean-forward="true" selection-start-line="43" selection-start-column="52" selection-end-line="44" selection-end-column="25" />
  1095 + </state>
  1096 + </provider>
  1097 + </entry>
  1098 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/adjustDetail.html">
  1099 + <provider selected="true" editor-type-id="text-editor">
  1100 + <state relative-caret-position="196">
  1101 + <caret line="323" column="16" lean-forward="true" selection-start-line="323" selection-start-column="16" selection-end-line="323" selection-end-column="16" />
  1102 + </state>
  1103 + </provider>
  1104 + </entry>
  1105 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html">
  1106 + <provider selected="true" editor-type-id="text-editor">
  1107 + <state relative-caret-position="163">
  1108 + <caret line="187" column="30" lean-forward="true" selection-start-line="187" selection-start-column="30" selection-end-line="187" selection-end-column="30" />
  1109 + <folding>
  1110 + <element signature="n#style#0;n#a#0;n#!!top" expanded="true" />
  1111 + </folding>
  1112 + </state>
  1113 + </provider>
  1114 + </entry>
  1115 + <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">
  1116 + <provider selected="true" editor-type-id="text-editor">
  1117 + <state relative-caret-position="167">
  1118 + <caret line="102" selection-start-line="102" selection-end-line="102" />
  1119 + </state>
  1120 + </provider>
  1121 + </entry>
  1122 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetail.java">
  1123 + <provider selected="true" editor-type-id="text-editor">
  1124 + <state relative-caret-position="120">
  1125 + <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
  1126 + </state>
  1127 + </provider>
  1128 + </entry>
  1129 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html">
  1130 + <provider selected="true" editor-type-id="text-editor">
  1131 + <state relative-caret-position="-87">
  1132 + <caret line="122" selection-start-line="122" selection-end-line="122" />
  1133 + <folding>
  1134 + <element signature="e#6120#12518#0" />
  1135 + </folding>
  1136 + </state>
  1137 + </provider>
  1138 + </entry>
  1139 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java">
  1140 + <provider selected="true" editor-type-id="text-editor">
  1141 + <state relative-caret-position="-567">
  1142 + <caret line="44" column="51" selection-start-line="44" selection-start-column="51" selection-end-line="44" selection-end-column="51" />
  1143 + </state>
  1144 + </provider>
  1145 + </entry>
  1146 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java">
  1147 + <provider selected="true" editor-type-id="text-editor">
  1148 + <state relative-caret-position="8">
  1149 + <caret line="64" column="52" lean-forward="true" selection-start-line="64" selection-start-column="52" selection-end-line="64" selection-end-column="52" />
  1150 + </state>
  1151 + </provider>
  1152 + </entry>
1289 1153 </component>
1290 1154 </project>
1291 1155 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
  View file @4348475
... ... @@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
23 23 import org.springframework.web.bind.annotation.ResponseBody;
24 24  
25 25 import javax.annotation.Resource;
  26 +import java.util.Collections;
26 27 import java.util.List;
27 28  
28 29  
... ... @@ -95,6 +96,9 @@ public class CycleCountDetailController extends BaseController {
95 96 return getDataTable(list);
96 97 }
97 98  
  99 + //空List
  100 + //return getDataTable(Collections.emptyList());
  101 +
98 102 }
99 103  
100 104  
... ...
src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java
  View file @4348475
... ... @@ -12,6 +12,8 @@ import com.huaheng.framework.web.controller.BaseController;
12 12 import com.huaheng.framework.web.page.PageDomain;
13 13 import com.huaheng.framework.web.page.TableDataInfo;
14 14 import com.huaheng.framework.web.page.TableSupport;
  15 +import com.huaheng.pc.inventory.adjustHeader.domain.AdjustHeader;
  16 +import com.huaheng.pc.inventory.adjustHeader.service.AdjustHeaderService;
15 17 import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService;
16 18 import com.huaheng.pc.inventory.cycleCountHeader.domain.CycleCountHeader;
17 19  
... ... @@ -39,6 +41,8 @@ public class CycleCountHeaderController extends BaseController {
39 41 private CycleCountHeaderService cycleCountHeaderService;
40 42 @Resource
41 43 private CycleCountDetailService cycleCountDetailService;
  44 + @Resource
  45 + private AdjustHeaderService adjustHeaderService;
42 46  
43 47  
44 48  
... ...
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
  View file @4348475
... ... @@ -48,7 +48,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
48 48 * */
49 49 @Override
50 50 public AjaxResult transfer(String sourceLocation, String destinationLocation) {
51   - //生成移库任务
  51 + //生成移库任务
52 52 taskHeaderService.createTransferTask(sourceLocation,destinationLocation);
53 53 return AjaxResult.success("移库任务生成成功！");
54 54 }
... ... @@ -58,8 +58,8 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
58 58 * */
59 59 @Override
60 60 public AjaxResult createCheckOutTask(String[] ids) {
61   - //生成出库查看任务
62   - taskHeaderService.createCheckOutTask(ids);
  61 + //生成出库查看任务
  62 + taskHeaderService.createCheckOutTask(ids);
63 63 return AjaxResult.success("出库查看任务正在生成！");
64 64 }
65 65  
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/controller/ReceiptContainerDetailController.java
  View file @4348475
... ... @@ -4,10 +4,12 @@ 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;
7 8 import com.huaheng.common.utils.StringUtils;
8 9 import com.huaheng.framework.aspectj.lang.annotation.Log;
9 10 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
10 11 import com.huaheng.framework.web.controller.BaseController;
  12 +import com.huaheng.framework.web.domain.AjaxResult;
11 13 import com.huaheng.framework.web.page.PageDomain;
12 14 import com.huaheng.framework.web.page.TableDataInfo;
13 15 import com.huaheng.framework.web.page.TableSupport;
... ... @@ -23,6 +25,7 @@ import org.springframework.ui.ModelMap;
23 25 import org.springframework.web.bind.annotation.*;
24 26  
25 27 import javax.annotation.Resource;
  28 +import java.util.Arrays;
26 29 import java.util.List;
27 30  
28 31 @Controller
... ... @@ -67,4 +70,16 @@ public class ReceiptContainerDetailController extends BaseController {
67 70 return getDataTable(list);
68 71 }
69 72 }
  73 +
  74 + @RequiresPermissions("receipt:receiptContainerDetail:remove")
  75 + @Log(title = "入库-入库详情列表", operating = "入库详情列表", action = BusinessType.GRANT)
  76 + @PostMapping("remove")
  77 + public AjaxResult remove(String ids) {
  78 + if (StringUtils.isEmpty(ids)){
  79 + return AjaxResult.error("id不能为空");
  80 + }
  81 +
  82 + List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
  83 + return toAjax(receiptContainerDetailService.detailRemove(idList));
  84 + }
70 85 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailService.java
  View file @4348475
... ... @@ -3,6 +3,7 @@ package com.huaheng.pc.receipt.receiptContainerDetail.service;
3 3 import com.huaheng.framework.web.domain.AjaxResult;
4 4 import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
5 5 import com.baomidou.mybatisplus.extension.service.IService;
  6 +import com.sun.org.apache.xpath.internal.operations.Bool;
6 7  
7 8 import java.util.List;
8 9 import java.util.Map;
... ... @@ -10,4 +11,6 @@ import java.util.Map;
10 11 public interface ReceiptContainerDetailService extends IService<ReceiptContainerDetail>{
11 12  
12 13 AjaxResult<List<Map<String, Object>>> getReceiptInfoByBill(String receiptCode);
  14 +
  15 + Boolean detailRemove(List<Integer> idList);
13 16 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java
  View file @4348475
... ... @@ -3,17 +3,32 @@ package com.huaheng.pc.receipt.receiptContainerDetail.service;
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5 5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  6 +import com.huaheng.common.exception.service.ServiceException;
6 7 import com.huaheng.common.utils.security.ShiroUtils;
7 8 import com.huaheng.framework.web.domain.AjaxResult;
8 9 import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
9 10 import com.huaheng.pc.receipt.receiptContainerDetail.mapper.ReceiptContainerDetailMapper;
  11 +import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
  12 +import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
  13 +import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
  14 +import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
10 15 import org.springframework.stereotype.Service;
11 16  
  17 +import javax.annotation.Resource;
12 18 import java.util.List;
13 19 import java.util.Map;
14 20 @Service
15 21 public class ReceiptContainerDetailServiceImpl extends ServiceImpl<ReceiptContainerDetailMapper, ReceiptContainerDetail> implements ReceiptContainerDetailService{
16 22  
  23 + @Resource
  24 + private ReceiptDetailService receiptDetailService;
  25 + @Resource
  26 + private ReceiptHeaderService receiptHeaderService;
  27 + /**
  28 + * 根据入库单编码查询入库组盘明细
  29 + * @param receiptCode
  30 + * @return
  31 + */
17 32 @Override
18 33 public AjaxResult<List<Map<String, Object>>> getReceiptInfoByBill(String receiptCode) {
19 34 LambdaQueryWrapper<ReceiptContainerDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
... ... @@ -24,5 +39,44 @@ public class ReceiptContainerDetailServiceImpl extends ServiceImpl&lt;ReceiptContai
24 39 return AjaxResult.success(detail);
25 40 }
26 41  
  42 + /**
  43 + * 撤销入库组盘明细
  44 + * @param idList
  45 + * @return
  46 + */
  47 + @Override
  48 + public Boolean detailRemove(List<Integer> idList) {
  49 + for (Integer id : idList){
  50 + ReceiptContainerDetail receiptContainerDetail = this.getById(id);
  51 + //如果已生成任务不允许撤销
  52 + if (receiptContainerDetail.getStatus() < 10){
  53 + //回滚入库单明细收货数量
  54 + ReceiptDetail receiptDetail = receiptDetailService.getById(receiptContainerDetail.getReceiptDetailId());
  55 + receiptDetail.setOpenQty(receiptDetail.getOpenQty() - receiptContainerDetail.getQty());
  56 + if (!receiptDetailService.updateById(receiptDetail)){throw new SecurityException("回滚入库单明细失败");}
  57 +
  58 + //查询入库头表
  59 + LambdaQueryWrapper<ReceiptContainerDetail> containerDetailLambda = Wrappers.lambdaQuery();
  60 + containerDetailLambda = Wrappers.lambdaQuery();
  61 + containerDetailLambda.eq(ReceiptContainerDetail::getReceiptId, receiptContainerDetail.getReceiptId());
  62 + List<ReceiptContainerDetail> containerDetailList = this.list(containerDetailLambda);
  63 + //如果入库组盘没有该入库单的组盘信息，回滚入库单状态
  64 + if (containerDetailList == null){
  65 + ReceiptHeader receiptHeader = new ReceiptHeader();
  66 + receiptHeader.setId(receiptContainerDetail.getReceiptId());
  67 + receiptHeader.setFirstStatus(200);
  68 + receiptHeader.setLastStatus(200);
  69 + receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  70 +
  71 + if (!receiptHeaderService.updateById(receiptHeader)){ throw new ServiceException("回滚头表状态失败"); }
  72 + }
  73 +
  74 + } else {
  75 + throw new SecurityException("已生成任务，不允许取消");
  76 + }
  77 + }
  78 + return true;
  79 + }
  80 +
27 81  
28 82 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
  View file @4348475
... ... @@ -102,7 +102,7 @@ public class ReceiptContainerHeaderController extends BaseController {
102 102 }
103 103  
104 104 /**
105   - * 删除入库单
  105 + * 删除入库组盘
106 106 */
107 107 @ApiOperation(value="取消", notes="取消入库组盘", httpMethod = "POST")
108 108 @RequiresPermissions("receipt:receiptContainer:remove")
... ... @@ -114,7 +114,7 @@ public class ReceiptContainerHeaderController extends BaseController {
114 114 return AjaxResult.error("id为空");
115 115 }
116 116 List<Integer> idList = Arrays.asList(Convert.toIntArray(ids));
117   - return toAjax(receiptContainerHeaderService.removeByIds(idList));
  117 + return toAjax(receiptContainerHeaderService.cancelByIds(idList));
118 118 }
119 119 /**
120 120 * 生成任务
... ... @@ -134,7 +134,6 @@ public class ReceiptContainerHeaderController extends BaseController {
134 134 lambda.select(ReceiptContainerHeader::getId)
135 135 .lt(ReceiptContainerHeader::getStatus, 10)
136 136 .le(ReceiptContainerHeader::getId, maxId);
137   - List<Object> ContainerIdList = receiptContainerHeaderService.listObjs(lambda);
138 137 return taskHeaderService.createReceiptTask(idList);
139 138 }
140 139  
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderService.java
  View file @4348475
... ... @@ -3,6 +3,9 @@ package com.huaheng.pc.receipt.receiptContainerHeader.service;
3 3 import com.huaheng.framework.web.domain.AjaxResult;
4 4 import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
5 5 import com.baomidou.mybatisplus.extension.service.IService;
  6 +
  7 +import java.util.List;
  8 +
6 9 public interface ReceiptContainerHeaderService extends IService<ReceiptContainerHeader>{
7 10  
8 11 /**
... ... @@ -18,4 +21,6 @@ public interface ReceiptContainerHeaderService extends IService&lt;ReceiptContainer
18 21 */
19 22 AjaxResult saveCountain(String receiptCode, String containerCode, Integer receiptDetailId, Integer taskType,
20 23 String locationCode, Integer qty, String locatingRule);
  24 +
  25 + Boolean cancelByIds(List<Integer> id);
21 26 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
  View file @4348475
... ... @@ -114,16 +114,66 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
114 114 receiptDetail = receiptDetailService.getById(receiptDetailId);
115 115  
116 116 receiptContainerDetailAdd(receiptContainerHeaders.get(0).getId(), receiptDetail, qty, containerCode);
117   - //更新入库详情状态和入库单状态
118   - ReceiptDetail receiptDetail1 = receiptDetailService.queryflow(receiptDetail);
119   - if (!receiptDetailService.updateById(receiptDetail1)){
120   - throw new ServiceException("更新入库详情下一流程失败");
  117 + //如果单据数量等于已收数量，更新入库详情状态和入库单状态
  118 + if (receiptDetail.getTotalQty() == receiptDetail.getOpenQty()){
  119 + ReceiptDetail receiptDetail1 = receiptDetailService.queryflow(receiptDetail);
  120 + if (!receiptDetailService.updateById(receiptDetail1)){
  121 + throw new ServiceException("更新入库详情下一流程失败");
  122 + }
121 123 }
122 124 receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
123 125 return AjaxResult.success("success");
124 126 }
125 127  
126 128 /**
  129 + * 批量撤销入库组盘
  130 + * @param ids
  131 + * @return
  132 + */
  133 + @Override
  134 + public Boolean cancelByIds(List<Integer> ids) {
  135 + for (Integer id : ids) {
  136 + //如果已生成任务则不允许取消组盘
  137 + if (this.getById(id).getStatus() < 10){
  138 + //根据组盘头表id查询组盘明细表
  139 + LambdaQueryWrapper<ReceiptContainerDetail> containerDetailLambda = Wrappers.lambdaQuery();
  140 + containerDetailLambda.eq(ReceiptContainerDetail::getReceiptContainerId, id);
  141 + List<ReceiptContainerDetail> receiptContainerDetails = receiptContainerDetailService.list(containerDetailLambda);
  142 +
  143 + //查询入库单明细,减去已收数量，更新单据
  144 + for (ReceiptContainerDetail receiptContainerDetail: receiptContainerDetails){
  145 + ReceiptDetail receiptDetail = receiptDetailService.getById(receiptContainerDetail.getReceiptDetailId());
  146 + receiptDetail.setOpenQty(receiptDetail.getOpenQty()-receiptContainerDetail.getQty());
  147 + if (!receiptDetailService.updateById(receiptDetail)){throw new ServiceException("回滚入库明细失败"); }
  148 +
  149 + containerDetailLambda = Wrappers.lambdaQuery();
  150 + containerDetailLambda.eq(ReceiptContainerDetail::getReceiptId, receiptContainerDetail.getReceiptId());
  151 + List<ReceiptContainerDetail> containerDetailList = receiptContainerDetailService.list(containerDetailLambda);
  152 + //如果入库组盘没有该入库单的组盘信息，回滚入库单状态
  153 + if (containerDetailList == null){
  154 + ReceiptHeader receiptHeader = new ReceiptHeader();
  155 + receiptHeader.setId(receiptContainerDetail.getReceiptId());
  156 + receiptHeader.setFirstStatus(200);
  157 + receiptHeader.setLastStatus(200);
  158 + receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  159 +
  160 + if (!receiptHeaderService.updateById(receiptHeader)){ throw new ServiceException("回滚头表状态失败"); }
  161 + }
  162 +
  163 + if (!receiptContainerDetailService.removeById(receiptContainerDetail.getId())){
  164 + throw new ServiceException("删除入库组盘明细表失败，id是"+receiptContainerDetail.getId());
  165 + }
  166 + }
  167 + //删除入库组盘头表
  168 + this.removeById(id);
  169 + } else {
  170 + throw new ServiceException("已生成任务不允许取消");
  171 + }
  172 + }
  173 + return true;
  174 + }
  175 +
  176 + /**
127 177 * 检查容器编码合法性
128 178 * @param containerCode
129 179 * @return
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @4348475
... ... @@ -845,7 +845,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
845 845 }
846 846 }
847 847  
848   -
849 848 /**
850 849 * 创建上架任务
851 850 *
... ... @@ -907,6 +906,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
907 906 throw new ServiceException("生成任务明细失败");
908 907 }
909 908  
  909 + //更新入库组盘明细状态
  910 + item.setStatus(10);
  911 + receiptContainerDetailService.updateById(item);
  912 +
910 913 ReceiptDetail receiptDetail = receiptDetailService.getById(item.getReceiptDetailId());
911 914 if ("300".equals(receiptDetail.getProcessStamp())){
912 915 ReceiptDetail detail = receiptDetailService.queryflow(receiptDetail);
... ...
src/main/resources/templates/inventory/adjustDetail/adjustDetail.html
  View file @4348475
... ... @@ -306,10 +306,13 @@
306 306 let url = location.search; //获取url中"?"符后的字串
307 307 if (url.indexOf("?") != -1) { //判断是否有参数
308 308 let str = url.substr(1); //从第一个字符开始 因为第0个是?号 获取所有除问号的所有符串
  309 + let strs = url.substr(1).split("=");
  310 + $("#adjustCode").val(strs[1]);
309 311 options.queryParams=function(params) {
  312 +
310 313 return {
311 314 // 传递参数查询参数
312   - adjustCode: adjustCode,
  315 + adjustCode: strs[1],
313 316 pageSize: params.limit,
314 317 pageNum: params.offset / params.limit + 1,
315 318 searchValue: params.search,
... ...
src/main/resources/templates/inventory/adjustDetail/addAdjust.html renamed to src/main/resources/templates/inventory/adjustHeader/addAdjust.html
  View file @4348475
src/main/resources/templates/inventory/adjustDetail/adjustEdit.html renamed to src/main/resources/templates/inventory/adjustHeader/adjustEdit.html
  View file @4348475
src/main/resources/templates/inventory/adjustHeader/adjustHeader.html
  View file @4348475
... ... @@ -185,9 +185,9 @@
185 185 }));
186 186 });
187 187  
188   - function detail(id, code) {
  188 + function detail(id,code) {
189 189 let url = ctx + "inventory/adjustDetail";
190   - if (id || code) {
  190 + if (code) {
191 191 url = ctx + "inventory/adjustDetail?adjustCode=" + code;
192 192 }
193 193 $("#tabDetail").children().remove();
... ...
src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
  View file @4348475
... ... @@ -317,19 +317,19 @@
317 317 align: 'center',
318 318 formatter: function (value, row, index) {
319 319 var actions = [];
320   - if(row.isCreateTask !== "未生成"){
321   - actions.push('<a class="btn btn-success btn-xs ' + confirmFlag + '" href="#" onclick="confirmGapQty(\'' + row.id + '\')"><i class="fa fa-comment"></i>实盘登记</a> ');
322   - }
323   - if (row.isCreateTask !== "已生成") {
324   - actions.push('<a class="btn btn-primary btn-xs ' + createTaskFalg + '" href="#" onclick="outcheck(\'' + row.id + '\')"><i class="fa fa-gbp"></i>生成盘点任务</a> ');
325   - }
326   - actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
  320 +
  321 + actions.push('<a class="btn btn-success btn-xs " href="#" onclick="confirmGapQty(\'' + row.id + '\')"><i class="fa fa-comment"></i>实盘登记</a> ');
  322 +
  323 + actions.push('<a class="btn btn-primary btn-xs " href="#" onclick="outcheck(\'' + row.id + '\')"><i class="fa fa-gbp"></i>生成盘点任务</a> ');
  324 +
  325 + actions.push('<a class="btn btn-danger btn-xs " href="#" onclick="remove(\'' + row.id + '\')" ><i class="fa fa-trash-o"></i>删除</a>');
327 326 return actions.join('');
328 327 }
329 328 }]
330 329 },url = location.search; //获取url中"?"符后的字串
331 330 if (url.indexOf("?") != -1) { //判断是否有参数
332 331 let strs = url.substr(1).split("=");
  332 + $("#cycleCountHeadId").val(strs[1]);
333 333 options.queryParams=function(params) {
334 334 return {
335 335 // 传递参数查询参数
... ...
src/main/resources/templates/inventory/cycleCountHeader/cycleCountHeader.html
  View file @4348475
... ... @@ -262,12 +262,12 @@
262 262 align: 'center',
263 263 formatter: function (value, row, index) {
264 264 var actions = [];
265   - actions.push('<a class="btn btn-success btn-xs ' + reportFlag + '" href="#" onclick="cyclecountPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
266   - if (row.status == 30) {
267   - actions.push('<a class="btn btn-warning btn-xs' + addAdjust + ' " href="#" onclick="goAdjust(\'' + row.id + '\')"><i class="fa fa-gbp"></i>生成差异单</a> ');
268   - }
269   - actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
270   - actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a> ');
  265 + actions.push('<a class="btn btn-success btn-xs " href="#" onclick="cyclecountPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
  266 +
  267 + actions.push('<a class="btn btn-warning btn-xs " href="#" onclick="goAdjust(\'' + row.id + '\')"><i class="fa fa-gbp"></i>生成差异单</a> ');
  268 +
  269 + actions.push('<a class="btn btn-info btn-xs " href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
  270 + actions.push('<a class="btn btn-danger btn-xs " href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a> ');
271 271 //actions.push('<a style="background: #b5bdc0" class="btn btn-default btn-xs " href="#" onclick="detail(\'' + row.code + '\',\'' + row.code + '\')"><i class="fa fa-list-ul"></i>明细</a>');
272 272 return actions.join('');
273 273 }
... ...