wms / wms_tianjinggelinmei · Commits

Commit 2a797cbc001d24c9d86cb7d44ca64d6ecf14113a

Authored by pengcheng
2 parents cb581e7c 760f4b7f
develop ... moreWarehouse

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

Inline Side-by-side
Showing 8 changed files with 966 additions and 889 deletions
.idea/workspace.xml
  View file @2a797cb
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="9ff7b25e-dc1a-4859-8a0c-00039489e359" name="Default Changelist" comment="">
  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" />
5 6 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6   - <change beforePath="$PROJECT_DIR$/sql/bug" beforeDir="false" />
7   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
  8 + <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" />
8 10 <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" />
  11 + <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 + <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" />
9 13 </list>
  14 + <ignored path="$PROJECT_DIR$/target/" />
10 15 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
11 16 <option name="SHOW_DIALOG" value="false" />
12 17 <option name="HIGHLIGHT_CONFLICTS" value="true" />
... ... @@ -43,40 +48,55 @@
43 48 </expand>
44 49 <select />
45 50 </component>
  51 + <component name="FavoritesManager">
  52 + <favorites_list name="wms2" />
  53 + </component>
46 54 <component name="FileEditorManager">
47   - <leaf>
  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>
48 65 <file pinned="false" current-in-tab="false">
49   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
  66 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java">
50 67 <provider selected="true" editor-type-id="text-editor">
51   - <state relative-caret-position="-304">
52   - <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
  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" />
53 70 </state>
54 71 </provider>
55 72 </entry>
56 73 </file>
57 74 <file pinned="false" current-in-tab="false">
58   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentCombinationModel.java">
  75 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml">
59 76 <provider selected="true" editor-type-id="text-editor">
60   - <state relative-caret-position="68">
61   - <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
  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" />
62 79 </state>
63 80 </provider>
64 81 </entry>
65 82 </file>
66 83 <file pinned="false" current-in-tab="false">
67   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java">
  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">
68 85 <provider selected="true" editor-type-id="text-editor">
69   - <state relative-caret-position="202">
70   - <caret line="76" column="16" lean-forward="true" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" />
  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" />
71 88 </state>
72 89 </provider>
73 90 </entry>
74 91 </file>
75   - <file pinned="false" current-in-tab="true">
76   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java">
  92 + <file pinned="false" current-in-tab="false">
  93 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
77 94 <provider selected="true" editor-type-id="text-editor">
78   - <state relative-caret-position="1156">
79   - <caret line="81" column="11" lean-forward="true" selection-start-line="81" selection-start-column="11" selection-end-line="81" selection-end-column="11" />
  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>
80 100 </state>
81 101 </provider>
82 102 </entry>
... ... @@ -84,17 +104,31 @@
84 104 <file pinned="false" current-in-tab="false">
85 105 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java">
86 106 <provider selected="true" editor-type-id="text-editor">
87   - <state relative-caret-position="60">
88   - <caret line="155" selection-start-line="155" selection-end-line="155" />
  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" />
89 109 </state>
90 110 </provider>
91 111 </entry>
92 112 </file>
93 113 <file pinned="false" current-in-tab="false">
94   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
  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">
95 129 <provider selected="true" editor-type-id="text-editor">
96   - <state relative-caret-position="200">
97   - <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
  130 + <state>
  131 + <caret column="28" selection-start-column="28" selection-end-column="28" />
98 132 </state>
99 133 </provider>
100 134 </entry>
... ... @@ -111,6 +145,11 @@
111 145 </list>
112 146 </option>
113 147 </component>
  148 + <component name="FindInProjectRecents">
  149 + <findStrings>
  150 + <find>detail</find>
  151 + </findStrings>
  152 + </component>
114 153 <component name="Git.Settings">
115 154 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
116 155 <option name="RECENT_BRANCH_BY_REPOSITORY">
... ... @@ -122,8 +161,15 @@
122 161 <component name="IdeDocumentHistory">
123 162 <option name="CHANGED_PATHS">
124 163 <list>
125   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java" />
126 164 <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" />
  167 + <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 + <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" />
127 173 </list>
128 174 </option>
129 175 </component>
... ... @@ -134,11 +180,18 @@
134 180 </set>
135 181 </option>
136 182 </component>
  183 + <component name="MavenImportPreferences">
  184 + <option name="importingSettings">
  185 + <MavenImportingSettings>
  186 + <option name="importAutomatically" value="true" />
  187 + </MavenImportingSettings>
  188 + </option>
  189 + </component>
137 190 <component name="ProjectFrameBounds" extendedState="6">
138 191 <option name="x" value="-10" />
139 192 <option name="y" value="-10" />
140   - <option name="width" value="1940" />
141   - <option name="height" value="1050" />
  193 + <option name="width" value="1939" />
  194 + <option name="height" value="1049" />
142 195 </component>
143 196 <component name="ProjectId" id="1P5Ngjh73HToCarlEZkqMxrL7pm" />
144 197 <component name="ProjectLevelVcsManager">
... ... @@ -149,6 +202,7 @@
149 202 <foldersAlwaysOnTop value="true" />
150 203 </navigator>
151 204 <panes>
  205 + <pane id="Scope" />
152 206 <pane id="PackagesPane" />
153 207 <pane id="ProjectPane">
154 208 <subPane>
... ... @@ -236,7 +290,7 @@
236 290 <item name="pc" type="462c0819:PsiDirectoryNode" />
237 291 <item name="inventory" type="462c0819:PsiDirectoryNode" />
238 292 <item name="inventoryDetail" type="462c0819:PsiDirectoryNode" />
239   - <item name="domain" type="462c0819:PsiDirectoryNode" />
  293 + <item name="controller" type="462c0819:PsiDirectoryNode" />
240 294 </path>
241 295 <path>
242 296 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -285,6 +339,19 @@
285 339 <item name="com" type="462c0819:PsiDirectoryNode" />
286 340 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
287 341 <item name="pc" type="462c0819:PsiDirectoryNode" />
  342 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  343 + <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" />
288 355 <item name="shipment" type="462c0819:PsiDirectoryNode" />
289 356 </path>
290 357 <path>
... ... @@ -297,7 +364,7 @@
297 364 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
298 365 <item name="pc" type="462c0819:PsiDirectoryNode" />
299 366 <item name="shipment" type="462c0819:PsiDirectoryNode" />
300   - <item name="shipmentContainerHeader" type="462c0819:PsiDirectoryNode" />
  367 + <item name="shipmentHeader" type="462c0819:PsiDirectoryNode" />
301 368 </path>
302 369 <path>
303 370 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -309,7 +376,7 @@
309 376 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
310 377 <item name="pc" type="462c0819:PsiDirectoryNode" />
311 378 <item name="shipment" type="462c0819:PsiDirectoryNode" />
312   - <item name="shipmentContainerHeader" type="462c0819:PsiDirectoryNode" />
  379 + <item name="shipmentHeader" type="462c0819:PsiDirectoryNode" />
313 380 <item name="domain" type="462c0819:PsiDirectoryNode" />
314 381 </path>
315 382 <path>
... ... @@ -322,8 +389,7 @@
322 389 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
323 390 <item name="pc" type="462c0819:PsiDirectoryNode" />
324 391 <item name="shipment" type="462c0819:PsiDirectoryNode" />
325   - <item name="shipmentContainerHeader" type="462c0819:PsiDirectoryNode" />
326   - <item name="mapper" type="462c0819:PsiDirectoryNode" />
  392 + <item name="shippingCombination" type="462c0819:PsiDirectoryNode" />
327 393 </path>
328 394 <path>
329 395 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -335,14 +401,109 @@
335 401 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
336 402 <item name="pc" type="462c0819:PsiDirectoryNode" />
337 403 <item name="shipment" type="462c0819:PsiDirectoryNode" />
338   - <item name="shipmentContainerHeader" type="462c0819:PsiDirectoryNode" />
  404 + <item name="shippingCombination" type="462c0819:PsiDirectoryNode" />
  405 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  406 + </path>
  407 + <path>
  408 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  409 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  410 + <item name="src" type="462c0819:PsiDirectoryNode" />
  411 + <item name="main" type="462c0819:PsiDirectoryNode" />
  412 + <item name="java" type="462c0819:PsiDirectoryNode" />
  413 + <item name="com" type="462c0819:PsiDirectoryNode" />
  414 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  415 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  416 + <item name="shipment" type="462c0819:PsiDirectoryNode" />
  417 + <item name="shippingCombination" type="462c0819:PsiDirectoryNode" />
339 418 <item name="service" type="462c0819:PsiDirectoryNode" />
340 419 </path>
  420 + <path>
  421 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  422 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  423 + <item name="src" type="462c0819:PsiDirectoryNode" />
  424 + <item name="main" type="462c0819:PsiDirectoryNode" />
  425 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  426 + </path>
  427 + <path>
  428 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  429 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  430 + <item name="src" type="462c0819:PsiDirectoryNode" />
  431 + <item name="main" type="462c0819:PsiDirectoryNode" />
  432 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  433 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  434 + </path>
  435 + <path>
  436 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  437 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  438 + <item name="src" type="462c0819:PsiDirectoryNode" />
  439 + <item name="main" type="462c0819:PsiDirectoryNode" />
  440 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  441 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  442 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  443 + </path>
  444 + <path>
  445 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  446 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  447 + <item name="src" type="462c0819:PsiDirectoryNode" />
  448 + <item name="main" type="462c0819:PsiDirectoryNode" />
  449 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  450 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  451 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  452 + <item name="cyclecountAdjust" type="462c0819:PsiDirectoryNode" />
  453 + </path>
  454 + <path>
  455 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  456 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  457 + <item name="src" type="462c0819:PsiDirectoryNode" />
  458 + <item name="main" type="462c0819:PsiDirectoryNode" />
  459 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  460 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  461 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  462 + <item name="inventoryHeader" type="462c0819:PsiDirectoryNode" />
  463 + </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>
341 503 </expand>
342 504 <select />
343 505 </subPane>
344 506 </pane>
345   - <pane id="Scope" />
346 507 </panes>
347 508 </component>
348 509 <component name="PropertiesComponent">
... ... @@ -357,7 +518,7 @@
357 518 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
358 519 <property name="WebServerToolWindowFactoryState" value="false" />
359 520 <property name="aspect.path.notification.shown" value="true" />
360   - <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis/config" />
  521 + <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail" />
361 522 <property name="node.js.detected.package.eslint" value="true" />
362 523 <property name="node.js.detected.package.tslint" value="true" />
363 524 <property name="node.js.path.for.package.eslint" value="project" />
... ... @@ -371,17 +532,17 @@
371 532 <property name="settings.editor.selected.configurable" value="File.Encoding" />
372 533 </component>
373 534 <component name="RecentsManager">
374   - <key name="MoveFile.RECENT_KEYS">
375   - <recent name="E:\code\wms2\src\main\resources\templates\general\carrier" />
376   - <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
377   - <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
378   - </key>
379 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" />
380 538 <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
381 539 <recent name="E:\code\wms2\src\main\java\com\huaheng\pc\config" />
382 540 <recent name="E:\code\wms2\src\main\resources\static\ajax\libs\layui\lay\modules" />
383   - <recent name="E:\code\wms2\target\classes\static\file" />
384   - <recent name="E:\code\wms2\src\main\resources\static\file" />
  541 + </key>
  542 + <key name="MoveFile.RECENT_KEYS">
  543 + <recent name="E:\code\wms2\src\main\resources\templates\general\carrier" />
  544 + <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
  545 + <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
385 546 </key>
386 547 </component>
387 548 <component name="RunDashboard">
... ... @@ -400,6 +561,7 @@
400 561 </RuleState>
401 562 </list>
402 563 </option>
  564 + <option name="contentProportion" value="0.08743169" />
403 565 </component>
404 566 <component name="RunManager">
405 567 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
... ... @@ -569,32 +731,41 @@
569 731 <option name="localTasksCounter" value="14" />
570 732 <servers />
571 733 </component>
  734 + <component name="TodoView" selected-index="1">
  735 + <todo-panel id="selected-file">
  736 + <is-autoscroll-to-source value="true" />
  737 + </todo-panel>
  738 + <todo-panel id="all">
  739 + <are-packages-shown value="true" />
  740 + <is-autoscroll-to-source value="true" />
  741 + </todo-panel>
  742 + </component>
572 743 <component name="ToolWindowManager">
573 744 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
574 745 <editor active="true" />
575 746 <layout>
576   - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2627346" />
577   - <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
578   - <window_info id="Web" order="2" side_tool="true" />
  747 + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.23793566" />
  748 + <window_info id="Structure" order="1" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
  749 + <window_info id="Web" order="2" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
579 750 <window_info id="Designer" order="3" />
580 751 <window_info id="UI Designer" order="4" />
581   - <window_info id="Favorites" order="5" side_tool="true" />
582   - <window_info anchor="bottom" id="Messages" visible="true" weight="0.06798867" />
583   - <window_info anchor="bottom" id="MyBatis Log" />
  752 + <window_info id="Favorites" order="5" sideWeight="0.50167227" side_tool="true" weight="0.23793566" />
584 753 <window_info anchor="bottom" id="Message" order="0" />
585 754 <window_info anchor="bottom" id="Find" order="1" />
586 755 <window_info anchor="bottom" id="Run" order="2" />
587 756 <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
588 757 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
589 758 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
590   - <window_info anchor="bottom" id="TODO" order="6" />
  759 + <window_info anchor="bottom" id="TODO" order="6" weight="0.3286119" />
591 760 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
592   - <window_info anchor="bottom" id="Version Control" order="8" />
593   - <window_info anchor="bottom" id="Run Dashboard" order="9" />
594   - <window_info anchor="bottom" id="Spring" order="10" />
595   - <window_info anchor="bottom" id="Database Changes" order="11" />
  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" />
  763 + <window_info anchor="bottom" id="Spring" order="10" weight="0.3286119" />
  764 + <window_info anchor="bottom" id="Database Changes" order="11" weight="0.3286119" />
596 765 <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
597   - <window_info anchor="bottom" id="Java Enterprise" order="13" />
  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" />
  768 + <window_info anchor="bottom" id="MyBatis Log" order="15" />
598 769 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
599 770 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
600 771 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
... ... @@ -620,7 +791,14 @@
620 791 <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
621 792 <collection />
622 793 </option>
623   - <option name="COLUMN_ORDER" />
  794 + <option name="COLUMN_ORDER">
  795 + <list>
  796 + <option value="0" />
  797 + <option value="1" />
  798 + <option value="2" />
  799 + <option value="3" />
  800 + </list>
  801 + </option>
624 802 </State>
625 803 </value>
626 804 </entry>
... ... @@ -688,52 +866,208 @@
688 866 </breakpoint-manager>
689 867 </component>
690 868 <component name="editorHistoryManager">
691   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java">
  869 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java">
692 870 <provider selected="true" editor-type-id="text-editor">
693   - <state relative-caret-position="60">
694   - <caret line="155" selection-start-line="155" selection-end-line="155" />
  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" />
695 873 </state>
696 874 </provider>
697 875 </entry>
698   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
  876 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentCombinationModel.java">
699 877 <provider selected="true" editor-type-id="text-editor">
700   - <state relative-caret-position="200">
701   - <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" />
  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" />
702 880 </state>
703 881 </provider>
704 882 </entry>
705   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
  883 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java">
706 884 <provider selected="true" editor-type-id="text-editor">
707   - <state relative-caret-position="-304">
708   - <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
  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" />
709 887 </state>
710 888 </provider>
711 889 </entry>
712   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java">
  890 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java">
713 891 <provider selected="true" editor-type-id="text-editor">
714   - <state relative-caret-position="-356">
715   - <caret line="118" column="16" selection-start-line="118" selection-start-column="16" selection-end-line="118" selection-end-column="16" />
  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" />
716 894 </state>
717 895 </provider>
718 896 </entry>
719   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentCombinationModel.java">
  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 />
  904 + </state>
  905 + </provider>
  906 + </entry>
  907 + <entry file="file://$PROJECT_DIR$/pom.xml">
  908 + <provider editor-type-id="MavenHelperPluginDependencyAnalyzer" />
720 909 <provider selected="true" editor-type-id="text-editor">
721   - <state relative-caret-position="68">
  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" />
  912 + </state>
  913 + </provider>
  914 + </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">
  916 + <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" />
  919 + </state>
  920 + </provider>
  921 + </entry>
  922 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/error/500.html">
  923 + <provider selected="true" editor-type-id="text-editor" />
  924 + </entry>
  925 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/error/unauth.html">
  926 + <provider selected="true" editor-type-id="text-editor" />
  927 + </entry>
  928 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/error/404.html">
  929 + <provider selected="true" editor-type-id="text-editor" />
  930 + </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">
  933 + <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" />
  936 + </state>
  937 + </provider>
  938 + </entry>
  939 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java">
  940 + <provider selected="true" editor-type-id="text-editor">
  941 + <state relative-caret-position="140">
722 942 <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
723 943 </state>
724 944 </provider>
725 945 </entry>
726   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java">
  946 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountAdjust/cyclecountAdjust.html">
727 947 <provider selected="true" editor-type-id="text-editor">
728   - <state relative-caret-position="202">
729   - <caret line="76" column="16" lean-forward="true" selection-start-line="76" selection-start-column="16" selection-end-line="76" selection-end-column="16" />
  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>
730 956 </state>
731 957 </provider>
732 958 </entry>
733   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java">
  959 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html">
734 960 <provider selected="true" editor-type-id="text-editor">
735   - <state relative-caret-position="1156">
736   - <caret line="81" column="11" lean-forward="true" selection-start-line="81" selection-start-column="11" selection-end-line="81" selection-end-column="11" />
  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>
  979 + </state>
  980 + </provider>
  981 + </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">
  983 + <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" />
  986 + </state>
  987 + </provider>
  988 + </entry>
  989 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptContainerDetail/receiptContainerDetail.html">
  990 + <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" />
  993 + </state>
  994 + </provider>
  995 + </entry>
  996 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java">
  997 + <provider selected="true" editor-type-id="text-editor">
  998 + <state>
  999 + <caret column="28" selection-start-column="28" selection-end-column="28" />
  1000 + </state>
  1001 + </provider>
  1002 + </entry>
  1003 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html">
  1004 + <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>
  1012 + </state>
  1013 + </provider>
  1014 + </entry>
  1015 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/js/huahengUI.js">
  1016 + <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" />
  1019 + </state>
  1020 + </provider>
  1021 + </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">
  1023 + <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" />
  1026 + </state>
  1027 + </provider>
  1028 + </entry>
  1029 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html">
  1030 + <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>
  1036 + </state>
  1037 + </provider>
  1038 + </entry>
  1039 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/mapper/InventoryHeaderMapper.java">
  1040 + <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" />
  1043 + </state>
  1044 + </provider>
  1045 + </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">
  1047 + <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" />
  1050 + </state>
  1051 + </provider>
  1052 + </entry>
  1053 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java">
  1054 + <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" />
  1057 + </state>
  1058 + </provider>
  1059 + </entry>
  1060 + <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml">
  1061 + <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" />
  1064 + </state>
  1065 + </provider>
  1066 + </entry>
  1067 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java">
  1068 + <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" />
737 1071 </state>
738 1072 </provider>
739 1073 </entry>
... ...
README.md
  View file @2a797cb
1 1 版本说明
2 2  
3   - 1. 立库专用分支，单独立库的WMS程序，2019/06/11与主程序解耦。
4   -
5 3 \ No newline at end of file
  4 + WMS_v2
6 5 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
  View file @2a797cb
... ... @@ -25,7 +25,7 @@ import javax.annotation.Resource;
25 25 @RequestMapping("/inventory/inventoryDetail")
26 26 public class InventoryDetailController extends BaseController
27 27 {
28   - private String prefix = "inventoryHeader/inventoryDetail";
  28 + private String prefix = "inventory/inventoryDetail";
29 29  
30 30 @Resource
31 31 private MaterialServiceImpl materialService;
... ... @@ -34,7 +34,7 @@ public class InventoryDetailController extends BaseController
34 34  
35 35  
36 36  
37   - @RequiresPermissions("inventoryDetail:inventoryDetail:view")
  37 + //@RequiresPermissions("inventory:inventoryDetail:view")
38 38 @GetMapping()
39 39 public String inventory()
40 40 {
... ... @@ -42,42 +42,16 @@ public class InventoryDetailController extends BaseController
42 42 }
43 43  
44 44 /**
45   - * 查询库存列表
  45 + * 查询库存明细列表
46 46 */
47   - @RequiresPermissions("inventoryDetail:inventoryDetail:list")
48   - @Log(title = "库存-库存查看",operating = "查看库存列表", action = BusinessType.GRANT)
49   - @PostMapping("/inventoryLook")
  47 + //@RequiresPermissions("inventory:inventoryDetail:list")
  48 + @Log(title = "库存-库存明细查看",operating = "查看库存明细列表", action = BusinessType.GRANT)
  49 + @PostMapping("/inventoryDetailLook")
50 50 @ResponseBody
51 51 public TableDataInfo list()
52 52 {
53 53  
54   - return null;
55   - }
56   -
57   - @GetMapping("/transfer")
58   - public String transfer(){
59   - return prefix + "/transfer";
60   - }
61   -
62   - /**移库*/
63   - @RequiresPermissions("inventoryDetail:inventoryDetail:transfer")
64   - @PostMapping("/transfer")
65   - @ResponseBody
66   - public AjaxResult transfer(String sourceLocation, String destinationLocation, Integer companyId, String companyCode){
67   - return null;
68   - //inventoryHeaderService.transfer(sourceLocation,destinationLocation,companyId,companyCode);
69   - }
70   -
71   - /**出库查看*/
72   - @RequiresPermissions("inventoryDetail:inventoryDetail:seeOut")
73   - @PostMapping("/createCheckOutTask")
74   - @ResponseBody
75   - public AjaxResult createCheckOutTask(String ids){
76   - if(StringUtils.isEmpty(ids)){
77   - return AjaxResult.error("ids不能为空");
78   - }
79   - return null;
80   - //taskService.createCheckOutTask(ids.split(","));
  54 + return getDataTable(null);
81 55 }
82 56  
83 57 }
... ...
src/main/java/com/huaheng/pc/inventory/inventoryHeader/controller/InventoryHeaderController.java
  View file @2a797cb
... ... @@ -30,7 +30,7 @@ import java.util.List;
30 30 @RequestMapping("/inventory/inventoryHeader")
31 31 public class InventoryHeaderController extends BaseController
32 32 {
33   - private String prefix = "inventoryHeader/inventoryHeader";
  33 + private String prefix = "inventory/inventoryHeader";
34 34  
35 35 @Resource
36 36 private MaterialServiceImpl materialService;
... ... @@ -38,7 +38,7 @@ public class InventoryHeaderController extends BaseController
38 38 private InventoryHeaderService inventoryHeaderService;
39 39  
40 40  
41   - @RequiresPermissions("inventoryHeader:inventoryHeader:view")
  41 + @RequiresPermissions("inventory:inventoryHeader:view")
42 42 @GetMapping()
43 43 public String inventoryHeader()
44 44 {
... ... @@ -48,7 +48,7 @@ public class InventoryHeaderController extends BaseController
48 48 /**
49 49 * 查询库存列表
50 50 */
51   - @RequiresPermissions("inventoryHeader:inventoryHeader:list")
  51 + @RequiresPermissions("inventory:inventoryHeader:list")
52 52 @Log(title = "库存-库存查看",operating = "查看库存列表", action = BusinessType.GRANT)
53 53 @PostMapping("/inventoryLook")
54 54 @ResponseBody
... ... @@ -65,8 +65,6 @@ public class InventoryHeaderController extends BaseController
65 65 .eq(StringUtils.isNotEmpty(inventoryHeader.getLocationCode()),InventoryHeader::getLocationCode,inventoryHeader.getLocationCode()) //库位
66 66 .eq(StringUtils.isNotEmpty(inventoryHeader.getContainerCode()),InventoryHeader::getContainerCode,inventoryHeader.getContainerCode())//容器
67 67 .eq(StringUtils.isNotEmpty(inventoryHeader.getCompanyCode()), InventoryHeader::getCompanyCode,inventoryHeader.getCompanyCode())//货主
68   - .eq(StringUtils.isNotEmpty(inventoryHeader.getBatchs()), InventoryHeader::getBatchs, inventoryHeader.getBatchs())//批次
69   - .eq(StringUtils.isNotEmpty(inventoryHeader.getLots()),InventoryHeader::getLots,inventoryHeader.getLots())//批号
70 68 .orderByDesc(InventoryHeader::getId);
71 69  
72 70 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
... ... @@ -89,7 +87,7 @@ public class InventoryHeaderController extends BaseController
89 87 }
90 88  
91 89 /**移库*/
92   - @RequiresPermissions("inventoryHeader:inventoryHeader:transfer")
  90 + @RequiresPermissions("inventory:inventoryHeader:transfer")
93 91 @PostMapping("/transfer")
94 92 @ResponseBody
95 93 public AjaxResult transfer(String sourceLocation, String destinationLocation, Integer companyId, String companyCode){
... ... @@ -98,7 +96,7 @@ public class InventoryHeaderController extends BaseController
98 96 }
99 97  
100 98 /**出库查看*/
101   - @RequiresPermissions("inventoryHeader:inventoryHeader:seeOut")
  99 + @RequiresPermissions("inventory:inventoryHeader:seeOut")
102 100 @PostMapping("/createCheckOutTask")
103 101 @ResponseBody
104 102 public AjaxResult createCheckOutTask(String ids){
... ...
src/main/java/com/huaheng/pc/inventory/inventoryHeader/domain/InventoryHeader.java
  View file @2a797cb
... ... @@ -52,11 +52,6 @@ public class InventoryHeader implements Serializable {
52 52 @TableField(value = "companyCode")
53 53 private String companyCode;
54 54  
55   - /**
56   - * 重量
57   - */
58   - @TableField(value = "weight")
59   - private String weight;
60 55  
61 56 /**
62 57 * 商品种类的数量
... ... @@ -65,6 +60,12 @@ public class InventoryHeader implements Serializable {
65 60 private String materialSkuQty;
66 61  
67 62 /**
  63 + * 总重量
  64 + * */
  65 + @TableField(value = "totalWeight")
  66 + private String totalWeight;
  67 +
  68 + /**
68 69 * 总数量
69 70 */
70 71 @TableField(value = "totalQty")
... ... @@ -154,10 +155,6 @@ public class InventoryHeader implements Serializable {
154 155 @TableField(value = "userDef3")
155 156 private String userDef3;
156 157  
157   - /**
158   - * 库存详情
159   - */
160   - private InventoryDetail inventoryDetail;
161 158  
162 159 private static final long serialVersionUID = 1L;
163 160  
... ... @@ -171,10 +168,10 @@ public class InventoryHeader implements Serializable {
171 168  
172 169 public static final String COL_COMPANYCODE = "companyCode";
173 170  
174   - public static final String COL_WEIGHT = "weight";
175   -
176 171 public static final String COL_MATERIALSKUQTY = "materialSkuQty";
177 172  
  173 + public static final String COL_TOTALWEIGHT ="totalWeight";
  174 +
178 175 public static final String COL_TOTALQTY = "totalQty";
179 176  
180 177 public static final String COL_TOTALLINES = "totalLines";
... ... @@ -205,13 +202,4 @@ public class InventoryHeader implements Serializable {
205 202  
206 203 public static final String COL_USERDEF3 = "userDef3";
207 204  
208   - public static final String COL_USERDEF4 = "userDef4";
209   -
210   - public static final String COL_USERDEF5 = "userDef5";
211   -
212   - public static final String COL_USERDEF6 = "userDef6";
213   -
214   - public static final String COL_USERDEF7 = "userDef7";
215   -
216   - public static final String COL_USERDEF8 = "userDef8";
217 205 }
218 206 \ No newline at end of file
... ...
src/main/resources/mybatis/inventory/InventoryHeaderMapper.xml
  View file @2a797cb
... ... @@ -9,7 +9,7 @@
9 9 <result column="containerCode" jdbcType="VARCHAR" property="containerCode" />
10 10 <result column="containerStatus" jdbcType="VARCHAR" property="containerStatus" />
11 11 <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
12   - <result column="weight" jdbcType="VARCHAR" property="weight" />
  12 + <result column="totalWeight" jdbcType="VARCHAR" property="totalWeight" />
13 13 <result column="materialSkuQty" jdbcType="VARCHAR" property="materialSkuQty" />
14 14 <result column="totalQty" jdbcType="INTEGER" property="totalQty" />
15 15 <result column="totalLines" jdbcType="INTEGER" property="totalLines" />
... ... @@ -29,7 +29,7 @@
29 29 </resultMap>
30 30 <sql id="Base_Column_List">
31 31 <!--@mbg.generated-->
32   - id, warehouseCode, locationCode, containerCode, containerStatus, companyCode, weight,
  32 + id, warehouseCode, locationCode, containerCode, containerStatus, companyCode, totalWeight,
33 33 materialSkuQty, totalQty, totalLines, projectNos, batchs, lots, lastCycleCountDate,
34 34 `enable`, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2,
35 35 userDef3,
... ...
src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html
  View file @2a797cb
1 1 <!DOCTYPE HTML>
2   -<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org">
3 3 <meta charset="utf-8">
4 4 <head th:include="include :: header"></head>
5 5 <style>
6   - .btn-default {
7   - color: #333;
8   - background-color: #fff;
9   - border-color: #ccc
  6 + #toolbar1{
  7 + display: inline-block;
  8 + /*position: absolute;
  9 + margin: 10px auto;*/
  10 + line-height: 34px;
10 11 }
11 12 </style>
12 13 <body class="gray-bg">
13   -<div class="container-div">
14   - <div class="row">
15   - <div class="col-sm-12 select-info">
16   - <ul id="myTab" class="nav nav-tabs">
17   - <li class="active"><a href="#tabHeader" data-toggle="tab">主表</a></li>
18   - <li><a href="#tabDetail" data-toggle="tab">明细</a></li>
19   - </ul>
20   - <div id="myTabContent" class="tab-content">
21   - <div class="tab-pane fade in active" id="tabHeader">
22   - <div class="col-sm-12 select-info">
23   - <form id="receiptHeader-form">
24   - <div class="select-list">
25   - <ul>
26   - <li>
27   - 出库单号：<input type="text" name="code"/>
28   - </li>
29   - <li>
30   - <!--入库类型：<input type="text" name="sourceCode"/>-->
31   - 出库类型：<select name="shipmentType" th:with="shipmentType=${@dict.getType('shipmentType')}">
32   - <option value="">所有</option>
33   - <option th:each="e : ${shipmentType}" th:text="${e['dictLabel']}"
34   - th:value="${e['dictValue']}"></option>
35   - </select>
36   - </li>
37   - <li>
38   - erp单号：<input type="text" name="referCode"/>
39   - </li>
40   - <li>
41   - erp订单类型：<input type="text" name="referCodeType"/>
42   - </li>
43   - <li>
44   - 客户编码：<input type="text" name="sourceCode"/>
45   - </li>
46   - <li>
47   - <!--头 状 态：<input type="text" name="firstStatus"/>-->
48   - 头 状 态：<select name="firstStatus"
49   - th:with="firstStatus=${@dict.getType('shipmentHeaderStatus')}">
50   - <option value="">所有</option>
51   - <option th:each="e : ${firstStatus}" th:text="${e['dictLabel']}"
52   - th:value="${e['dictValue']}"></option>
53   - </select>
54   - </li>
55   - <li>
56   - <!--尾 状 态：<input type="text" name="lastStatus"/>-->
57   - 尾 状 态：<select name="lastStatus"
58   - th:with="lastStatus=${@dict.getType('shipmentHeaderStatus')}">
59   - <option value="">所有</option>
60   - <option th:each="e : ${lastStatus}" th:text="${e['dictLabel']}"
61   - th:value="${e['dictValue']}"></option>
62   - </select>
63   - </li>
64   - <li class="time">
65   - <label>创建时间： </label>
66   - <input type="text" class="time-input" id="startTime" placeholder="开始时间"
67   - name="createdBegin"/>
68   - <span>-</span>
69   - <input type="text" class="time-input" id="endTime" placeholder="结束时间"
70   - name="createdEnd"/>
71   - </li>
72   - <li>
73   - <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
74   - class="fa fa-search"></i>&nbsp;搜索</a>
75   - <!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="receipt:receiptHeader:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->
76   - </li>
77   - </ul>
78   - </div>
79   - </form>
80   - </div>
81   - <div class="btn-group hidden-xs" id="toolbar" role="group">
82   - <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()"
83   - shiro:hasPermission="shipment:bill:add">
84   - <i class="fa fa-plus"></i> 新增
85   - </a>
86   - <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()"
87   - shiro:hasPermission="shipment:bill:remove">
88   - <i class="fa fa-trash-o"></i> 删除
89   - </a>
90   - </div>
91   - <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
92   - </div>
93   - <div class="tab-pane fade" id="tabDetail">
94   - <div class="col-sm-12 select-info">
95   - <form id = "shipmentHeadForm" >
96   - <ul id="tabHead" class="nav nav-tabs">
97   - <li class="active"><a href="#tabBase" data-toggle="tab">基础数据</a></li>
98   - <li role="presentation" ><a href="#tabCustomer" data-toggle="tab">客户信息</a></li>
99   - <li><a href="#tabExcute" data-toggle="tab">执行信息</a></li>
100   - <li><a href="#tabOther" data-toggle="tab">其他信息</a></li>
101   - <li><a href="#tabSystem" data-toggle="tab">系统信息</a></li>
102   - </ul>
103   - <div class="tab-content">
104   - <div class="tab-pane fade in active" id="tabBase">
105   - <div class="select-list">
106   - <ul>
107   - <li>出库单id:<input type="text" name="shipmentId" id="shipmentId"><li>
108   - <li>出库单号：<input type="text" name="shipmentCode" id="shipmentCode"></li>
109   - <input type="hidden" name="shipmentWarehouseId" id = "shipmentWarehouseId">
110   - <li>仓库编码：<input type="text" name="shipmentWarehouseCode" id="shipmentWarehouseCode"></li>
111   - <input type="hidden" name="shipmentCompanyId" id="shipmentCompanyId">
112   - <li>货主：<input type="text" name="shipmentCompanyCode" id="shipmentCompanyCode"></li>
113   - <li>上游系统单号：<input type="text" name="shipmentSourceCode" id="shipmentSourceCode"></li>
114   - <li>上游平台：<input type="text" name="shipmentSourcePlatform" id="shipmentSourcePlatform"></li>
115   - <li>出库单类型：<input type="text" name="shipmentType" id = "shipmentType"></li>
116   - <li>总数量：<input type="text" name="shipmentTotalQty" id="shipmentTotalQty"></li>
117   - <li>总行数：<input type="text" name="shipmentTotalLines" id="shipmentTotalLines"></li>
118   - <li>单据头状态：<input type="text" name="shipmentFirstStatus" id="shipmentFirstStatus"></li>
119   - <li>单据尾状态：<input type="text" name="shipmentLastStatus" id="shipmentLastStatus"></li>
120   - </ul>
121   - </div>
122   - </div>
123   - <div class="tab-pane fade" id="tabCustomer">
124   - <div class="select-list">
125   - <ul>
126   - <li>客户编码：<input type="text" name="shipmentShipTo" id="shipmentShipTo"></li>
127   - <li>发货预约时间：<input type="text" name="shipmentAppointmentTime" id="shipmentAppointmentTime"></li>
128   - </ul>
129   - </div>
130   - </div>
131   - <div class="tab-pane fade" id="tabExcute">
132   - <div class="select-list">
133   - <ul>
134   - <li>优先级：<input type="text" name="shipmentPriority" id="shipmentPriority"></li>
135   - <li>发货站台：<input type="text" name="shipmentStation" id="shipmentStation"></li>
136   - <li></li>
137   - </ul>
138   - </div>
139   - </div>
140   - <div class="tab-pane fade" id="tabOther">
141   - <div class="select-list">
142   - <ul>
143   - <li>备注：<input type="text" name="shipmentRemark" id="shipmentRemark"></li>
144   - <li>扩展属性1：<input type="text" name="shipmentUserDef1" id="shipmentUserDef1"></li>
145   - <li>扩展属性2：<input type="text" name="shipmentUserDef2" id="shipmentUserDef2"></li>
146   - <li>扩展属性3：<input type="text" name="shipmentUserDef3" id="shipmentUserDef3"></li>
147   -
148   - </ul>
149   - </div>
150   - </div>
151   - <div class="tab-pane fade" id="tabSystem">
152   - <div class="select-list">
153   - <ul>
154   - <li>上传备注：<input type="text" name="shipmentUploadremark" id="shipmentUploadremark"></li>
155   - <li>上传时间：<input type="text" name="shipmentUploadTime" id="shipmentUploadTime"></li>
156   - <li>上传状态：<input type="text" name="shipmentUploadStatus" id="shipmentUploadStatus"></li>
157   - <li>创建时间：<input type="text" name="shipmentCreated" id="shipmentCreated"></li>
158   - <li>创建用户：<input type="text" name="shipmentCreatedBy" id="shipmentCreatedBy"></li>
159   - <li>最后修改时间：<input type="text" name="shipmentLastUpdated" id="shipmentLastUpdated"></li>
160   - <li>更新用户：<input type="text" name=" shipmentLastUpdatedBy" id="shipmentLastUpdatedBy"></li>
161   - <li>是否有效：<input type="text" name="shipmentEnable" id="shipmentEnable"></li>
162   - <li>是否删除：<input type="text" name="shipmentDeleted" id="shipmentDeleted"></li>
163   - </ul>
164   - </div>
165   - </div>
166   - </div>
167   - </form>
168   - </div>
169   - <div class="btn-group hidden-xs" id="toolbar-detail" role="group" style="padding:20px 0;">
170   -
171   - <a class="btn btn-outline btn-success btn-rounded" onclick="add()" shiro:hasPermission="shipment:bill:add">
172   - <i class="fa fa-plus"></i> 新增
173   - </a>
174   - <a class="btn btn-outline btn-danger btn-rounded" onclick="batRemove()" shiro:hasPermission="shipment:bill:remove">
175   - <i class="fa fa-trash-o"></i> 删除
176   - </a>
177   - <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.edit(shipmentId)" shiro:hasPermission="shipment:bill:edit">
178   - <i class="fa fa-edit"></i> 编辑主单据
179   - </a>
180   - <a class="btn btn-outline btn-default btn-rounded" onclick="loadDetail()">
181   - <i class="fa fa-refresh"></i> 刷新
182   - </a>
183   - <!--<a class="btn btn-outline btn-success btn-rounded" onclick="autoZone()" shiro:hasPermission="shipment:bill:add">-->
184   - <!--<i class="fa fa-plus"></i> 自动分配库区-->
185   - <!--</a>-->
186   - <!--<a class="btn btn-outline btn-success btn-rounded" onclick="addzone()" shiro:hasPermission="shipment:bill:add">-->
187   - <!--<i class="fa fa-plus"></i> 分配库区-->
188   - <!--</a>-->
189   - <a class="btn btn-outline btn-primary btn-rounded to-receive" onclick="Toshipping(false)" shiro:hasPermission="shipment:shippingCombination:combination">
190   - <i class="fa fa-hand-lizard-o"></i> 手动组盘
191   - </a>
192   - <a class="btn btn-outline btn-primary btn-rounded auto-shipment" onclick="Toshipping(true)" shiro:hasPermission="shipment:shippingCombination:combination">
193   - <i class="fa fa-code-fork"></i> 自动组盘
194   - </a>
195   - </div>
196   - <table id="bootstrap-table-detail" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
197   - </div>
198   - </div>
199   - </div>
  14 + <div class="container-div">
  15 + <div class="row">
  16 + <div class="col-sm-12 select-info">
  17 + <ul id="myTab" class="nav nav-tabs">
  18 + <li class="active"><a href="#tabHeader" data-toggle="tab">主表</a></li>
  19 + <li><a href="#tabDetail" data-toggle="tab">明细</a></li>
  20 + </ul>
  21 + <div id="myTabContent" class="tab-content">
  22 + <div class="tab-pane fade in active" id="tabHeader">
  23 + <div class="col-sm-12 select-info">
  24 + <form id="inventoryHeader-form">
  25 + <div class="select-list">
  26 + <ul>
  27 + <li>
  28 + 差异单编号：<input type="text" name="code"/>
  29 + </li>
  30 + <li>
  31 + 源盘点单号：<input type="text" name="sourceCode"/>
  32 + </li>
  33 + <!--<li>
  34 + 差异单状态：<select name="status"
  35 + th:with="lastStatus=${@dict.getType('adjustType')}">
  36 + <option value="">所有</option>
  37 + <option th:each="e : ${lastStatus}" th:text="${e['dictLabel']}"
  38 + th:value="${e['dictValue']}"></option>
  39 + </select>
  40 + </li>-->
  41 + <li class="time">
  42 + <label>创建时间： </label>
  43 + <input type="text" class="time-input" id="startTime" placeholder="开始时间"
  44 + name="params[createdBegin]"/>
  45 + <span>-</span>
  46 + <input type="text" class="time-input" id="endTime" placeholder="结束时间"
  47 + name="params[createdEnd]"/>
  48 + </li>
  49 + <li>
  50 + 货主编码：<input type="text" name="companyCode"/>
  51 + </li>
  52 + <li>
  53 + 创建人：<input type="text" name="createdBy"/>
  54 + </li>
  55 + <li>
  56 + 更新人：<input type="text" name="lastUpdatedBy"/>
  57 + </li>
  58 + <li>
  59 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
  60 + class="fa fa-search"></i>&nbsp;搜索</a>
  61 + </li>
  62 + </ul>
  63 + </div>
  64 + </form>
  65 + </div>
  66 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  67 + </div>
  68 + <div class="tab-pane fade" id="tabDetail"></div>
  69 + </div>
  70 + </div>
  71 +
  72 + </div>
200 73 </div>
201   -</div>
202   -<div th:include="include :: footer"></div>
203   -<script th:inline="javascript">
204   - var printFlag = [[${@permission.hasPermi('shipment:bill:report')}]]; //打印
205   - var editFlag = [[${@permission.hasPermi('shipment:bill:edit')}]];
206   - var removeFlag = [[${@permission.hasPermi('shipment:bill:remove')}]];
207   - var prefix = ctx + "shipment/shipmentHeader";
208   - var prefix_detail = ctx + "shipment/shipmentDetail";
209   - var datas = [[${@dict.getType('sys_normal_disable')}]];
210   - var shipmentTypes=[[${@dict.getType('shipmentType')}]];
211   - var shipmentHeaderStatus=[[${@dict.getType('shipmentHeaderStatus')}]];
212   - var stations = [[${@dict.getType('station')}]];
213   - var uploadStatus=[[${@dict.getType('uploadStatus')}]];
214   - var detailCreateUrl=prefix_detail+"/add";
215   - var detailRemoveUrl=prefix_detail+"/remove";
216   - var inventoryStatus=[[${@dict.getType('inventoryStatus')}]];
217   - var rossDoccking = [[${@permission.hasPermi('shipment:bill:rossDoccking')}]];
218   - var rossDocckingUrl =prefix_detail+"/rossDoccking";
219   - var shipmentId = "";
220   - var shipmentCode="";
221   -
222   - $(function () {
223   - var options = {
224   - url: prefix + "/list",
225   - createUrl: prefix + "/add",
226   - updateUrl: prefix + "/edit/{id}",
227   - removeUrl: prefix + "/remove",
228   - modalName: "出库单",
229   - sortName: "created",
230   - sortOrder: "desc",
231   - search: false,
232   - columns: [
233   - {
234   - checkbox: true
235   - },
236   - {
237   - field: 'id',
238   - title: '出库单id'
239   - },
240   - {
241   - field: 'code',
242   - title: '出库单号',
243   - sortable:true
244   - },
245   - {
246   - field: 'companyCode',
247   - title: '货主',
248   - sortable:true
249   - },
250   - {
251   - field: 'referCode',
252   - title: 'erp订单号',
253   - sortable:true
254   - },
255   - {
256   - field: 'referCodeType',
257   - title: 'erp订单内部号',
258   - sortable:true,
259   - visible:false
260   - },
261   - {
262   - field: 'shipmentType',
263   - title: '类型',
264   - align: 'center',
265   - formatter: function(value, row, index) {
266   - return $.table.selectDictLabel(shipmentTypes, value);
  74 + <div th:include="include :: footer"></div>
  75 + <script th:inline="javascript">
  76 + var prefix = ctx + "inventory/inventoryHeader";
  77 + //var upload = [[${@permission.hasPermi('inventoryHeader:cyclecountAdjust:upload')}]];
  78 + var report =[[${@permission.hasPermi('inventoryHeader:cyclecountAdjust:report')}]];
  79 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  80 + var status2 = [[${@dict.getType('adjustType')}]];
  81 +
  82 + $(function() {
  83 + var options = {
  84 + url: prefix + "/inventoryLook",
  85 + createUrl: prefix + "/add",
  86 + updateUrl: prefix + "/edit/{id}",
  87 + modalName: "库存头",
  88 + sortName: "id",
  89 + sortOrder: "desc",
  90 + search: false,
  91 + // onDblClickRow: function (row) {
  92 + // showDetail(row.id,row.code);
  93 + // },
  94 + columns: [
  95 + {
  96 + checkbox: true
267 97 },
268   - sortable:true
269   -
270   - },
271   - {
272   - field: 'customerCode',
273   - title: '客户编码',
274   - sortable:true
275   - },
276   - {
277   - field: 'priority',
278   - title: '优先级'
279   - },
280   - {
281   - field: 'route',
282   - title: '路线',
283   - sortable:true
284   - },
285   - {
286   - field: 'totalQty',
287   - title: '总数量'
288   - },
289   - {
290   - field: 'totalLines',
291   - title: '总行数'
292   - },
293   - {
294   - field: 'firstStatus',
295   - title: '头状态',
296   - formatter: function(value, row, index) {
297   - return $.table.selectDictLabel(shipmentHeaderStatus, value);
  98 + {
  99 + field : 'id',
  100 + title : '库存头ID',
  101 + sortable:true
298 102 },
299   - sortable:true
300   - },
301   - {
302   - field: 'lastStatus',
303   - title: '尾状态',
304   - formatter: function(value, row, index) {
305   - return $.table.selectDictLabel(shipmentHeaderStatus, value);
  103 + {
  104 + field : 'warehouseCode',
  105 + title : '仓库 ',
  106 + visible: false
306 107 },
307   - sortable:true
308   - },
309   - {
310   - field: 'created',
311   - title: '创建时间',
312   - sortable: true
313   - },
314   - {
315   - field: 'createdBy',
316   - title: '创建用户'
317   - },
318   - {
319   - field: 'lastUpdated',
320   - title: '最后修改时间',
321   - visible:false
322   - },
323   - {
324   - field: 'lastUpdatedBy',
325   - title: '更新用户',
326   - visible:false
327   - },
328   - {
329   - title: '操作',
330   - align: 'center',
331   - formatter: function (value, row, index) {
332   - var actions = [];
333   - actions.push('<a id="table_edit" class="btn btn-success btn-xs ' + printFlag + '" href="#" onclick="receiptPrint(\'' + row.id + '\')"><i class="fa fa-print"></i>打印</a> ');
334   - // actions.push('<a class="btn btn-info btn-xs " href="#" onclick="detail(\'' + row.id + '\',\'' + row.code + '\')"><i class="fa fa-list-ul"></i>列表</a> ');
335   - if (row.firstStatus < 100){
336   - actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
337   - }
338   - if (row.firstStatus < 120){
339   - actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
340   - }
341   - return actions.join('');
342   - }
343   - }]
344   - };
345   - $.table.init(options);
346   - });
347   -
348   - $("#bootstrap-table-detail").bootstrapTable(
349   - {
350   - /*url: prefix_detail + "/list",*/
351   - createUrl: prefix_detail + "/add",
352   - updateUrl: prefix_detail + "/edit/{id}",
353   - removeUrl: prefix_detail + "/remove",
354   - // queryParams: queryParams,
355   - sortable: true, //排序
356   - // showRefresh: true, //刷新
357   - modalName: "出库明细",
358   - search: false,
359   - clickToSelect: true,
360   - sortName: "lastUpdated",
361   - sortOrder: "desc",
362   - pagination: true, // 是否显示分页（*）
363   - pageNumber: 1, // 初始化加载第一页，默认第一页
364   - pageSize: 10, // 每页的记录行数（*）
365   - pageList: [10, 25, 50], // 可供选择的每页的行数（*）
366   - columns: [{
367   - checkbox: true
368   - },
369   - {
370   - field: 'id',
371   - title: '明细id'
372   - },
373   - {
374   - field: 'zoneCode',
375   - title: '库区'
376   - },
377   -
378   - /* {
379   - field: 'shipmentId',
380   - title: '出库单Id'
381   - },*/
382   - {
383   - field: 'materialCode',
384   - title: '存货编码'
385   - },
386   - {
387   - field: 'materialName',
388   - title: '物料名称'
389   - },
390   - {
391   - field: 'specification',
392   - title: '物料规格'
393   - },
394   - {
395   - field: 'batch',
396   - title: '批次',
397   - visible:false
398   - },
399   - {
400   - field: 'lot',
401   - title: '批号',
402   - visible:false
403   - },
404   - {
405   - field: 'project',
406   - title: '项目号'
407   - },
408   - /*{
409   - field: 'status',
410   - title: '明细状态',
411   - formatter: function(value, row, index) {
412   - return $.table.selectDictLabel(shipmentHeaderStatus, value);
  108 + {
  109 + field : 'companyCode',
  110 + title : ' 货主',
  111 + visible: false
413 112 },
414   - visible:true
415   - },*/
416   - {
417   - field: 'manufactureDate',
418   - title: '生产日期',
419   - visible:false
420   - },
421   - {
422   - field: 'expirationDate',
423   - title: '失效日期',
424   - visible:false
425   - },
426   - {
427   - field: 'agingDate',
428   - title: '入库日期',
429   - visible:false
430   - },
431   - {
432   - field: 'inventoryStatus',
433   - title: '库存状态',
434   - formatter: function(value, row, index) {
435   - return $.table.selectDictLabel(inventoryStatus, value);
  113 + {
  114 + field : 'locationCode',
  115 + title : '库位 '
  116 + },
  117 + {
  118 + field : 'containerCode',
  119 + title : ' 容器'
  120 + },
  121 + {
  122 + field : 'containerStatus',
  123 + title : ' 容器状态'
  124 + },
  125 + {
  126 + field : 'totalWeight',
  127 + title : ' 总重量'
  128 + },
  129 + {
  130 + field : 'materialSkuQty',
  131 + title : ' 商品种类的数量'
  132 + },
  133 + {
  134 + field : 'totalQty',
  135 + title : ' 总数量'
  136 + },
  137 + {
  138 + field : 'totalLines',
  139 + title : '总行量 '
  140 + },
  141 + {
  142 + field : 'projectNos',
  143 + title : ' 项目号列表'
  144 + },
  145 + {
  146 + field : 'batchs',
  147 + title : ' 批次列表'
  148 + },
  149 + {
  150 + field : 'lots',
  151 + title : ' 批号列表'
  152 + },
  153 + {
  154 + field : 'lastCycleCountDate',
  155 + title : ' 上次盘点日期'
  156 + },
  157 + {
  158 + field : 'lock',
  159 + title : ' 锁定'
  160 + },
  161 + {
  162 + field : 'lockRemark',
  163 + title : ' 锁定备注'
  164 + },
  165 + {
  166 + field : 'created',
  167 + title : ' 创建时间'
  168 + },
  169 + {
  170 + field : 'createdBy',
  171 + title : ' 创建用户'
  172 + },
  173 + {
  174 + field : 'lastUpdated',
  175 + title : ' 更新时间'
  176 + },
  177 + {
  178 + field : 'lastUpdatedBy',
  179 + title : ' 更新用户'
  180 + },
  181 + {
  182 + field : 'version',
  183 + title : ' 数据版本'
  184 + },
  185 + {
  186 + field : 'userDef1',
  187 + title : ' 自定义字段1'
  188 + },
  189 + {
  190 + field : 'userDef2',
  191 + title : ' 自定义字段2'
436 192 },
437   - },
438   - {
439   - field: 'qty',
440   - title: '发货数量'
441   - },
442   - {
443   - field: 'qtyCompleted',
444   - title: '已出数量'
445   - },
446   - {
447   - field : 'inventoryQty',
448   - title : '库存数量'
449   - },
450   - {
451   - field : 'status',
452   - title : '明细状态',
453   - align: 'center',
454   - formatter: function(value, row, index) {
455   - return $.table.selectDictLabel(shipmentHeaderStatus, value);
456   - }
457   - },
458   - {
459   - field: 'price',
460   - title: '物料单价',
461   - visible:false
462   - },
463   - {
464   - field: 'created',
465   - title: '创建时间',
466   - },
467   - {
468   - field: 'createdBy',
469   - title: '创建用户'
470   - },
471   - {
472   - field: 'lastUpdated',
473   - title: '最后修改时间'
474   - },
475   - {
476   - field: 'lastUpdatedBy',
477   - title: '更新用户'
478   - },
479   - {
480   - title: '操作',
481   - align: 'center',
482   - formatter: function (value, row, index) {
483   - var actions = [];
484   - actions.push('<a style="background-color: #f59e00;border: #f59e00" class="btn btn-default btn-xs ' + rossDoccking + '" href="#" onclick="Doccking(\''+ row.id + '\')"><i class="fa fa-send"></i>越库</a> ');
485   - actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
486   - actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
487   - return actions.join('');
488   - }
489   - }]
490   - }
491   - );
492   -
493   -
494   - /* 越库 */
495   - function Doccking(id) {
496   - // var url = rossDocckingUrl.replace("{id}", id);
497   - let url=rossDocckingUrl;
498   - var data = { "id": id };
499   - submit(url, "post", "json", data);
500   - }
501   -
502   - function submit(url, type, dataType, data,content) {
503   - $.modal.loading("正在处理中，请稍后...");
504   - var config = {
505   - url: url,
506   - type: type,
507   - dataType: dataType,
508   - data: data,
509   - contentType: content,
510   - success: function(result) {
511   - if (result.code == web_status.SUCCESS) {
512   - if (result.data !== null) {
513   - layer.open({
514   - title: ''
515   - ,content: result.data,
516   - closeBtn:false
517   - });
518   - $("body").focus();
519   - }
520   - else {
521   - $.modal.msg(result.msg);
522   - }
523   -
524   - }
525   - else {
526   - $.modal.alertError(result.msg);
527   - }
528   - $("#list-btn").click();
529   - $.modal.closeLoading();
530   - }
531   - };
532   - $.ajax(config)
533   - }
534   -
535   -
536   -
537   -
538   - /*入库单列表-详细*/
539   - function detail(id, code) {
540   - shipmentId = id;
541   - shipmentCode=code;
542   - $("#myTab li").removeClass("active");
543   - $("#tabHeader").removeClass("in active");
544   - $("#myTab li:eq(1)").addClass("active");
545   - $("#tabDetail").addClass("in active");
546   -
547   - loadDetail();
548   - }
549   -
550   - /** 载入明细 */
551   - function loadDetail() {
552   - $.ajax({
553   - url:ctx + 'shipment/shipmentDetail/list',
554   - type: 'post',
555   - data:{
556   - shipmentId:shipmentId
557   - },
558   - success : function (value) {
559   - $("#bootstrap-table-detail").bootstrapTable('load',value.data);
560   - }
561   - })
562   - $.ajax({
563   - url:"shipmentHeader/getShipmentHeader",
564   - type:"post",
565   - data:{
566   - id:shipmentId
567   - },
568   - success:function (value) {
569   - $('#shipmentId').val(value.data.id);
570   - $('#shipmentCode').val(value.data.code);
571   - $('#shipmentWarehouseId').val(value.data.warehouseId);
572   - $('#shipmentWarehouseCode').val(value.data.warehouseCode);
573   - $('#shipmentCompanyId').val(value.data.companyId);
574   - $('#shipmentCompanyCode').val(value.data.companyCode);
575   - $('#shipmentSourceCode').val(value.data.sourceCode);
576   - $('#shipmentSourcePlatform').val(value.data.sourcePlatform);
577   - $('#shipmentType').val(shipmentTypes.filter(function(a){return a.dictValue==value.data.type})[0].dictLabel);
578   - $('#shipmentShipTo').val(value.data.shipTo);
579   - $('#shipmentPriority').val(value.data.priority);
580   - $('#shipmentStation').val(value.data.station);
581   - $('#shipmentTotalQty').val(value.data.totalQty);
582   - $('#shipmentTotalLines').val(value.data.totalLines);
583   - $('#shipmentRemark').val(value.data.remark);
584   - $('#shipmentUploadremark').val(value.data.uploadremark);
585   - $('#shipmentUploadTime').val(value.data.uploadTime);
586   - $('#shipmentAppointmentTime').val(value.data.appointmentTime);
587   - $('#shipmentFirstStatus').val(shipmentHeaderStatus.filter(function(a){return a.dictValue==value.data.firstStatus})[0].dictLabel);
588   - $('#shipmentLastStatus').val(shipmentHeaderStatus.filter(function(a){return a.dictValue==value.data.lastStatus})[0].dictLabel);
589   - $('#shipmentUploadStatus').val(uploadStatus.filter(function (a) {return a.dictValue==value.data.uploadStatus})[0].dictLabel);
590   - $('#shipmentCreated').val(value.data.created);
591   - $('#shipmentCreatedBy').val(value.data.createdBy);
592   - $('#shipmentLastUpdated').val(value.data.lastUpdated);
593   - $('#shipmentLastUpdatedBy').val(value.data.lastUpdatedBy);
594   - //$('#shipmentEnable').val(value.data.enable);
595   - if(value.data.enable==true){
596   - $('#shipmentEnable').val('是')
597   - }else{
598   - $('#shipmentEnable').val('否')
599   - };
600   - //$('#shipmentDeleted').val(value.data.deleted);
601   - if(value.data.deleted==false){
602   - $('#shipmentDeleted').val('否')
603   - }else{
604   - $('#shipmentDeleted').val('是')
605   - };
606   - $('#shipmentUserDef1').val(value.data.userDef1);
607   - $('#shipmentUserDef2').val(value.data.userDef2);
608   - $('#shipmentUserDef3').val(value.data.userDef3);
609   -
610   -
611   - }
612   - })
613   - }
614   -
615   - /* 添加主单据 */
616   - function add() {
617   - if (shipmentId == '') {
618   - $.modal.open("未选择出库单" , "404.html");
619   - }
620   - else {
621   - var url = detailCreateUrl + "?shipmentId=" + $('#shipmentId').val()
622   - + "&shipmentCode=" + $('#shipmentCode').val()
623   - + "&companyId=" + $('#shipmentCompanyId').val()
624   - + "&companyCode=" + $('#shipmentCompanyCode').val();
625   - + "&sourceCode=" + $('#shipmentSourceCode').val();
626   - $.modal.open("添加" , url);
627   - }
628   - }
629   -
630   - /* 打印 */
631   - function receiptPrint(id) {
632   - var url = prefix + "/report/" + id;
633   - $.modal.open("出库单打印" , url);
634   - }
635   -
636   - /* 编辑明细单据 */
637   - function edit(id) {
638   - if (shipmentId == '') {
639   - $.modal.open("未选择出库单" , "404.html");
640   - }
641   - else {
642   - var url = prefix_detail + "/edit/" + id ;
643   - $.modal.open("编辑明细" , url);
644   - }
645   - }
646 193  
647   - /* 单个删除 */
648   - function remove(id) {
649   - $.modal.confirm("确定删除该条出库单明细信息吗？", function() {
650   - var url = $.common.isEmpty(id) ? detailRemoveUrl : detailRemoveUrl.replace("{id}", id);
651   - var data = { "ids": id };
652   - localSubmit(url, "post", "json", data);
653   - });
654   - }
  194 + {
  195 + field: 'enable',
  196 + title: '状态',
  197 + align: 'center',
  198 + formatter: function (value, row, index) {
  199 + return $.table.selectDictLabel(datas, value);
  200 + }
  201 + },
  202 + ]
  203 + };
  204 + $.table.init(options);
655 205  
656   - /* 批量删除 */
657   - function batRemove() {
658   - var rows=$("#bootstrap-table-detail").bootstrapTable('getSelections');
659   - // console.log(rows);
660   - // var rows = $.common.isEmpty($.table._option.id) ? $.table.selectFirstColumns() : $.table.selectColumns($.table._option.id);
661   - if (rows.length == 0) {
662   - $.modal.alertWarning("请至少选择一条记录");
663   - return;
664   - }
665   - $.modal.confirm("确认要删除选中的" + rows.length + "条数据吗?", function() {
666   - var url = detailRemoveUrl;
667   - var data = { "ids": rows.map(function(v){return v.id;}).join(',') };
668   - localSubmit(url, "post", "json", data);
669 206 });
670   - }
671 207  
672   - function localSubmit (url, type, dataType, data) {
673   - $.modal.loading("正在处理中，请稍后...");
674   - var config = {
675   - url: url, type: type, dataType: dataType, data: data, success: function (result) {
676   - if (result.code == web_status.SUCCESS) {
677   - $.modal.msgSuccess(result.msg);
678   - loadDetail(shipmentId, shipmentCode)
679   - } else {
680   - $.modal.alertError(result.msg)
681   - }
682   - $.modal.closeLoading()
  208 + function detail(id) {
  209 + let url= ctx + "shipment/shipmentHeader"; //网页地址
  210 + if (id){
  211 + url = ctx +"inventory/inventoryDetail?id="+id;
683 212 }
684   - };
685   - $.ajax(config)
686   - }
687   -
688   - /* 出库组盘 */
689   - function Toshipping(auto) {
690   - let storage=window.localStorage;
691   - if (auto) {
692   - $(".auto-shipment").attr("disabled",true).css("pointer-events","none");
693   - storage.auto = auto;
694   - let url = ctx + "shipment/shippingCombination";
695   - createMenuItem(url, "出库自动组盘");
696   - storage.shipmentCode=shipmentCode;
697   - parent.$('.tabReload').click();
698   - $(".auto-shipment").attr("disabled",false).css("pointer-events","auto");
699   - }
700   - else {
701   - var rows=$("#bootstrap-table-detail").bootstrapTable('getSelections');
702   - if (rows.length == 0) {
703   - $.modal.alertWarning("请至少选择一条记录");
704   - return;
705   - }
706   - let data = { "ids": rows.map(function(v){return v.id;}).join(',') };
707   - $(".to-receive").attr("disabled",true).css("pointer-events","none");
708   - let url = ctx + "shipment/shippingCombination";
709   - createMenuItem(url, "出库组盘");
710   - storage.shipids=data.ids;
711   - storage.shipmentCode=shipmentCode;
712   - parent.$('.tabReload').click();
713   - $(".to-receive").attr("disabled",false).css("pointer-events","auto");
  213 + $("#tabDetail").children().remove();
  214 + $("#myTab li").removeClass("active");
  215 + var height = $(document).height()-100 + 'px';
  216 + var str = '<iframe class="huaheng_iframe" name="iframe" width="100%" height="' + height + '" src="' + url + '" frameborder="0" data-id="' + url + '" seamless></iframe>';
  217 + $("#tabDetail").empty();
  218 + $("#tabDetail").append(str);
  219 + $(".tab-pane").removeClass("in active");
  220 + $("#myTab li:eq(1)").addClass("active");
  221 + $("#tabDetail").addClass("in active");
714 222 }
715 223  
716   - }
717   -
718   - /* 点击明细面板 */
719   - $("#myTab li:eq(1)").click(function () {
720   - if (shipmentId == '') {
721   - shipmentId = $("#bootstrap-table tr:eq(1) td:eq(1)").text();
  224 + function cyclecountPrint(id) {
  225 + var url = prefix + "/report/" + id;
  226 + $.modal.open("差异单打印" , url);
722 227 }
723   - detail(shipmentId, "");
724   - });
725   -
726   - /* 点击主表面板 */
727   - $("#myTab li:eq(0)").click(function () {
728   - $.ajax({
729   - url: prefix + "/list",
730   - type:"post",
731   - success:function (value) {
732   - $("#bootstrap-table").bootstrapTable('refresh', value.data);
733   - }
734   - })
735   - });
736 228  
737   - // function addzone() {
738   - // let url=prefix_detail+'/addZoneCode?ids=';
739   - // let rows=$("#bootstrap-table-detail").bootstrapTable('getSelections');
740   - // if (rows.length === 0) {
741   - // $.modal.msgWarning("请至少选择一条记录");
742   - // }
743   - // else {
744   - // let ids = "";
745   - // for(let i=0; i<rows.length; i++) {
746   - // ids = ids + rows[i].id + ","
747   - // }
748   - // ids = ids.substring(0, ids.length-1);
749   - // url=url+ids;
750   - // $.modal.open("分配库区",url,800,250)
751   - // }
752   - // }
753   - //
754   - // //自动分配库区
755   - // function autoZone() {
756   - // let code=$("#shipmentCode").val();
757   - // $.ajax({
758   - // url:prefix_detail+'/addZones',
759   - // type:'post',
760   - // data:{
761   - // code:code
762   - // },
763   - // success:function (res) {
764   - // if (res.code === 200) {
765   - // $.modal.msgSuccess(res.msg);
766   - // loadDetail();
767   - // }
768   - // else{
769   - // $.modal.msgError(res.msg);
770   - // }
771   - // }
772   - // })
773   - // }
  229 + $("#myTab li:eq(1)").click(function () {
  230 + detail();
  231 + });
774 232  
775   -</script>
  233 + // function upLoad(code,sourceCode) {
  234 + // $.ajax({
  235 + // url:ctx+'/api/icsCyclecount/cycleCountDiff',
  236 + // type:'post',
  237 + // data:{
  238 + // code:code,
  239 + // sourceCode:sourceCode
  240 + // },
  241 + // success:function (res) {
  242 + // if (res.code === 200) {
  243 + // $.modal.msgSuccess();
  244 + // }
  245 + // else {
  246 + // $.modal.msgError(res.msg);
  247 + // }
  248 + // }
  249 + // })
  250 + // }
  251 + </script>
776 252 </body>
777 253 </html>
778 254 \ No newline at end of file
... ...
src/main/resources/templates/inventory/invetoryDetail/invetoryDetail.html 0 → 100644
  View file @2a797cb
  1 +<!DOCTYPE HTML>
  2 +<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
  3 +<meta charset="utf-8">
  4 +<head th:include="include :: header"></head>
  5 +<body class="white-bg">
  6 +<div class="row">
  7 + <div class="col-sm-12">
  8 + <div class="col-sm-12 select-info">
  9 + <div class="select-list" th:object="${header}">
  10 + <ul>
  11 + <li>
  12 + <form id="cycleHeader-form">
  13 + 差异单ID：<input type="text" id="cyclecountAdjustId" name="cyclecountAdjustId"
  14 + readonly="readonly">
  15 + </form>
  16 + </li>
  17 + <li>
  18 + 货主编码：<input id="companyCode" type="text" name="companyCode" readonly="readonly"/>
  19 + </li>
  20 + <li>
  21 + 调整单编码：<input id="code" type="text" name="code" readonly="readonly"/>
  22 + </li>
  23 + <li>
  24 + 源盘点单号：<input id="sourceCode" type="text" name="sourceCode" readonly="readonly">
  25 + </li>
  26 + <!-- <li>
  27 + &lt;!&ndash;头 状 态：<input type="text" name="firstStatus"/>&ndash;&gt;
  28 + 状态：<input id = "status" type="text" name="status" th:value="*{statusLabel}" readonly="readonly">
  29 + </li>-->
  30 + <li>
  31 + 调整单状态：<input id="status" type="text" name="status" readonly="readonly">
  32 + </li>
  33 + <li>
  34 + 创建时间：<input id="created" type="text" name="created" readonly="readonly">
  35 +
  36 + </li>
  37 + <li>
  38 + 创建人：<input id="createdBy" type="text" name="createdBy" readonly="readonly">
  39 + </li>
  40 + <li>
  41 + 最后更新时间：<input id="lastUpdated" type="text" name="lastUpdated" readonly="readonly">
  42 +
  43 + </li>
  44 + <li>
  45 + 最后更新人：<input id="lastUpdatedBy" type="text" name="lastUpdatedBy" readonly="readonly">
  46 + </li>
  47 + <li>
  48 + <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
  49 + class="fa fa-search"></i>&nbsp;搜索</a>
  50 + </li>
  51 + </ul>
  52 + </div>
  53 + </div>
  54 + <div class="btn-group hidden-xs" id="toolbar" role="group">
  55 + <a class="btn btn-outline btn-success btn-rounded" onclick="update()">
  56 + <i class="fa fa-refresh"></i>刷新
  57 + </a>
  58 + </div>
  59 + <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
  60 + </div>
  61 +</div>
  62 +<div th:include="include :: footer"></div>
  63 +<script th:inline="javascript">
  64 + var prefix = ctx + "inventory/inventoryDetail";
  65 + var prefix_head = ctx + "inventory/inventoryHeader";
  66 + var datas = [[${@dict.getType('adjustType')}]];
  67 + var inventoryStatus = [[${@dict.getType('inventoryStatus')}]];
  68 +
  69 + var created;
  70 +
  71 +
  72 + $(function () {
  73 + var options = {
  74 + url: prefix + "/inventoryDetailLook",
  75 + /* createUrl: prefix + "/add",
  76 + updateUrl: prefix + "/edit/{id}",
  77 + removeUrl: prefix + "/remove",*/
  78 + modalName: "差异单明细",
  79 + sortName: "id",
  80 + sortOrder: "desc",
  81 + showRefresh: false,
  82 + search: false,
  83 + // pagination:false,
  84 + columns: [
  85 + {
  86 + radio: true
  87 + },
  88 + {
  89 + field: 'id',
  90 + title: '明细Id',
  91 + sortable: true
  92 + },
  93 +
  94 + {
  95 + field: '',
  96 + title: '',
  97 + sortable: true,
  98 + visible: false
  99 + },
  100 + {
  101 + field: 'locationCode',
  102 + title: '库位编号',
  103 + },
  104 + {
  105 + field: 'containerCode',
  106 + title: '容器编号',
  107 + },
  108 + {
  109 + field: 'materialCode',
  110 + title: '物料编码',
  111 +
  112 + },
  113 + {
  114 + field: 'materialName',
  115 + title: '物料名称',
  116 +
  117 + },
  118 + {
  119 + field: 'materialSpecification',
  120 + title: '物料规格',
  121 +
  122 + },
  123 + {
  124 + field: 'receiptCode',
  125 + title: '入库单编码'
  126 + },
  127 + {
  128 + field: 'receiptId',
  129 + title: '入库单id',
  130 + sortable: true,
  131 + visible: false
  132 + },
  133 + {
  134 + field: 'receiptDetailId',
  135 + title: '入库单明细id',
  136 + sortable: true,
  137 + visible: false
  138 + },
  139 + {
  140 + field: 'qty',
  141 + title: '数量'
  142 + },
  143 + {
  144 + field: 'batch',
  145 + title: '批次',
  146 + sortable: true,
  147 + sortable: true
  148 + },
  149 + {
  150 + field: 'lot',
  151 + title: '批号',
  152 + sortable: true,
  153 + sortable: true
  154 + },
  155 + {
  156 + field: 'project',
  157 + title: '项目号',
  158 + sortable: true,
  159 + sortable: true
  160 + },
  161 + {
  162 + field: 'manufactureDate',
  163 + title: '生产日期',
  164 + sortable: true,
  165 + visible: false
  166 +
  167 + },
  168 + {
  169 + field: 'expirationDate',
  170 + title: '失效日期',
  171 + sortable: true,
  172 + visible: false
  173 + },
  174 + {
  175 + field: 'inventoryStatus',
  176 + title: '库存状态',
  177 + formatter: function (value, row, index) {
  178 + return $.table.selectDictLabel(inventoryStatus, value);
  179 + },
  180 + sortable: true
  181 + },
  182 +
  183 + {
  184 + field: 'created',
  185 + title: '创建时间',
  186 + sortable: true
  187 + },
  188 + {
  189 + field: 'createdBy',
  190 + title: '创建用户'
  191 + },
  192 + {
  193 + field: 'lastUpdated',
  194 + title: '更新时间',
  195 + sortable: true
  196 + },
  197 + {
  198 + field: 'lastUpdatedBy',
  199 + title: '更新用户'
  200 + },
  201 + {
  202 + field: 'fromSource',
  203 + title: '物料来源'
  204 + },
  205 + {
  206 + field: 'status',
  207 + title: '明细状态',
  208 + formatter: function (value, row, index) {
  209 + return $.table.selectDictLabel(datas, value);
  210 + },
  211 + sortable: true
  212 + },
  213 + ]
  214 + };
  215 + $.table.init(options);
  216 + update();
  217 + });
  218 +
  219 + function update() {
  220 + var url = location.search; //获取url中"?"符后的字串
  221 + if (url.indexOf("?") != -1) { //判断是否有参数
  222 + var str = url.substr(1); //从第一个字符开始 因为第0个是?号 获取所有除问号的所有符串
  223 + strs = str.split("="); //用等号进行分隔 （因为知道只有一个参数 所以直接用等号进分隔 如果有多个参数 要用&号分隔 再用等号进行分隔）
  224 + $.ajax({
  225 + url: prefix + "/list",//
  226 + type: "post",
  227 + data: {
  228 + id: strs[1]
  229 + },
  230 + success: function (res) {
  231 + $("#bootstrap-table").bootstrapTable('removeAll');
  232 + // $("#bootstrap-table").bootstrapTable('append', res.data);
  233 + for (var i = 0; i < res.data.length; i++) {
  234 + $("#bootstrap-table").bootstrapTable('insertRow', {index: i, row: res.data[i]});
  235 +
  236 + }
  237 + }
  238 + })
  239 + }
  240 + else{
  241 + $.ajax({
  242 + url:ctx+"",
  243 + type:"post",
  244 + data:{},
  245 + success:function (res) {
  246 + $("#bootstrap-table").bootstrapTable('load',res.data)
  247 + }
  248 + })
  249 + }
  250 +
  251 + // $.ajax({
  252 + // url:prefix_head+ "/getHeader",
  253 + // type:"post",
  254 + // data:{
  255 + // id:$('#cyclecountAdjustId').val()
  256 + // },
  257 + // success:function (value) {
  258 + // if (value.data) {
  259 + // $('#code').val(value.data.code);
  260 + // // $('#type').val(value.data.typeLabel);
  261 + // $('#status').val(value.data.statusLabel);
  262 + // $('#created').val(value.data.created);
  263 + // var text_val=$('#created').val();
  264 + // $('#created').val(text_val.replace("T"," "));
  265 + // //$('#createdBy').val(value.data.createdBy);
  266 + // $('#lastUpdated').val(value.data.lastUpdated);
  267 + // var text_val_t=$('#lastUpdated').val();
  268 + // $('#lastUpdated').val(text_val_t.replace("T"," "));
  269 + // //$('#lastUpdatedBy').val(value.data.lastUpdatedBy);
  270 + // }
  271 + // }
  272 + // })
  273 + }
  274 +
  275 + function open(title, url, width, height) {
  276 + if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {
  277 + width = 'auto';
  278 + height = 'auto';
  279 + }
  280 + if (title == null) {
  281 + title = false;
  282 + }
  283 + if (url == null) {
  284 + url = "404.html";
  285 + }
  286 + if ($.common.isEmpty(width)) {
  287 + width = 800;
  288 + // width = ($(window).width() - 100);
  289 + }
  290 + if ($.common.isEmpty(height)) {
  291 + height = ($(window).height() - 50);
  292 + }
  293 + layer.open({
  294 + type: 2,
  295 + area: [width + 'px', height + 'px'],
  296 + fix: false,
  297 + //不固定
  298 + maxmin: true,
  299 + shade: 0.3,
  300 + title: title,
  301 + content: url
  302 + // shadeClose: true, //点击遮罩关闭层
  303 + })
  304 + }
  305 +
  306 +</script>
  307 +</body>
  308 +</html>
0 309 \ No newline at end of file
... ...