Commit 462f3a9b21b147193f374fe374fe9a43c6ccc8d0
1 parent
f3f44e60
库位条码打印
Showing
4 changed files
with
422 additions
and
371 deletions
.idea/workspace.xml
| ... | ... | @@ -5,8 +5,10 @@ |
| 5 | 5 | </component> |
| 6 | 6 | <component name="ChangeListManager"> |
| 7 | 7 | <list default="true" id="baeae966-16bb-4f97-a411-22fe5a65cefd" name="Default Changelist" comment=""> |
| 8 | + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/location/print.html" afterDir="false" /> | |
| 8 | 9 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
| 9 | - <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/container/print.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/container/print.html" afterDir="false" /> | |
| 10 | + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java" afterDir="false" /> | |
| 11 | + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/location/location.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/location/location.html" afterDir="false" /> | |
| 10 | 12 | </list> |
| 11 | 13 | <ignored path="$PROJECT_DIR$/target/" /> |
| 12 | 14 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
| ... | ... | @@ -51,10 +53,19 @@ |
| 51 | 53 | <component name="FileEditorManager"> |
| 52 | 54 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
| 53 | 55 | <file pinned="false" current-in-tab="false"> |
| 54 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/container.html"> | |
| 56 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/location/print.html"> | |
| 57 | + <provider selected="true" editor-type-id="text-editor"> | |
| 58 | + <state relative-caret-position="1786"> | |
| 59 | + <caret line="94" column="49" lean-forward="true" selection-start-line="94" selection-start-column="49" selection-end-line="94" selection-end-column="49" /> | |
| 60 | + </state> | |
| 61 | + </provider> | |
| 62 | + </entry> | |
| 63 | + </file> | |
| 64 | + <file pinned="false" current-in-tab="false"> | |
| 65 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/location/location.html"> | |
| 55 | 66 | <provider selected="true" editor-type-id="text-editor"> |
| 56 | - <state relative-caret-position="1292"> | |
| 57 | - <caret line="68" column="44" selection-start-line="68" selection-start-column="35" selection-end-line="68" selection-end-column="44" /> | |
| 67 | + <state relative-caret-position="285"> | |
| 68 | + <caret line="75" column="45" lean-forward="true" selection-start-line="75" selection-start-column="45" selection-end-line="75" selection-end-column="45" /> | |
| 58 | 69 | </state> |
| 59 | 70 | </provider> |
| 60 | 71 | </entry> |
| ... | ... | @@ -62,69 +73,26 @@ |
| 62 | 73 | <file pinned="false" current-in-tab="false"> |
| 63 | 74 | <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java"> |
| 64 | 75 | <provider selected="true" editor-type-id="text-editor"> |
| 65 | - <state relative-caret-position="228"> | |
| 66 | - <caret line="41" column="29" selection-start-line="41" selection-start-column="29" selection-end-line="41" selection-end-column="38" /> | |
| 76 | + <state relative-caret-position="108"> | |
| 77 | + <caret line="181" selection-start-line="181" selection-end-line="195" selection-end-column="5" /> | |
| 67 | 78 | </state> |
| 68 | 79 | </provider> |
| 69 | 80 | </entry> |
| 70 | 81 | </file> |
| 71 | 82 | <file pinned="false" current-in-tab="true"> |
| 72 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html"> | |
| 83 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java"> | |
| 73 | 84 | <provider selected="true" editor-type-id="text-editor"> |
| 74 | - <state relative-caret-position="150"> | |
| 75 | - <caret line="21" column="28" lean-forward="true" selection-start-line="21" selection-start-column="28" selection-end-line="21" selection-end-column="28" /> | |
| 76 | - <folding> | |
| 77 | - <element signature="n#style#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 78 | - <element signature="n#style#0;n#span#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 79 | - <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 80 | - <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 81 | - <element signature="n#style#0;n#table#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 82 | - </folding> | |
| 85 | + <state relative-caret-position="431"> | |
| 86 | + <caret line="316" lean-forward="true" selection-start-line="316" selection-end-line="316" /> | |
| 83 | 87 | </state> |
| 84 | 88 | </provider> |
| 85 | 89 | </entry> |
| 86 | 90 | </file> |
| 87 | 91 | <file pinned="false" current-in-tab="false"> |
| 88 | - <entry file="file://$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html"> | |
| 92 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/container.html"> | |
| 89 | 93 | <provider selected="true" editor-type-id="text-editor"> |
| 90 | - <state relative-caret-position="241"> | |
| 91 | - <caret line="47" column="36" lean-forward="true" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" /> | |
| 92 | - <folding> | |
| 93 | - <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 94 | - <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 95 | - <element signature="n#style#0;n#caption#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 96 | - <element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 97 | - <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 98 | - <element signature="n#style#0;n#td#1;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 99 | - <element signature="n#style#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 100 | - <element signature="n#style#0;n#img#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 101 | - <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 102 | - <element signature="e#2973#2979#0" expanded="true" /> | |
| 103 | - <element signature="e#2979#2985#0" expanded="true" /> | |
| 104 | - <element signature="e#2985#2991#0" expanded="true" /> | |
| 105 | - <element signature="e#2991#2997#0" expanded="true" /> | |
| 106 | - <element signature="e#2997#3003#0" expanded="true" /> | |
| 107 | - <element signature="e#3003#3009#0" expanded="true" /> | |
| 108 | - <element signature="e#3009#3015#0" expanded="true" /> | |
| 109 | - <element signature="n#style#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 110 | - <element signature="n#style#0;n#input#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 111 | - <element signature="n#style#0;n#caption#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 112 | - <element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 113 | - <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 114 | - <element signature="n#style#0;n#td#1;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 115 | - <element signature="n#style#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 116 | - <element signature="n#style#0;n#img#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 117 | - <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 118 | - <element signature="e#3995#4001#0" expanded="true" /> | |
| 119 | - <element signature="e#4001#4007#0" expanded="true" /> | |
| 120 | - <element signature="e#4007#4013#0" expanded="true" /> | |
| 121 | - <element signature="e#4013#4019#0" expanded="true" /> | |
| 122 | - <element signature="e#4019#4025#0" expanded="true" /> | |
| 123 | - <element signature="e#4025#4031#0" expanded="true" /> | |
| 124 | - <element signature="e#4031#4037#0" expanded="true" /> | |
| 125 | - <element signature="n#style#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 126 | - <element signature="n#style#0;n#input#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 127 | - </folding> | |
| 94 | + <state relative-caret-position="61"> | |
| 95 | + <caret line="202" selection-start-line="202" selection-end-line="214" selection-end-column="9" /> | |
| 128 | 96 | </state> |
| 129 | 97 | </provider> |
| 130 | 98 | </entry> |
| ... | ... | @@ -169,6 +137,9 @@ |
| 169 | 137 | <option value="$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html" /> |
| 170 | 138 | <option value="$PROJECT_DIR$/src/main/resources/static/css/style.css" /> |
| 171 | 139 | <option value="$PROJECT_DIR$/src/main/resources/templates/config/container/print.html" /> |
| 140 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/location/location.html" /> | |
| 141 | + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java" /> | |
| 142 | + <option value="$PROJECT_DIR$/src/main/resources/templates/config/location/print.html" /> | |
| 172 | 143 | </list> |
| 173 | 144 | </option> |
| 174 | 145 | </component> |
| ... | ... | @@ -248,7 +219,7 @@ |
| 248 | 219 | <item name="java" type="462c0819:PsiDirectoryNode" /> |
| 249 | 220 | <item name="com" type="462c0819:PsiDirectoryNode" /> |
| 250 | 221 | <item name="huaheng" type="462c0819:PsiDirectoryNode" /> |
| 251 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 222 | + <item name="api" type="462c0819:PsiDirectoryNode" /> | |
| 252 | 223 | </path> |
| 253 | 224 | <path> |
| 254 | 225 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -259,7 +230,6 @@ |
| 259 | 230 | <item name="com" type="462c0819:PsiDirectoryNode" /> |
| 260 | 231 | <item name="huaheng" type="462c0819:PsiDirectoryNode" /> |
| 261 | 232 | <item name="pc" type="462c0819:PsiDirectoryNode" /> |
| 262 | - <item name="config" type="462c0819:PsiDirectoryNode" /> | |
| 263 | 233 | </path> |
| 264 | 234 | <path> |
| 265 | 235 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -271,7 +241,6 @@ |
| 271 | 241 | <item name="huaheng" type="462c0819:PsiDirectoryNode" /> |
| 272 | 242 | <item name="pc" type="462c0819:PsiDirectoryNode" /> |
| 273 | 243 | <item name="config" type="462c0819:PsiDirectoryNode" /> |
| 274 | - <item name="container" type="462c0819:PsiDirectoryNode" /> | |
| 275 | 244 | </path> |
| 276 | 245 | <path> |
| 277 | 246 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -283,31 +252,7 @@ |
| 283 | 252 | <item name="huaheng" type="462c0819:PsiDirectoryNode" /> |
| 284 | 253 | <item name="pc" type="462c0819:PsiDirectoryNode" /> |
| 285 | 254 | <item name="config" type="462c0819:PsiDirectoryNode" /> |
| 286 | - <item name="container" type="462c0819:PsiDirectoryNode" /> | |
| 287 | - <item name="controller" type="462c0819:PsiDirectoryNode" /> | |
| 288 | - </path> | |
| 289 | - <path> | |
| 290 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 291 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 292 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 293 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 294 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 295 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 296 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 297 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 298 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 299 | - </path> | |
| 300 | - <path> | |
| 301 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 302 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 303 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 304 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 305 | - <item name="java" type="462c0819:PsiDirectoryNode" /> | |
| 306 | - <item name="com" type="462c0819:PsiDirectoryNode" /> | |
| 307 | - <item name="huaheng" type="462c0819:PsiDirectoryNode" /> | |
| 308 | - <item name="pc" type="462c0819:PsiDirectoryNode" /> | |
| 309 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 310 | - <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" /> | |
| 255 | + <item name="location" type="462c0819:PsiDirectoryNode" /> | |
| 311 | 256 | </path> |
| 312 | 257 | <path> |
| 313 | 258 | <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> |
| ... | ... | @@ -318,8 +263,8 @@ |
| 318 | 263 | <item name="com" type="462c0819:PsiDirectoryNode" /> |
| 319 | 264 | <item name="huaheng" type="462c0819:PsiDirectoryNode" /> |
| 320 | 265 | <item name="pc" type="462c0819:PsiDirectoryNode" /> |
| 321 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 322 | - <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" /> | |
| 266 | + <item name="config" type="462c0819:PsiDirectoryNode" /> | |
| 267 | + <item name="location" type="462c0819:PsiDirectoryNode" /> | |
| 323 | 268 | <item name="controller" type="462c0819:PsiDirectoryNode" /> |
| 324 | 269 | </path> |
| 325 | 270 | <path> |
| ... | ... | @@ -363,36 +308,8 @@ |
| 363 | 308 | <item name="main" type="462c0819:PsiDirectoryNode" /> |
| 364 | 309 | <item name="resources" type="462c0819:PsiDirectoryNode" /> |
| 365 | 310 | <item name="templates" type="462c0819:PsiDirectoryNode" /> |
| 366 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 367 | - </path> | |
| 368 | - <path> | |
| 369 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 370 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 371 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 372 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 373 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
| 374 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
| 375 | - <item name="inventory" type="462c0819:PsiDirectoryNode" /> | |
| 376 | - <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" /> | |
| 377 | - </path> | |
| 378 | - <path> | |
| 379 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 380 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 381 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 382 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 383 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
| 384 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
| 385 | - <item name="receipt" type="462c0819:PsiDirectoryNode" /> | |
| 386 | - </path> | |
| 387 | - <path> | |
| 388 | - <item name="wms2" type="b2602c69:ProjectViewProjectNode" /> | |
| 389 | - <item name="wms2" type="462c0819:PsiDirectoryNode" /> | |
| 390 | - <item name="src" type="462c0819:PsiDirectoryNode" /> | |
| 391 | - <item name="main" type="462c0819:PsiDirectoryNode" /> | |
| 392 | - <item name="resources" type="462c0819:PsiDirectoryNode" /> | |
| 393 | - <item name="templates" type="462c0819:PsiDirectoryNode" /> | |
| 394 | - <item name="receipt" type="462c0819:PsiDirectoryNode" /> | |
| 395 | - <item name="receiptHeader" type="462c0819:PsiDirectoryNode" /> | |
| 311 | + <item name="config" type="462c0819:PsiDirectoryNode" /> | |
| 312 | + <item name="location" type="462c0819:PsiDirectoryNode" /> | |
| 396 | 313 | </path> |
| 397 | 314 | </expand> |
| 398 | 315 | <select /> |
| ... | ... | @@ -410,7 +327,7 @@ |
| 410 | 327 | <property name="RequestMappingsPanelWidth1" value="75" /> |
| 411 | 328 | <property name="WebServerToolWindowFactoryState" value="false" /> |
| 412 | 329 | <property name="aspect.path.notification.shown" value="true" /> |
| 413 | - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1577352095697" /> | |
| 330 | + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1578384988709" /> | |
| 414 | 331 | <property name="full.screen.before.presentation.mode" value="false" /> |
| 415 | 332 | <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable" /> |
| 416 | 333 | <property name="node.js.detected.package.eslint" value="true" /> |
| ... | ... | @@ -427,15 +344,16 @@ |
| 427 | 344 | <property name="settings.editor.selected.configurable" value="preferences.pluginManager" /> |
| 428 | 345 | </component> |
| 429 | 346 | <component name="RecentsManager"> |
| 430 | - <key name="MoveFile.RECENT_KEYS"> | |
| 431 | - <recent name="E:\code\wms2\src\main\resources\templates\config\configWarning" /> | |
| 347 | + <key name="CopyFile.RECENT_KEYS"> | |
| 348 | + <recent name="D:\wms2\src\main\resources\templates\config\location" /> | |
| 349 | + <recent name="D:\wms2\src\main\resources\templates\config\container" /> | |
| 350 | + <recent name="E:\code\wms2\src\main\resources\static\ajax\libs\bootstrap-table\extensions\editable" /> | |
| 432 | 351 | </key> |
| 433 | 352 | <key name="CopyClassDialog.RECENTS_KEY"> |
| 434 | 353 | <recent name="com.huaheng.api.general.domain" /> |
| 435 | 354 | </key> |
| 436 | - <key name="CopyFile.RECENT_KEYS"> | |
| 437 | - <recent name="D:\wms2\src\main\resources\templates\config\container" /> | |
| 438 | - <recent name="E:\code\wms2\src\main\resources\static\ajax\libs\bootstrap-table\extensions\editable" /> | |
| 355 | + <key name="MoveFile.RECENT_KEYS"> | |
| 356 | + <recent name="E:\code\wms2\src\main\resources\templates\config\configWarning" /> | |
| 439 | 357 | </key> |
| 440 | 358 | </component> |
| 441 | 359 | <component name="RunAnythingCache"> |
| ... | ... | @@ -758,21 +676,13 @@ |
| 758 | 676 | <workItem from="1577665795897" duration="4942000" /> |
| 759 | 677 | <workItem from="1577670757674" duration="6000" /> |
| 760 | 678 | <workItem from="1577670887870" duration="8057000" /> |
| 761 | - <workItem from="1577687039415" duration="15130000" /> | |
| 762 | - </task> | |
| 763 | - <task id="LOCAL-00022" summary="修改物料管理中物料类型使用物料类别表，不在使用数据字典"> | |
| 764 | - <created>1569395439782</created> | |
| 765 | - <option name="number" value="00022" /> | |
| 766 | - <option name="presentableId" value="LOCAL-00022" /> | |
| 767 | - <option name="project" value="LOCAL" /> | |
| 768 | - <updated>1569395439782</updated> | |
| 769 | - </task> | |
| 770 | - <task id="LOCAL-00023" summary="修改波次主表、波次流程头表、波次流程明细页面"> | |
| 771 | - <created>1569402291802</created> | |
| 772 | - <option name="number" value="00023" /> | |
| 773 | - <option name="presentableId" value="LOCAL-00023" /> | |
| 774 | - <option name="project" value="LOCAL" /> | |
| 775 | - <updated>1569402291802</updated> | |
| 679 | + <workItem from="1577687039415" duration="19596000" /> | |
| 680 | + <workItem from="1578012059818" duration="10353000" /> | |
| 681 | + <workItem from="1578271903287" duration="2723000" /> | |
| 682 | + <workItem from="1578276289137" duration="660000" /> | |
| 683 | + <workItem from="1578293993555" duration="9808000" /> | |
| 684 | + <workItem from="1578358115196" duration="1507000" /> | |
| 685 | + <workItem from="1578379653786" duration="4948000" /> | |
| 776 | 686 | </task> |
| 777 | 687 | <task id="LOCAL-00024" summary="修改入库首选项修改添加模块为select"> |
| 778 | 688 | <created>1569411473661</created> |
| ... | ... | @@ -1103,17 +1013,31 @@ |
| 1103 | 1013 | <option name="project" value="LOCAL" /> |
| 1104 | 1014 | <updated>1577669193189</updated> |
| 1105 | 1015 | </task> |
| 1106 | - <option name="localTasksCounter" value="71" /> | |
| 1016 | + <task id="LOCAL-00071" summary="托盘条码打印"> | |
| 1017 | + <created>1577703299302</created> | |
| 1018 | + <option name="number" value="00071" /> | |
| 1019 | + <option name="presentableId" value="LOCAL-00071" /> | |
| 1020 | + <option name="project" value="LOCAL" /> | |
| 1021 | + <updated>1577703299303</updated> | |
| 1022 | + </task> | |
| 1023 | + <task id="LOCAL-00072" summary="托盘条码打印"> | |
| 1024 | + <created>1577706582680</created> | |
| 1025 | + <option name="number" value="00072" /> | |
| 1026 | + <option name="presentableId" value="LOCAL-00072" /> | |
| 1027 | + <option name="project" value="LOCAL" /> | |
| 1028 | + <updated>1577706582680</updated> | |
| 1029 | + </task> | |
| 1030 | + <option name="localTasksCounter" value="73" /> | |
| 1107 | 1031 | <servers /> |
| 1108 | 1032 | </component> |
| 1109 | 1033 | <component name="TimeTrackingManager"> |
| 1110 | - <option name="totallyTimeSpent" value="110601000" /> | |
| 1034 | + <option name="totallyTimeSpent" value="145066000" /> | |
| 1111 | 1035 | </component> |
| 1112 | 1036 | <component name="ToolWindowManager"> |
| 1113 | 1037 | <frame x="-7" y="-7" width="1550" height="838" extended-state="6" /> |
| 1114 | 1038 | <editor active="true" /> |
| 1115 | 1039 | <layout> |
| 1116 | - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4978903" visible="true" weight="0.27680966" /> | |
| 1040 | + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4978903" visible="true" weight="0.230563" /> | |
| 1117 | 1041 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> |
| 1118 | 1042 | <window_info id="Designer" order="2" /> |
| 1119 | 1043 | <window_info id="Image Layers" order="3" /> |
| ... | ... | @@ -1135,7 +1059,7 @@ |
| 1135 | 1059 | <window_info anchor="bottom" id="Java Enterprise" order="11" /> |
| 1136 | 1060 | <window_info anchor="bottom" id="Database Changes" order="12" /> |
| 1137 | 1061 | <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.91152817" weight="0.3286119" /> |
| 1138 | - <window_info anchor="bottom" id="Run Dashboard" order="14" sideWeight="0.9095174" weight="0.509915" /> | |
| 1062 | + <window_info active="true" anchor="bottom" id="Run Dashboard" order="14" sideWeight="0.9095174" visible="true" weight="0.30878186" /> | |
| 1139 | 1063 | <window_info anchor="bottom" id="Messages" order="15" sideWeight="0.49932975" weight="0.3286119" /> |
| 1140 | 1064 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> |
| 1141 | 1065 | <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> |
| ... | ... | @@ -1247,12 +1171,6 @@ |
| 1247 | 1171 | <option name="timeStamp" value="87" /> |
| 1248 | 1172 | </line-breakpoint> |
| 1249 | 1173 | <line-breakpoint enabled="true" type="java-line"> |
| 1250 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.java</url> | |
| 1251 | - <line>35</line> | |
| 1252 | - <properties /> | |
| 1253 | - <option name="timeStamp" value="101" /> | |
| 1254 | - </line-breakpoint> | |
| 1255 | - <line-breakpoint enabled="true" type="java-line"> | |
| 1256 | 1174 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java</url> |
| 1257 | 1175 | <line>194</line> |
| 1258 | 1176 | <properties> |
| ... | ... | @@ -1267,12 +1185,6 @@ |
| 1267 | 1185 | <option name="timeStamp" value="121" /> |
| 1268 | 1186 | </line-breakpoint> |
| 1269 | 1187 | <line-breakpoint enabled="true" type="java-line"> |
| 1270 | - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java</url> | |
| 1271 | - <line>312</line> | |
| 1272 | - <properties /> | |
| 1273 | - <option name="timeStamp" value="123" /> | |
| 1274 | - </line-breakpoint> | |
| 1275 | - <line-breakpoint enabled="true" type="java-line"> | |
| 1276 | 1188 | <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/configWarning/service/ConfigWarningService.java</url> |
| 1277 | 1189 | <line>110</line> |
| 1278 | 1190 | <properties /> |
| ... | ... | @@ -1332,424 +1244,395 @@ |
| 1332 | 1244 | </SUITE> |
| 1333 | 1245 | </component> |
| 1334 | 1246 | <component name="editorHistoryManager"> |
| 1335 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ReceiptDomain.java"> | |
| 1247 | + <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/IService.class"> | |
| 1336 | 1248 | <provider selected="true" editor-type-id="text-editor"> |
| 1337 | - <state relative-caret-position="209"> | |
| 1338 | - <caret line="16" column="46" selection-start-line="16" selection-start-column="32" selection-end-line="16" selection-end-column="46" /> | |
| 1249 | + <state relative-caret-position="171"> | |
| 1250 | + <caret line="70" column="6" selection-start-line="70" selection-start-column="6" selection-end-line="70" selection-end-column="6" /> | |
| 1339 | 1251 | </state> |
| 1340 | 1252 | </provider> |
| 1341 | 1253 | </entry> |
| 1342 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/LoginApi.java"> | |
| 1254 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java"> | |
| 1343 | 1255 | <provider selected="true" editor-type-id="text-editor"> |
| 1344 | - <state relative-caret-position="186"> | |
| 1345 | - <caret line="31" column="32" selection-start-line="31" selection-start-column="24" selection-end-line="31" selection-end-column="32" /> | |
| 1256 | + <state relative-caret-position="76"> | |
| 1257 | + <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" /> | |
| 1346 | 1258 | </state> |
| 1347 | 1259 | </provider> |
| 1348 | 1260 | </entry> |
| 1349 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java"> | |
| 1261 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/service/InventoryTransactionService.java"> | |
| 1350 | 1262 | <provider selected="true" editor-type-id="text-editor"> |
| 1351 | - <state relative-caret-position="240"> | |
| 1352 | - <caret line="89" column="9" lean-forward="true" selection-start-line="89" selection-start-column="9" selection-end-line="89" selection-end-column="9" /> | |
| 1263 | + <state relative-caret-position="57"> | |
| 1264 | + <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" /> | |
| 1353 | 1265 | </state> |
| 1354 | 1266 | </provider> |
| 1355 | 1267 | </entry> |
| 1356 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ShipmentDomain.java"> | |
| 1268 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html"> | |
| 1357 | 1269 | <provider selected="true" editor-type-id="text-editor"> |
| 1358 | - <state relative-caret-position="152"> | |
| 1359 | - <caret line="12" column="48" selection-start-line="12" selection-start-column="33" selection-end-line="12" selection-end-column="48" /> | |
| 1270 | + <state relative-caret-position="391"> | |
| 1271 | + <caret line="322" column="10" lean-forward="true" selection-start-line="310" selection-start-column="7" selection-end-line="322" selection-end-column="10" /> | |
| 1360 | 1272 | </state> |
| 1361 | 1273 | </provider> |
| 1362 | 1274 | </entry> |
| 1363 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java"> | |
| 1275 | + <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es5.d.ts"> | |
| 1364 | 1276 | <provider selected="true" editor-type-id="text-editor"> |
| 1365 | - <state relative-caret-position="126"> | |
| 1366 | - <caret line="15" column="11" selection-start-line="15" selection-start-column="11" selection-end-line="15" selection-end-column="11" /> | |
| 1277 | + <state relative-caret-position="140"> | |
| 1278 | + <caret line="472" column="4" selection-start-line="472" selection-start-column="4" selection-end-line="472" selection-end-column="4" /> | |
| 1367 | 1279 | </state> |
| 1368 | 1280 | </provider> |
| 1369 | 1281 | </entry> |
| 1370 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/shipment/ShipmentDetailMapper.xml"> | |
| 1282 | + <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/plugins/metisMenu/jquery.metisMenu.js"> | |
| 1371 | 1283 | <provider selected="true" editor-type-id="text-editor"> |
| 1372 | - <state relative-caret-position="160"> | |
| 1373 | - <caret line="140" column="2" selection-start-line="140" selection-start-column="2" selection-end-line="140" selection-end-column="2" /> | |
| 1284 | + <state relative-caret-position="128"> | |
| 1285 | + <caret line="101" column="8" selection-start-line="101" selection-start-column="8" selection-end-line="101" selection-end-column="8" /> | |
| 1374 | 1286 | </state> |
| 1375 | 1287 | </provider> |
| 1376 | 1288 | </entry> |
| 1377 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/mapper/ShipmentDetailMapper.java"> | |
| 1289 | + <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.dom.d.ts"> | |
| 1378 | 1290 | <provider selected="true" editor-type-id="text-editor"> |
| 1379 | - <state relative-caret-position="214"> | |
| 1380 | - <caret line="24" column="8" selection-start-line="24" selection-start-column="8" selection-end-line="24" selection-end-column="8" /> | |
| 1291 | + <state relative-caret-position="128"> | |
| 1292 | + <caret line="10712" column="13" selection-start-line="10712" selection-start-column="13" selection-end-line="10712" selection-end-column="13" /> | |
| 1381 | 1293 | </state> |
| 1382 | 1294 | </provider> |
| 1383 | 1295 | </entry> |
| 1384 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailService.java"> | |
| 1296 | + <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/qrcode/qrcode.min.js"> | |
| 1385 | 1297 | <provider selected="true" editor-type-id="text-editor"> |
| 1386 | - <state relative-caret-position="290"> | |
| 1387 | - <caret line="38" column="62" selection-start-line="38" selection-start-column="47" selection-end-line="38" selection-end-column="62" /> | |
| 1298 | + <state> | |
| 1299 | + <caret column="4" selection-start-column="4" selection-end-column="4" /> | |
| 1388 | 1300 | </state> |
| 1389 | 1301 | </provider> |
| 1390 | 1302 | </entry> |
| 1391 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailServiceImpl.java"> | |
| 1303 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java"> | |
| 1392 | 1304 | <provider selected="true" editor-type-id="text-editor"> |
| 1393 | - <state relative-caret-position="233"> | |
| 1394 | - <caret line="304" column="21" lean-forward="true" selection-start-line="304" selection-start-column="21" selection-end-line="304" selection-end-column="21" /> | |
| 1305 | + <state relative-caret-position="-872"> | |
| 1306 | + <caret line="41" column="33" lean-forward="true" selection-start-line="41" selection-start-column="33" selection-end-line="41" selection-end-column="33" /> | |
| 1395 | 1307 | </state> |
| 1396 | 1308 | </provider> |
| 1397 | 1309 | </entry> |
| 1398 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ShipmentApiService.java"> | |
| 1310 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html"> | |
| 1399 | 1311 | <provider selected="true" editor-type-id="text-editor"> |
| 1400 | - <state relative-caret-position="230"> | |
| 1401 | - <caret line="136" column="52" selection-start-line="136" selection-start-column="34" selection-end-line="136" selection-end-column="52" /> | |
| 1312 | + <state relative-caret-position="152"> | |
| 1313 | + <caret line="675" column="43" lean-forward="true" selection-start-line="675" selection-start-column="43" selection-end-line="675" selection-end-column="43" /> | |
| 1402 | 1314 | </state> |
| 1403 | 1315 | </provider> |
| 1404 | 1316 | </entry> |
| 1405 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/ShipmentApi.java"> | |
| 1317 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/add.html"> | |
| 1406 | 1318 | <provider selected="true" editor-type-id="text-editor"> |
| 1407 | - <state relative-caret-position="266"> | |
| 1408 | - <caret line="31" column="55" lean-forward="true" selection-start-line="31" selection-start-column="55" selection-end-line="31" selection-end-column="55" /> | |
| 1409 | - </state> | |
| 1319 | + <state relative-caret-position="-962" /> | |
| 1410 | 1320 | </provider> |
| 1411 | 1321 | </entry> |
| 1412 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java"> | |
| 1322 | + <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/echarts/echarts.js"> | |
| 1413 | 1323 | <provider selected="true" editor-type-id="text-editor"> |
| 1414 | - <state relative-caret-position="236"> | |
| 1415 | - <caret line="111" column="56" selection-start-line="111" selection-start-column="43" selection-end-line="111" selection-end-column="56" /> | |
| 1324 | + <state relative-caret-position="19"> | |
| 1325 | + <caret line="30207" selection-start-line="30207" selection-end-line="30207" /> | |
| 1416 | 1326 | </state> |
| 1417 | 1327 | </provider> |
| 1418 | 1328 | </entry> |
| 1419 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/ReceiptApi.java"> | |
| 1329 | + <entry file="file://$USER_HOME$/Desktop/长沙华恒企网2.0_new/答题HTML/答题HTML/answer.html"> | |
| 1420 | 1330 | <provider selected="true" editor-type-id="text-editor"> |
| 1421 | - <state relative-caret-position="247"> | |
| 1422 | - <caret line="32" column="52" selection-start-line="32" selection-start-column="52" selection-end-line="32" selection-end-column="52" /> | |
| 1423 | - </state> | |
| 1331 | + <state relative-caret-position="-171" /> | |
| 1424 | 1332 | </provider> |
| 1425 | 1333 | </entry> |
| 1426 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java"> | |
| 1334 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/report.html"> | |
| 1427 | 1335 | <provider selected="true" editor-type-id="text-editor"> |
| 1428 | - <state relative-caret-position="209"> | |
| 1429 | - <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" /> | |
| 1336 | + <state relative-caret-position="147"> | |
| 1337 | + <caret line="98" column="13" selection-start-line="98" selection-start-column="13" selection-end-line="98" selection-end-column="13" /> | |
| 1338 | + <folding> | |
| 1339 | + <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1340 | + <element signature="n#style#0;n#span#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1341 | + <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1342 | + <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1343 | + </folding> | |
| 1430 | 1344 | </state> |
| 1431 | 1345 | </provider> |
| 1432 | 1346 | </entry> |
| 1433 | - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/impl/ServiceImpl.class"> | |
| 1347 | + <entry file="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.18/druid-1.1.18.jar!/support/http/resources/css/bootstrap.min.css"> | |
| 1434 | 1348 | <provider selected="true" editor-type-id="text-editor"> |
| 1435 | - <state relative-caret-position="114"> | |
| 1436 | - <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" /> | |
| 1349 | + <state relative-caret-position="152"> | |
| 1350 | + <caret line="8" column="25402" selection-start-line="8" selection-start-column="25402" selection-end-line="8" selection-end-column="25402" /> | |
| 1437 | 1351 | </state> |
| 1438 | 1352 | </provider> |
| 1439 | 1353 | </entry> |
| 1440 | - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml"> | |
| 1354 | + <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/main/style.min862f.css"> | |
| 1441 | 1355 | <provider selected="true" editor-type-id="text-editor"> |
| 1442 | - <state relative-caret-position="149"> | |
| 1443 | - <caret line="43" column="4" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="4" /> | |
| 1356 | + <state> | |
| 1357 | + <caret column="49663" selection-start-column="49663" selection-end-column="49663" /> | |
| 1444 | 1358 | </state> |
| 1445 | 1359 | </provider> |
| 1446 | 1360 | </entry> |
| 1447 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java"> | |
| 1361 | + <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css"> | |
| 1448 | 1362 | <provider selected="true" editor-type-id="text-editor"> |
| 1449 | - <state relative-caret-position="171"> | |
| 1450 | - <caret line="18" column="29" lean-forward="true" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" /> | |
| 1363 | + <state relative-caret-position="127"> | |
| 1364 | + <caret line="2721" column="1" selection-start-line="2721" selection-start-column="1" selection-end-line="2721" selection-end-column="1" /> | |
| 1451 | 1365 | </state> |
| 1452 | 1366 | </provider> |
| 1453 | 1367 | </entry> |
| 1454 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialService.java"> | |
| 1368 | + <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css"> | |
| 1455 | 1369 | <provider selected="true" editor-type-id="text-editor"> |
| 1456 | - <state relative-caret-position="-152"> | |
| 1457 | - <caret line="8" column="60" lean-forward="true" selection-start-line="8" selection-start-column="60" selection-end-line="8" selection-end-column="60" /> | |
| 1370 | + <state relative-caret-position="241"> | |
| 1371 | + <caret line="3360" column="17" lean-forward="true" selection-start-line="3360" selection-start-column="17" selection-end-line="3360" selection-end-column="17" /> | |
| 1458 | 1372 | </state> |
| 1459 | 1373 | </provider> |
| 1460 | 1374 | </entry> |
| 1461 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialServiceImpl.java"> | |
| 1375 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/report.html"> | |
| 1462 | 1376 | <provider selected="true" editor-type-id="text-editor"> |
| 1463 | - <state relative-caret-position="95"> | |
| 1464 | - <caret line="27" column="89" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="89" /> | |
| 1377 | + <state relative-caret-position="1330"> | |
| 1378 | + <caret line="70" column="4" lean-forward="true" selection-start-line="70" selection-start-column="4" selection-end-line="70" selection-end-column="22" /> | |
| 1379 | + <folding> | |
| 1380 | + <element signature="n#style#0;n#span#1;n#td#0;n#tr#0;n#thead#0;n#table#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1381 | + </folding> | |
| 1465 | 1382 | </state> |
| 1466 | 1383 | </provider> |
| 1467 | 1384 | </entry> |
| 1468 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java"> | |
| 1385 | + <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/jquery.jqprint-0.3.js"> | |
| 1469 | 1386 | <provider selected="true" editor-type-id="text-editor"> |
| 1470 | - <state relative-caret-position="206"> | |
| 1471 | - <caret line="71" column="46" selection-start-line="71" selection-start-column="46" selection-end-line="71" selection-end-column="46" /> | |
| 1387 | + <state relative-caret-position="95"> | |
| 1388 | + <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" /> | |
| 1472 | 1389 | </state> |
| 1473 | 1390 | </provider> |
| 1474 | 1391 | </entry> |
| 1475 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserMapper.java"> | |
| 1392 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html"> | |
| 1476 | 1393 | <provider selected="true" editor-type-id="text-editor"> |
| 1477 | - <state relative-caret-position="149"> | |
| 1478 | - <caret line="23" column="22" selection-start-line="23" selection-start-column="22" selection-end-line="23" selection-end-column="22" /> | |
| 1394 | + <state relative-caret-position="551"> | |
| 1395 | + <caret line="29" column="24" lean-forward="true" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="24" /> | |
| 1396 | + <folding> | |
| 1397 | + <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1398 | + <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1399 | + <element signature="n#style#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1400 | + <element signature="n#style#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1401 | + </folding> | |
| 1479 | 1402 | </state> |
| 1480 | 1403 | </provider> |
| 1481 | 1404 | </entry> |
| 1482 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java"> | |
| 1405 | + <entry file="file://$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html"> | |
| 1483 | 1406 | <provider selected="true" editor-type-id="text-editor"> |
| 1484 | 1407 | <state relative-caret-position="19"> |
| 1485 | - <caret line="42" column="28" lean-forward="true" selection-start-line="42" selection-start-column="28" selection-end-line="42" selection-end-column="28" /> | |
| 1408 | + <caret line="47" column="36" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" /> | |
| 1486 | 1409 | <folding> |
| 1487 | - <element signature="e#5266#5267#0" expanded="true" /> | |
| 1488 | - <element signature="e#5320#5321#0" expanded="true" /> | |
| 1489 | - <element signature="e#5486#5487#0" expanded="true" /> | |
| 1490 | - <element signature="e#5551#5552#0" expanded="true" /> | |
| 1491 | - <element signature="e#5726#5727#0" expanded="true" /> | |
| 1492 | - <element signature="e#5796#5797#0" expanded="true" /> | |
| 1493 | - <element signature="e#5950#5951#0" expanded="true" /> | |
| 1494 | - <element signature="e#6008#6009#0" expanded="true" /> | |
| 1495 | - <element signature="e#6166#6167#0" expanded="true" /> | |
| 1496 | - <element signature="e#6222#6223#0" expanded="true" /> | |
| 1497 | - <element signature="e#8470#8471#0" expanded="true" /> | |
| 1498 | - <element signature="e#8520#8521#0" expanded="true" /> | |
| 1499 | - <element signature="e#17198#17199#0" expanded="true" /> | |
| 1500 | - <element signature="e#17266#17267#0" expanded="true" /> | |
| 1410 | + <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1411 | + <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1412 | + <element signature="n#style#0;n#caption#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1413 | + <element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1414 | + <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1415 | + <element signature="n#style#0;n#td#1;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1416 | + <element signature="n#style#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1417 | + <element signature="n#style#0;n#img#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1418 | + <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1419 | + <element signature="n#style#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1420 | + <element signature="n#style#0;n#input#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1421 | + <element signature="n#style#0;n#caption#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1422 | + <element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1423 | + <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1424 | + <element signature="n#style#0;n#td#1;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1425 | + <element signature="n#style#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1426 | + <element signature="n#style#0;n#img#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1427 | + <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1428 | + <element signature="e#3995#4001#0" expanded="true" /> | |
| 1429 | + <element signature="e#4001#4007#0" expanded="true" /> | |
| 1430 | + <element signature="e#4007#4013#0" expanded="true" /> | |
| 1431 | + <element signature="e#4013#4019#0" expanded="true" /> | |
| 1432 | + <element signature="n#style#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1433 | + <element signature="n#style#0;n#input#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1501 | 1434 | </folding> |
| 1502 | 1435 | </state> |
| 1503 | 1436 | </provider> |
| 1504 | 1437 | </entry> |
| 1505 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/Receipt.java"> | |
| 1438 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishServiceImpl.java"> | |
| 1506 | 1439 | <provider selected="true" editor-type-id="text-editor"> |
| 1507 | - <state relative-caret-position="171"> | |
| 1508 | - <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> | |
| 1440 | + <state relative-caret-position="149"> | |
| 1441 | + <caret line="27" column="22" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" /> | |
| 1509 | 1442 | </state> |
| 1510 | 1443 | </provider> |
| 1511 | 1444 | </entry> |
| 1512 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/BasicDataApi.java"> | |
| 1445 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishService.java"> | |
| 1513 | 1446 | <provider selected="true" editor-type-id="text-editor"> |
| 1514 | - <state relative-caret-position="2907"> | |
| 1515 | - <caret line="170" column="1" selection-start-line="170" selection-start-column="1" selection-end-line="170" selection-end-column="1" /> | |
| 1447 | + <state relative-caret-position="133"> | |
| 1448 | + <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" /> | |
| 1516 | 1449 | </state> |
| 1517 | 1450 | </provider> |
| 1518 | 1451 | </entry> |
| 1519 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/InventoryDomain.java"> | |
| 1452 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/EmptyOutHandle.java"> | |
| 1520 | 1453 | <provider selected="true" editor-type-id="text-editor"> |
| 1521 | - <state relative-caret-position="114"> | |
| 1522 | - <caret line="13" column="57" selection-start-line="13" selection-start-column="57" selection-end-line="13" selection-end-column="57" /> | |
| 1454 | + <state relative-caret-position="149"> | |
| 1455 | + <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" /> | |
| 1523 | 1456 | </state> |
| 1524 | 1457 | </provider> |
| 1525 | 1458 | </entry> |
| 1526 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/BasicDataApiService.java"> | |
| 1459 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/OverrideHandle.java"> | |
| 1527 | 1460 | <provider selected="true" editor-type-id="text-editor"> |
| 1528 | - <state relative-caret-position="105"> | |
| 1529 | - <caret line="657" column="76" selection-start-line="657" selection-start-column="76" selection-end-line="657" selection-end-column="76" /> | |
| 1461 | + <state relative-caret-position="149"> | |
| 1462 | + <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" /> | |
| 1530 | 1463 | </state> |
| 1531 | 1464 | </provider> |
| 1532 | 1465 | </entry> |
| 1533 | - <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.1.2/mybatis-plus-extension-3.1.2.jar!/com/baomidou/mybatisplus/extension/service/IService.class"> | |
| 1466 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.java"> | |
| 1534 | 1467 | <provider selected="true" editor-type-id="text-editor"> |
| 1535 | - <state relative-caret-position="171"> | |
| 1536 | - <caret line="70" column="6" selection-start-line="70" selection-start-column="6" selection-end-line="70" selection-end-column="6" /> | |
| 1468 | + <state relative-caret-position="-70"> | |
| 1469 | + <caret line="41" column="67" selection-start-line="41" selection-start-column="60" selection-end-line="41" selection-end-column="67" /> | |
| 1537 | 1470 | </state> |
| 1538 | 1471 | </provider> |
| 1539 | 1472 | </entry> |
| 1540 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java"> | |
| 1473 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelServiceImpl.java"> | |
| 1541 | 1474 | <provider selected="true" editor-type-id="text-editor"> |
| 1542 | - <state relative-caret-position="76"> | |
| 1543 | - <caret line="9" column="17" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" /> | |
| 1475 | + <state relative-caret-position="209"> | |
| 1476 | + <caret line="19" column="11" selection-start-line="19" selection-start-column="7" selection-end-line="19" selection-end-column="11" /> | |
| 1544 | 1477 | </state> |
| 1545 | 1478 | </provider> |
| 1546 | 1479 | </entry> |
| 1547 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/service/InventoryTransactionService.java"> | |
| 1480 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelService.java"> | |
| 1548 | 1481 | <provider selected="true" editor-type-id="text-editor"> |
| 1549 | - <state relative-caret-position="57"> | |
| 1550 | - <caret line="4" column="17" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="17" /> | |
| 1482 | + <state relative-caret-position="133"> | |
| 1483 | + <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" /> | |
| 1551 | 1484 | </state> |
| 1552 | 1485 | </provider> |
| 1553 | 1486 | </entry> |
| 1554 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html"> | |
| 1487 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/TaskInfoController.java"> | |
| 1555 | 1488 | <provider selected="true" editor-type-id="text-editor"> |
| 1556 | - <state relative-caret-position="391"> | |
| 1557 | - <caret line="322" column="10" lean-forward="true" selection-start-line="310" selection-start-column="7" selection-end-line="322" selection-end-column="10" /> | |
| 1489 | + <state relative-caret-position="296"> | |
| 1490 | + <caret line="24" column="34" lean-forward="true" selection-start-line="24" selection-start-column="34" selection-end-line="24" selection-end-column="34" /> | |
| 1558 | 1491 | </state> |
| 1559 | 1492 | </provider> |
| 1560 | 1493 | </entry> |
| 1561 | - <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es5.d.ts"> | |
| 1494 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/TaskFinish.java"> | |
| 1562 | 1495 | <provider selected="true" editor-type-id="text-editor"> |
| 1563 | - <state relative-caret-position="140"> | |
| 1564 | - <caret line="472" column="4" selection-start-line="472" selection-start-column="4" selection-end-line="472" selection-end-column="4" /> | |
| 1496 | + <state relative-caret-position="310"> | |
| 1497 | + <caret line="35" column="59" lean-forward="true" selection-start-line="35" selection-start-column="59" selection-end-line="35" selection-end-column="59" /> | |
| 1565 | 1498 | </state> |
| 1566 | 1499 | </provider> |
| 1567 | 1500 | </entry> |
| 1568 | - <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/plugins/metisMenu/jquery.metisMenu.js"> | |
| 1501 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/BasicDataApi.java"> | |
| 1569 | 1502 | <provider selected="true" editor-type-id="text-editor"> |
| 1570 | - <state relative-caret-position="128"> | |
| 1571 | - <caret line="101" column="8" selection-start-line="101" selection-start-column="8" selection-end-line="101" selection-end-column="8" /> | |
| 1503 | + <state relative-caret-position="291"> | |
| 1504 | + <caret line="170" column="1" selection-start-line="170" selection-start-column="1" selection-end-line="170" selection-end-column="1" /> | |
| 1572 | 1505 | </state> |
| 1573 | 1506 | </provider> |
| 1574 | 1507 | </entry> |
| 1575 | - <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.dom.d.ts"> | |
| 1508 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/domain/WcsTask.java"> | |
| 1576 | 1509 | <provider selected="true" editor-type-id="text-editor"> |
| 1577 | - <state relative-caret-position="128"> | |
| 1578 | - <caret line="10712" column="13" selection-start-line="10712" selection-start-column="13" selection-end-line="10712" selection-end-column="13" /> | |
| 1510 | + <state relative-caret-position="149"> | |
| 1511 | + <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" /> | |
| 1579 | 1512 | </state> |
| 1580 | 1513 | </provider> |
| 1581 | 1514 | </entry> |
| 1582 | - <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/qrcode/qrcode.min.js"> | |
| 1515 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java"> | |
| 1583 | 1516 | <provider selected="true" editor-type-id="text-editor"> |
| 1584 | - <state> | |
| 1585 | - <caret column="4" selection-start-column="4" selection-end-column="4" /> | |
| 1517 | + <state relative-caret-position="247"> | |
| 1518 | + <caret line="44" column="13" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" /> | |
| 1586 | 1519 | </state> |
| 1587 | 1520 | </provider> |
| 1588 | 1521 | </entry> |
| 1589 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java"> | |
| 1522 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/ReceiptController.java"> | |
| 1590 | 1523 | <provider selected="true" editor-type-id="text-editor"> |
| 1591 | - <state relative-caret-position="-872"> | |
| 1592 | - <caret line="41" column="33" lean-forward="true" selection-start-line="41" selection-start-column="33" selection-end-line="41" selection-end-column="33" /> | |
| 1524 | + <state relative-caret-position="494"> | |
| 1525 | + <caret line="35" column="51" selection-start-line="35" selection-start-column="51" selection-end-line="35" selection-end-column="51" /> | |
| 1593 | 1526 | </state> |
| 1594 | 1527 | </provider> |
| 1595 | 1528 | </entry> |
| 1596 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html"> | |
| 1529 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ReceiptService.java"> | |
| 1597 | 1530 | <provider selected="true" editor-type-id="text-editor"> |
| 1598 | - <state relative-caret-position="152"> | |
| 1599 | - <caret line="675" column="43" lean-forward="true" selection-start-line="675" selection-start-column="43" selection-end-line="675" selection-end-column="43" /> | |
| 1531 | + <state relative-caret-position="665"> | |
| 1532 | + <caret line="64" column="42" selection-start-line="64" selection-start-column="33" selection-end-line="64" selection-end-column="42" /> | |
| 1600 | 1533 | </state> |
| 1601 | 1534 | </provider> |
| 1602 | 1535 | </entry> |
| 1603 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/add.html"> | |
| 1536 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengServletInitializer.java"> | |
| 1604 | 1537 | <provider selected="true" editor-type-id="text-editor"> |
| 1605 | - <state relative-caret-position="-962" /> | |
| 1538 | + <state relative-caret-position="150"> | |
| 1539 | + <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> | |
| 1540 | + </state> | |
| 1606 | 1541 | </provider> |
| 1607 | 1542 | </entry> |
| 1608 | - <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/echarts/echarts.js"> | |
| 1543 | + <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml"> | |
| 1609 | 1544 | <provider selected="true" editor-type-id="text-editor"> |
| 1610 | - <state relative-caret-position="19"> | |
| 1611 | - <caret line="30207" selection-start-line="30207" selection-end-line="30207" /> | |
| 1545 | + <state relative-caret-position="189"> | |
| 1546 | + <caret line="66" column="12" lean-forward="true" selection-start-line="66" selection-start-column="12" selection-end-line="66" selection-end-column="12" /> | |
| 1612 | 1547 | </state> |
| 1613 | 1548 | </provider> |
| 1614 | 1549 | </entry> |
| 1615 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/report.html"> | |
| 1550 | + <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml"> | |
| 1616 | 1551 | <provider selected="true" editor-type-id="text-editor"> |
| 1617 | - <state relative-caret-position="225"> | |
| 1618 | - <caret line="70" column="4" lean-forward="true" selection-start-line="70" selection-start-column="4" selection-end-line="70" selection-end-column="22" /> | |
| 1619 | - <folding> | |
| 1620 | - <element signature="n#style#0;n#span#1;n#td#0;n#tr#0;n#thead#0;n#table#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1621 | - </folding> | |
| 1622 | - </state> | |
| 1552 | + <state relative-caret-position="-824" /> | |
| 1623 | 1553 | </provider> |
| 1624 | 1554 | </entry> |
| 1625 | - <entry file="file://$USER_HOME$/Desktop/长沙华恒企网2.0_new/答题HTML/答题HTML/answer.html"> | |
| 1555 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java"> | |
| 1626 | 1556 | <provider selected="true" editor-type-id="text-editor"> |
| 1627 | - <state relative-caret-position="-171" /> | |
| 1557 | + <state relative-caret-position="-26"> | |
| 1558 | + <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" /> | |
| 1559 | + </state> | |
| 1628 | 1560 | </provider> |
| 1629 | 1561 | </entry> |
| 1630 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/container.html"> | |
| 1562 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java"> | |
| 1631 | 1563 | <provider selected="true" editor-type-id="text-editor"> |
| 1632 | - <state relative-caret-position="1292"> | |
| 1633 | - <caret line="68" column="44" selection-start-line="68" selection-start-column="35" selection-end-line="68" selection-end-column="44" /> | |
| 1564 | + <state relative-caret-position="202"> | |
| 1565 | + <caret line="156" lean-forward="true" selection-start-line="156" selection-end-line="156" /> | |
| 1634 | 1566 | </state> |
| 1635 | 1567 | </provider> |
| 1636 | 1568 | </entry> |
| 1637 | - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java"> | |
| 1569 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java"> | |
| 1638 | 1570 | <provider selected="true" editor-type-id="text-editor"> |
| 1639 | - <state relative-caret-position="228"> | |
| 1640 | - <caret line="41" column="29" selection-start-line="41" selection-start-column="29" selection-end-line="41" selection-end-column="38" /> | |
| 1571 | + <state relative-caret-position="317"> | |
| 1572 | + <caret line="71" selection-start-line="71" selection-end-line="71" /> | |
| 1641 | 1573 | </state> |
| 1642 | 1574 | </provider> |
| 1643 | 1575 | </entry> |
| 1644 | - <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/jquery.jqprint-0.3.js"> | |
| 1576 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkHeader/controller/CheckHeaderController.java"> | |
| 1645 | 1577 | <provider selected="true" editor-type-id="text-editor"> |
| 1646 | - <state relative-caret-position="-316"> | |
| 1647 | - <caret line="43" column="118" selection-start-line="43" selection-start-column="113" selection-end-line="43" selection-end-column="118" /> | |
| 1578 | + <state relative-caret-position="190"> | |
| 1579 | + <caret line="38" column="13" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" /> | |
| 1648 | 1580 | </state> |
| 1649 | 1581 | </provider> |
| 1650 | 1582 | </entry> |
| 1651 | - <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/browser.d.ts"> | |
| 1583 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/ReceiptApi.java"> | |
| 1652 | 1584 | <provider selected="true" editor-type-id="text-editor"> |
| 1653 | - <state relative-caret-position="155"> | |
| 1654 | - <caret line="46" column="4" selection-start-line="46" selection-start-column="4" selection-end-line="46" selection-end-column="4" /> | |
| 1585 | + <state relative-caret-position="304"> | |
| 1586 | + <caret line="25" column="7" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" /> | |
| 1655 | 1587 | </state> |
| 1656 | 1588 | </provider> |
| 1657 | 1589 | </entry> |
| 1658 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/report.html"> | |
| 1590 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ReceiptDomain.java"> | |
| 1659 | 1591 | <provider selected="true" editor-type-id="text-editor"> |
| 1660 | - <state relative-caret-position="147"> | |
| 1661 | - <caret line="98" column="13" selection-start-line="98" selection-start-column="13" selection-end-line="98" selection-end-column="13" /> | |
| 1662 | - <folding> | |
| 1663 | - <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1664 | - <element signature="n#style#0;n#span#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1665 | - <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1666 | - <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1667 | - </folding> | |
| 1592 | + <state relative-caret-position="95"> | |
| 1593 | + <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> | |
| 1668 | 1594 | </state> |
| 1669 | 1595 | </provider> |
| 1670 | 1596 | </entry> |
| 1671 | - <entry file="file://$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html"> | |
| 1597 | + <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/browser.d.ts"> | |
| 1672 | 1598 | <provider selected="true" editor-type-id="text-editor"> |
| 1673 | - <state relative-caret-position="241"> | |
| 1674 | - <caret line="47" column="36" lean-forward="true" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" /> | |
| 1675 | - <folding> | |
| 1676 | - <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1677 | - <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1678 | - <element signature="n#style#0;n#caption#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1679 | - <element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1680 | - <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1681 | - <element signature="n#style#0;n#td#1;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1682 | - <element signature="n#style#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1683 | - <element signature="n#style#0;n#img#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1684 | - <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1685 | - <element signature="e#2973#2979#0" expanded="true" /> | |
| 1686 | - <element signature="e#2979#2985#0" expanded="true" /> | |
| 1687 | - <element signature="e#2985#2991#0" expanded="true" /> | |
| 1688 | - <element signature="e#2991#2997#0" expanded="true" /> | |
| 1689 | - <element signature="e#2997#3003#0" expanded="true" /> | |
| 1690 | - <element signature="e#3003#3009#0" expanded="true" /> | |
| 1691 | - <element signature="e#3009#3015#0" expanded="true" /> | |
| 1692 | - <element signature="n#style#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1693 | - <element signature="n#style#0;n#input#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1694 | - <element signature="n#style#0;n#caption#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1695 | - <element signature="n#style#0;n#td#1;n#tr#0;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1696 | - <element signature="n#style#0;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1697 | - <element signature="n#style#0;n#td#1;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1698 | - <element signature="n#style#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1699 | - <element signature="n#style#0;n#img#0;n#td#2;n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1700 | - <element signature="n#style#0;n#td#1;n#tr#2;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1701 | - <element signature="e#3995#4001#0" expanded="true" /> | |
| 1702 | - <element signature="e#4001#4007#0" expanded="true" /> | |
| 1703 | - <element signature="e#4007#4013#0" expanded="true" /> | |
| 1704 | - <element signature="e#4013#4019#0" expanded="true" /> | |
| 1705 | - <element signature="e#4019#4025#0" expanded="true" /> | |
| 1706 | - <element signature="e#4025#4031#0" expanded="true" /> | |
| 1707 | - <element signature="e#4031#4037#0" expanded="true" /> | |
| 1708 | - <element signature="n#style#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1709 | - <element signature="n#style#0;n#input#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1710 | - </folding> | |
| 1599 | + <state relative-caret-position="126"> | |
| 1600 | + <caret line="75" column="17" selection-start-line="75" selection-start-column="17" selection-end-line="75" selection-end-column="17" /> | |
| 1711 | 1601 | </state> |
| 1712 | 1602 | </provider> |
| 1713 | 1603 | </entry> |
| 1714 | - <entry file="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.18/druid-1.1.18.jar!/support/http/resources/css/bootstrap.min.css"> | |
| 1604 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/container.html"> | |
| 1715 | 1605 | <provider selected="true" editor-type-id="text-editor"> |
| 1716 | - <state relative-caret-position="152"> | |
| 1717 | - <caret line="8" column="25402" selection-start-line="8" selection-start-column="25402" selection-end-line="8" selection-end-column="25402" /> | |
| 1606 | + <state relative-caret-position="61"> | |
| 1607 | + <caret line="202" selection-start-line="202" selection-end-line="214" selection-end-column="9" /> | |
| 1718 | 1608 | </state> |
| 1719 | 1609 | </provider> |
| 1720 | 1610 | </entry> |
| 1721 | - <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/main/style.min862f.css"> | |
| 1611 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java"> | |
| 1722 | 1612 | <provider selected="true" editor-type-id="text-editor"> |
| 1723 | - <state> | |
| 1724 | - <caret column="49663" selection-start-column="49663" selection-end-column="49663" /> | |
| 1613 | + <state relative-caret-position="108"> | |
| 1614 | + <caret line="181" selection-start-line="181" selection-end-line="195" selection-end-column="5" /> | |
| 1725 | 1615 | </state> |
| 1726 | 1616 | </provider> |
| 1727 | 1617 | </entry> |
| 1728 | - <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css"> | |
| 1618 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/location/location.html"> | |
| 1729 | 1619 | <provider selected="true" editor-type-id="text-editor"> |
| 1730 | - <state relative-caret-position="127"> | |
| 1731 | - <caret line="2721" column="1" selection-start-line="2721" selection-start-column="1" selection-end-line="2721" selection-end-column="1" /> | |
| 1620 | + <state relative-caret-position="285"> | |
| 1621 | + <caret line="75" column="45" lean-forward="true" selection-start-line="75" selection-start-column="45" selection-end-line="75" selection-end-column="45" /> | |
| 1732 | 1622 | </state> |
| 1733 | 1623 | </provider> |
| 1734 | 1624 | </entry> |
| 1735 | - <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css"> | |
| 1625 | + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/location/print.html"> | |
| 1736 | 1626 | <provider selected="true" editor-type-id="text-editor"> |
| 1737 | - <state relative-caret-position="241"> | |
| 1738 | - <caret line="3360" column="17" lean-forward="true" selection-start-line="3360" selection-start-column="17" selection-end-line="3360" selection-end-column="17" /> | |
| 1627 | + <state relative-caret-position="1786"> | |
| 1628 | + <caret line="94" column="49" lean-forward="true" selection-start-line="94" selection-start-column="49" selection-end-line="94" selection-end-column="49" /> | |
| 1739 | 1629 | </state> |
| 1740 | 1630 | </provider> |
| 1741 | 1631 | </entry> |
| 1742 | - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html"> | |
| 1632 | + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java"> | |
| 1743 | 1633 | <provider selected="true" editor-type-id="text-editor"> |
| 1744 | - <state relative-caret-position="150"> | |
| 1745 | - <caret line="21" column="28" lean-forward="true" selection-start-line="21" selection-start-column="28" selection-end-line="21" selection-end-column="28" /> | |
| 1746 | - <folding> | |
| 1747 | - <element signature="n#style#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1748 | - <element signature="n#style#0;n#span#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1749 | - <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1750 | - <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1751 | - <element signature="n#style#0;n#table#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> | |
| 1752 | - </folding> | |
| 1634 | + <state relative-caret-position="431"> | |
| 1635 | + <caret line="316" lean-forward="true" selection-start-line="316" selection-end-line="316" /> | |
| 1753 | 1636 | </state> |
| 1754 | 1637 | </provider> |
| 1755 | 1638 | </entry> |
| ... | ... |
src/main/java/com/huaheng/pc/config/location/controller/LocationController.java
| ... | ... | @@ -14,6 +14,7 @@ import com.huaheng.framework.web.domain.AjaxResult; |
| 14 | 14 | import com.huaheng.framework.web.page.PageDomain; |
| 15 | 15 | import com.huaheng.framework.web.page.TableDataInfo; |
| 16 | 16 | import com.huaheng.framework.web.page.TableSupport; |
| 17 | +import com.huaheng.pc.config.container.domain.Container; | |
| 17 | 18 | import com.huaheng.pc.config.location.domain.Location; |
| 18 | 19 | import com.huaheng.pc.config.location.domain.LocationStatus; |
| 19 | 20 | import com.huaheng.pc.config.location.service.LocationService; |
| ... | ... | @@ -312,4 +313,21 @@ public class LocationController extends BaseController { |
| 312 | 313 | } |
| 313 | 314 | return AjaxResult.success(locations); |
| 314 | 315 | } |
| 316 | + | |
| 317 | + | |
| 318 | + @RequiresPermissions("iconfig:location:print") | |
| 319 | + @Log(title = "库位条码", operating = "库位条码打印", action = BusinessType.OTHER) | |
| 320 | + @GetMapping("/print/{ids}") | |
| 321 | + public String print(@PathVariable("ids") Integer[] ids, ModelMap mmap) | |
| 322 | + { | |
| 323 | + List<Location> list = new ArrayList<>(); | |
| 324 | + for(Integer id:ids){ | |
| 325 | + if(id != null) { | |
| 326 | + Location location = locationService.getById(id); | |
| 327 | + list.add(location); | |
| 328 | + } | |
| 329 | + mmap.put("location", list); | |
| 330 | + } | |
| 331 | + return prefix + "/print"; | |
| 332 | + } | |
| 315 | 333 | } |
| ... | ... |
src/main/resources/templates/config/location/location.html
| ... | ... | @@ -71,6 +71,10 @@ |
| 71 | 71 | <a class="btn btn-outline btn-primary btn-rounded" onclick="addBatch()" shiro:hasPermission="config:location:addBatch"> |
| 72 | 72 | <i class="fa fa-plus-square-o"></i> 批量新增 |
| 73 | 73 | </a> |
| 74 | + <a class="btn btn-outline btn-success btn-rounded" onclick="print()" | |
| 75 | + shiro:hasPermission="inventory:inventoryTransaction:report"> | |
| 76 | + <i class="fa fa-plus"></i> 打印 | |
| 77 | + </a> | |
| 74 | 78 | <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:location:remove"> |
| 75 | 79 | <i class="fa fa-trash-o"></i> 删除 |
| 76 | 80 | </a> |
| ... | ... | @@ -243,6 +247,20 @@ |
| 243 | 247 | function addBatch() { |
| 244 | 248 | $.modal.open("批量添加", prefix + "/addBatch"); |
| 245 | 249 | } |
| 250 | + | |
| 251 | + function print() { | |
| 252 | + var rows=$("#bootstrap-table").bootstrapTable('getSelections'); | |
| 253 | + if (rows.length == 0) { | |
| 254 | + $.modal.alertWarning("请至少选择一条记录"); | |
| 255 | + return; | |
| 256 | + } | |
| 257 | + var ids = ""; | |
| 258 | + for(var i=0; i<rows.length; i++) { | |
| 259 | + ids = ids + rows[i].id + "," | |
| 260 | + } | |
| 261 | + let url=prefix+'/print/' + ids; | |
| 262 | + $.modal.open("打印",url); | |
| 263 | + } | |
| 246 | 264 | </script> |
| 247 | 265 | </body> |
| 248 | 266 | </html> |
| 249 | 267 | \ No newline at end of file |
| ... | ... |
src/main/resources/templates/config/location/print.html
0 → 100644
| 1 | +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" | |
| 2 | + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | |
| 3 | +<html xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> | |
| 4 | +<head> | |
| 5 | + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> | |
| 6 | + <head th:include="include :: header"></head> | |
| 7 | + <title>库存交易明细</title> | |
| 8 | + <!--<link href="css/bootstrap.min.css" rel="stylesheet" />--> | |
| 9 | + <!--<link href="css/font-awesome.min.css" rel="stylesheet" />--> | |
| 10 | + <!--<!–[if IE]>--> | |
| 11 | + <!--<link href="css/font-awesome-ie7.min.css" rel="stylesheet" />--> | |
| 12 | + <!--<![endif]–>--> | |
| 13 | + <link href="css/bootstrap.min.css" rel="stylesheet" /> | |
| 14 | + <link href="css/font-awesome.min.css" rel="stylesheet" /> | |
| 15 | + <link href="css/font-awesome-ie7.min.css" rel="stylesheet" /> | |
| 16 | + <style type="text/css"> | |
| 17 | + body,ul,li{ | |
| 18 | + padding:0; | |
| 19 | + margin:0; | |
| 20 | + } | |
| 21 | + ul,li{ | |
| 22 | + list-style:none; | |
| 23 | + } | |
| 24 | + .table-bordered td,.table-bordered th{border:0px solid #000!important} | |
| 25 | + | |
| 26 | + .ewm_w ul{width:500px; margin:0 auto;} | |
| 27 | + .ewm_w li{width:500px;height:228px; padding:0px;margin:0px auto; display:inline-table;} | |
| 28 | + | |
| 29 | + .ewm_w{ | |
| 30 | + width:156px; | |
| 31 | + float:left; | |
| 32 | + padding-left:0px; | |
| 33 | + } | |
| 34 | + .r_two{ | |
| 35 | + padding-left:20px; | |
| 36 | + } | |
| 37 | + </style> | |
| 38 | +</head> | |
| 39 | + | |
| 40 | +<body> | |
| 41 | +<div class="container"> | |
| 42 | + <div class="row" style="text-align:right"><span class="hidden-print" style="padding-left:20px;"><button type="button" onClick="a()"><i class="fa fa-print"></i> 打印</button></span></div> | |
| 43 | + <div class="row" style="width:500px;padding:0px 0px; margin:0 auto"> | |
| 44 | + <div style="width: 312px; margin:0;padding:0;"> | |
| 45 | + <div th:each="row:${location}"> | |
| 46 | + <div class="ewm_w" > | |
| 47 | + <table style="height: 220px; margin:0;padding:0;" border="0" cellspacing="0" cellpadding="0" class="dy-report table table-bordered"> | |
| 48 | + <!--th:each="row:${container}">--> | |
| 49 | + <tbody> | |
| 50 | + <tr> | |
| 51 | + <td align="center"> | |
| 52 | + <img id="barcode" name="rotate" /> | |
| 53 | + <input th:value="${row.code}" id="code" type="hidden" name="code"/> | |
| 54 | + </td> | |
| 55 | + </tr> | |
| 56 | + </tbody> | |
| 57 | + </table> | |
| 58 | + </div> | |
| 59 | + <div class="ewm_w" > | |
| 60 | + <table style="height: 220px; margin:0;padding:0;" border="0" cellspacing="0" cellpadding="0" class="dy-report table table-bordered"> | |
| 61 | + <!--th:each="row:${container}">--> | |
| 62 | + <tbody> | |
| 63 | + <tr> | |
| 64 | + <td align="center"> | |
| 65 | + <img id="barcode" name="rotate" /> | |
| 66 | + <input th:value="${row.code}" id="code" type="hidden" name="code"/> | |
| 67 | + </td> | |
| 68 | + </tr> | |
| 69 | + </tbody> | |
| 70 | + </table> | |
| 71 | + </div> | |
| 72 | + </div> | |
| 73 | + </div> | |
| 74 | + </div> | |
| 75 | +</div> | |
| 76 | + | |
| 77 | +<div th:include="include :: footer"></div> | |
| 78 | +<style type="text/css"> | |
| 79 | + @media print { | |
| 80 | + .noprint { | |
| 81 | + display: none; | |
| 82 | + } | |
| 83 | + } | |
| 84 | +</style> | |
| 85 | +<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script> | |
| 86 | +<script type="text/javascript" src="../../../js/jquery.jqprint-0.3.js"></script> | |
| 87 | +<script type="text/javascript" src="../../../js/barcode/JsBarcode.all.js"></script> | |
| 88 | +<script type="text/javascript"> | |
| 89 | + var barcodeStyle = { | |
| 90 | + format: "CODE128",//选择要使用的条形码类型 | |
| 91 | + width:1,//设置条之间的宽度 | |
| 92 | + height:70,//高度 | |
| 93 | + displayValue:true,//是否在条形码下方显示文字 | |
| 94 | + // text:"456",//覆盖显示的文本 | |
| 95 | + // fontOptions:"bold italic",//使文字加粗体或变斜体 | |
| 96 | + font:"monospace",//设置文本的字体fantasy | |
| 97 | + textAlign:"center",//设置文本的水平对齐方式 | |
| 98 | + textPosition:"bottom",//设置文本的垂直位置 | |
| 99 | + textMargin:1,//设置条形码和文本之间的间距 | |
| 100 | + fontSize:17,//设置文本的大小 | |
| 101 | + background:"#ffffff",//设置条形码的背景 | |
| 102 | + lineColor:"#000000",//设置条和文本的颜色。 | |
| 103 | + margin:1//设置条形码周围的空白边距 | |
| 104 | + }; | |
| 105 | + function print_qrcode() { | |
| 106 | + $('.dy-report').each(function (i, item) { | |
| 107 | + var code= document.getElementsByName("code")[i].getAttribute("value"); | |
| 108 | + $(this).find('#barcode').JsBarcode( code, barcodeStyle); | |
| 109 | + document.getElementsByName("rotate")[i].style.transform = 'rotate('+90+'deg)'; | |
| 110 | + }); | |
| 111 | + } | |
| 112 | + print_qrcode(); | |
| 113 | +</script> | |
| 114 | + | |
| 115 | +<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script> | |
| 116 | +<script type="text/javascript" src="../../../js/jquery.jqprint-0.3.js"></script> | |
| 117 | +<script type="text/javascript"> | |
| 118 | + function a(){ | |
| 119 | + window.print(); | |
| 120 | + } | |
| 121 | +</script> | |
| 122 | + | |
| 123 | +</body> | |
| 124 | +</html> | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| ... | ... |