wms / wms_wuhangelinmei · Commits

Commit 3ff22a34ae1f716c1f3891d33a694308fd65ed18

Authored by huhai
2 parents 703ba431 896b14aa

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

Inline Side-by-side
Showing 7 changed files with 639 additions and 357 deletions
.idea/workspace.xml
  View file @3ff22a3
... ... @@ -6,7 +6,7 @@
6 6 <component name="ChangeListManager">
7 7 <list default="true" id="baeae966-16bb-4f97-a411-22fe5a65cefd" name="Default Changelist" comment="">
8 8 <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" />
  9 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/material/print.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/material/print.html" afterDir="false" />
10 10 </list>
11 11 <ignored path="$PROJECT_DIR$/target/" />
12 12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -50,81 +50,33 @@
50 50 </component>
51 51 <component name="FileEditorManager">
52 52 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
53   - <file pinned="false" current-in-tab="false">
54   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/container.html">
  53 + <file pinned="false" current-in-tab="true">
  54 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/material/print.html">
55 55 <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" />
  56 + <state relative-caret-position="133">
  57 + <caret line="64" column="29" lean-forward="true" selection-start-line="64" selection-start-column="29" selection-end-line="64" selection-end-column="29" />
  58 + <folding>
  59 + <element signature="n#style#0;n#input#0;n#td#1;n#tr#4;n#tbody#0;n#table#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
  60 + <element signature="n#style#0;n#input#0;n#td#1;n#tr#4;n#tbody#0;n#table#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
  61 + </folding>
58 62 </state>
59 63 </provider>
60 64 </entry>
61 65 </file>
62 66 <file pinned="false" current-in-tab="false">
63   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java">
  67 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/material/material.html">
64 68 <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" />
67   - </state>
68   - </provider>
69   - </entry>
70   - </file>
71   - <file pinned="false" current-in-tab="true">
72   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html">
73   - <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>
  69 + <state relative-caret-position="-3041">
  70 + <caret line="67" column="12" selection-start-line="67" selection-start-column="12" selection-end-line="67" selection-end-column="12" />
83 71 </state>
84 72 </provider>
85 73 </entry>
86 74 </file>
87 75 <file pinned="false" current-in-tab="false">
88   - <entry file="file://$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html">
  76 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java">
89 77 <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>
  78 + <state relative-caret-position="113">
  79 + <caret line="193" column="28" lean-forward="true" selection-start-line="193" selection-start-column="28" selection-end-line="193" selection-end-column="28" />
128 80 </state>
129 81 </provider>
130 82 </entry>
... ... @@ -169,6 +121,13 @@
169 121 <option value="$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html" />
170 122 <option value="$PROJECT_DIR$/src/main/resources/static/css/style.css" />
171 123 <option value="$PROJECT_DIR$/src/main/resources/templates/config/container/print.html" />
  124 + <option value="$PROJECT_DIR$/src/main/resources/templates/config/location/location.html" />
  125 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java" />
  126 + <option value="$PROJECT_DIR$/src/main/resources/templates/config/location/print.html" />
  127 + <option value="$PROJECT_DIR$/src/main/resources/templates/config/material/material.html" />
  128 + <option value="$PROJECT_DIR$/src/main/resources/templates/config/material/report.html" />
  129 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java" />
  130 + <option value="$PROJECT_DIR$/src/main/resources/templates/config/material/print.html" />
172 131 </list>
173 132 </option>
174 133 </component>
... ... @@ -197,6 +156,7 @@
197 156 <foldersAlwaysOnTop value="true" />
198 157 </navigator>
199 158 <panes>
  159 + <pane id="Scope" />
200 160 <pane id="PackagesPane" />
201 161 <pane id="ProjectPane">
202 162 <subPane>
... ... @@ -248,6 +208,16 @@
248 208 <item name="java" type="462c0819:PsiDirectoryNode" />
249 209 <item name="com" type="462c0819:PsiDirectoryNode" />
250 210 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  211 + <item name="api" type="462c0819:PsiDirectoryNode" />
  212 + </path>
  213 + <path>
  214 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  215 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  216 + <item name="src" type="462c0819:PsiDirectoryNode" />
  217 + <item name="main" type="462c0819:PsiDirectoryNode" />
  218 + <item name="java" type="462c0819:PsiDirectoryNode" />
  219 + <item name="com" type="462c0819:PsiDirectoryNode" />
  220 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
251 221 <item name="pc" type="462c0819:PsiDirectoryNode" />
252 222 </path>
253 223 <path>
... ... @@ -271,7 +241,7 @@
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" />
  244 + <item name="location" type="462c0819:PsiDirectoryNode" />
275 245 </path>
276 246 <path>
277 247 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -283,7 +253,7 @@
283 253 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
284 254 <item name="pc" type="462c0819:PsiDirectoryNode" />
285 255 <item name="config" type="462c0819:PsiDirectoryNode" />
286   - <item name="container" type="462c0819:PsiDirectoryNode" />
  256 + <item name="location" type="462c0819:PsiDirectoryNode" />
287 257 <item name="controller" type="462c0819:PsiDirectoryNode" />
288 258 </path>
289 259 <path>
... ... @@ -295,7 +265,8 @@
295 265 <item name="com" type="462c0819:PsiDirectoryNode" />
296 266 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
297 267 <item name="pc" type="462c0819:PsiDirectoryNode" />
298   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
  268 + <item name="config" type="462c0819:PsiDirectoryNode" />
  269 + <item name="material" type="462c0819:PsiDirectoryNode" />
299 270 </path>
300 271 <path>
301 272 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -306,8 +277,9 @@
306 277 <item name="com" type="462c0819:PsiDirectoryNode" />
307 278 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
308 279 <item name="pc" type="462c0819:PsiDirectoryNode" />
309   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
310   - <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
  280 + <item name="config" type="462c0819:PsiDirectoryNode" />
  281 + <item name="material" type="462c0819:PsiDirectoryNode" />
  282 + <item name="controller" type="462c0819:PsiDirectoryNode" />
311 283 </path>
312 284 <path>
313 285 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -319,23 +291,31 @@
319 291 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
320 292 <item name="pc" type="462c0819:PsiDirectoryNode" />
321 293 <item name="inventory" type="462c0819:PsiDirectoryNode" />
322   - <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
323   - <item name="controller" type="462c0819:PsiDirectoryNode" />
324 294 </path>
325 295 <path>
326 296 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
327 297 <item name="wms2" type="462c0819:PsiDirectoryNode" />
328 298 <item name="src" type="462c0819:PsiDirectoryNode" />
329 299 <item name="main" type="462c0819:PsiDirectoryNode" />
330   - <item name="resources" type="462c0819:PsiDirectoryNode" />
  300 + <item name="java" type="462c0819:PsiDirectoryNode" />
  301 + <item name="com" type="462c0819:PsiDirectoryNode" />
  302 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  303 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  304 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  305 + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
331 306 </path>
332 307 <path>
333 308 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
334 309 <item name="wms2" type="462c0819:PsiDirectoryNode" />
335 310 <item name="src" type="462c0819:PsiDirectoryNode" />
336 311 <item name="main" type="462c0819:PsiDirectoryNode" />
337   - <item name="resources" type="462c0819:PsiDirectoryNode" />
338   - <item name="templates" type="462c0819:PsiDirectoryNode" />
  312 + <item name="java" type="462c0819:PsiDirectoryNode" />
  313 + <item name="com" type="462c0819:PsiDirectoryNode" />
  314 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  315 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  316 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  317 + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
  318 + <item name="controller" type="462c0819:PsiDirectoryNode" />
339 319 </path>
340 320 <path>
341 321 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -343,8 +323,6 @@
343 323 <item name="src" type="462c0819:PsiDirectoryNode" />
344 324 <item name="main" type="462c0819:PsiDirectoryNode" />
345 325 <item name="resources" type="462c0819:PsiDirectoryNode" />
346   - <item name="templates" type="462c0819:PsiDirectoryNode" />
347   - <item name="config" type="462c0819:PsiDirectoryNode" />
348 326 </path>
349 327 <path>
350 328 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -353,8 +331,6 @@
353 331 <item name="main" type="462c0819:PsiDirectoryNode" />
354 332 <item name="resources" type="462c0819:PsiDirectoryNode" />
355 333 <item name="templates" type="462c0819:PsiDirectoryNode" />
356   - <item name="config" type="462c0819:PsiDirectoryNode" />
357   - <item name="container" type="462c0819:PsiDirectoryNode" />
358 334 </path>
359 335 <path>
360 336 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -363,7 +339,7 @@
363 339 <item name="main" type="462c0819:PsiDirectoryNode" />
364 340 <item name="resources" type="462c0819:PsiDirectoryNode" />
365 341 <item name="templates" type="462c0819:PsiDirectoryNode" />
366   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
  342 + <item name="config" type="462c0819:PsiDirectoryNode" />
367 343 </path>
368 344 <path>
369 345 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -372,8 +348,8 @@
372 348 <item name="main" type="462c0819:PsiDirectoryNode" />
373 349 <item name="resources" type="462c0819:PsiDirectoryNode" />
374 350 <item name="templates" type="462c0819:PsiDirectoryNode" />
375   - <item name="inventory" type="462c0819:PsiDirectoryNode" />
376   - <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
  351 + <item name="config" type="462c0819:PsiDirectoryNode" />
  352 + <item name="material" type="462c0819:PsiDirectoryNode" />
377 353 </path>
378 354 <path>
379 355 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -382,7 +358,7 @@
382 358 <item name="main" type="462c0819:PsiDirectoryNode" />
383 359 <item name="resources" type="462c0819:PsiDirectoryNode" />
384 360 <item name="templates" type="462c0819:PsiDirectoryNode" />
385   - <item name="receipt" type="462c0819:PsiDirectoryNode" />
  361 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
386 362 </path>
387 363 <path>
388 364 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -391,14 +367,13 @@
391 367 <item name="main" type="462c0819:PsiDirectoryNode" />
392 368 <item name="resources" type="462c0819:PsiDirectoryNode" />
393 369 <item name="templates" type="462c0819:PsiDirectoryNode" />
394   - <item name="receipt" type="462c0819:PsiDirectoryNode" />
395   - <item name="receiptHeader" type="462c0819:PsiDirectoryNode" />
  370 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  371 + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
396 372 </path>
397 373 </expand>
398 374 <select />
399 375 </subPane>
400 376 </pane>
401   - <pane id="Scope" />
402 377 </panes>
403 378 </component>
404 379 <component name="PropertiesComponent">
... ... @@ -410,7 +385,7 @@
410 385 <property name="RequestMappingsPanelWidth1" value="75" />
411 386 <property name="WebServerToolWindowFactoryState" value="false" />
412 387 <property name="aspect.path.notification.shown" value="true" />
413   - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1577352095697" />
  388 + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1578455422696" />
414 389 <property name="full.screen.before.presentation.mode" value="false" />
415 390 <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable" />
416 391 <property name="node.js.detected.package.eslint" value="true" />
... ... @@ -434,6 +409,8 @@
434 409 <recent name="com.huaheng.api.general.domain" />
435 410 </key>
436 411 <key name="CopyFile.RECENT_KEYS">
  412 + <recent name="D:\wms2\src\main\resources\templates\config\material" />
  413 + <recent name="D:\wms2\src\main\resources\templates\config\location" />
437 414 <recent name="D:\wms2\src\main\resources\templates\config\container" />
438 415 <recent name="E:\code\wms2\src\main\resources\static\ajax\libs\bootstrap-table\extensions\editable" />
439 416 </key>
... ... @@ -758,35 +735,14 @@
758 735 <workItem from="1577665795897" duration="4942000" />
759 736 <workItem from="1577670757674" duration="6000" />
760 737 <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>
776   - </task>
777   - <task id="LOCAL-00024" summary="修改入库首选项修改添加模块为select">
778   - <created>1569411473661</created>
779   - <option name="number" value="00024" />
780   - <option name="presentableId" value="LOCAL-00024" />
781   - <option name="project" value="LOCAL" />
782   - <updated>1569411473661</updated>
783   - </task>
784   - <task id="LOCAL-00025" summary="修改任务取消入库组盘状态不回滚，修改任务完成入库单状态不完成">
785   - <created>1569477488017</created>
786   - <option name="number" value="00025" />
787   - <option name="presentableId" value="LOCAL-00025" />
788   - <option name="project" value="LOCAL" />
789   - <updated>1569477488017</updated>
  738 + <workItem from="1577687039415" duration="19596000" />
  739 + <workItem from="1578012059818" duration="10353000" />
  740 + <workItem from="1578271903287" duration="2723000" />
  741 + <workItem from="1578276289137" duration="660000" />
  742 + <workItem from="1578293993555" duration="9808000" />
  743 + <workItem from="1578358115196" duration="1507000" />
  744 + <workItem from="1578379653786" duration="11257000" />
  745 + <workItem from="1578444006015" duration="7109000" />
790 746 </task>
791 747 <task id="LOCAL-00026" summary="添加自动生成容器编码">
792 748 <created>1569484931952</created>
... ... @@ -1103,17 +1059,45 @@
1103 1059 <option name="project" value="LOCAL" />
1104 1060 <updated>1577669193189</updated>
1105 1061 </task>
1106   - <option name="localTasksCounter" value="71" />
  1062 + <task id="LOCAL-00071" summary="托盘条码打印">
  1063 + <created>1577703299302</created>
  1064 + <option name="number" value="00071" />
  1065 + <option name="presentableId" value="LOCAL-00071" />
  1066 + <option name="project" value="LOCAL" />
  1067 + <updated>1577703299303</updated>
  1068 + </task>
  1069 + <task id="LOCAL-00072" summary="托盘条码打印">
  1070 + <created>1577706582680</created>
  1071 + <option name="number" value="00072" />
  1072 + <option name="presentableId" value="LOCAL-00072" />
  1073 + <option name="project" value="LOCAL" />
  1074 + <updated>1577706582680</updated>
  1075 + </task>
  1076 + <task id="LOCAL-00073" summary="库位条码打印">
  1077 + <created>1578385852154</created>
  1078 + <option name="number" value="00073" />
  1079 + <option name="presentableId" value="LOCAL-00073" />
  1080 + <option name="project" value="LOCAL" />
  1081 + <updated>1578385852155</updated>
  1082 + </task>
  1083 + <task id="LOCAL-00074" summary="物料打印">
  1084 + <created>1578455348000</created>
  1085 + <option name="number" value="00074" />
  1086 + <option name="presentableId" value="LOCAL-00074" />
  1087 + <option name="project" value="LOCAL" />
  1088 + <updated>1578455348001</updated>
  1089 + </task>
  1090 + <option name="localTasksCounter" value="75" />
1107 1091 <servers />
1108 1092 </component>
1109 1093 <component name="TimeTrackingManager">
1110   - <option name="totallyTimeSpent" value="110601000" />
  1094 + <option name="totallyTimeSpent" value="158484000" />
1111 1095 </component>
1112 1096 <component name="ToolWindowManager">
1113 1097 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
1114 1098 <editor active="true" />
1115 1099 <layout>
1116   - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4978903" visible="true" weight="0.27680966" />
  1100 + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4978903" visible="true" weight="0.23391421" />
1117 1101 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
1118 1102 <window_info id="Designer" order="2" />
1119 1103 <window_info id="Image Layers" order="3" />
... ... @@ -1134,8 +1118,8 @@
1134 1118 <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.09048257" side_tool="true" weight="0.44192636" />
1135 1119 <window_info anchor="bottom" id="Java Enterprise" order="11" />
1136 1120 <window_info anchor="bottom" id="Database Changes" order="12" />
1137   - <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" />
  1121 + <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.91152817" weight="0.3281471" />
  1122 + <window_info active="true" anchor="bottom" id="Run Dashboard" order="14" sideWeight="0.9095174" visible="true" weight="0.43342775" />
1139 1123 <window_info anchor="bottom" id="Messages" order="15" sideWeight="0.49932975" weight="0.3286119" />
1140 1124 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
1141 1125 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
... ... @@ -1186,8 +1170,6 @@
1186 1170 </option>
1187 1171 </component>
1188 1172 <component name="VcsManagerConfiguration">
1189   - <MESSAGE value="添加站台表，入库组盘头表和任务表添加站台，默认为0" />
1190   - <MESSAGE value="修改任务执行接口" />
1191 1173 <MESSAGE value="修改接口实体类" />
1192 1174 <MESSAGE value="修改接口实体类&#10;修改仓位分配接口" />
1193 1175 <MESSAGE value="修改系统管理参数配置添加和修改页面中的模块和类型" />
... ... @@ -1211,7 +1193,9 @@
1211 1193 <MESSAGE value="修改时间搜索无效，添加入库单没有明细不可以提交审核" />
1212 1194 <MESSAGE value="修复接口bug，新增库存同步物料同步用户同步接口" />
1213 1195 <MESSAGE value="托盘条码打印" />
1214   - <option name="LAST_COMMIT_MESSAGE" value="托盘条码打印" />
  1196 + <MESSAGE value="库位条码打印" />
  1197 + <MESSAGE value="物料打印" />
  1198 + <option name="LAST_COMMIT_MESSAGE" value="物料打印" />
1215 1199 </component>
1216 1200 <component name="XDebuggerManager">
1217 1201 <breakpoint-manager>
... ... @@ -1223,12 +1207,6 @@
1223 1207 <option name="timeStamp" value="24" />
1224 1208 </line-breakpoint>
1225 1209 <line-breakpoint enabled="true" type="java-line">
1226   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java</url>
1227   - <line>165</line>
1228   - <properties />
1229   - <option name="timeStamp" value="26" />
1230   - </line-breakpoint>
1231   - <line-breakpoint enabled="true" type="java-line">
1232 1210 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java</url>
1233 1211 <line>179</line>
1234 1212 <properties />
... ... @@ -1247,12 +1225,6 @@
1247 1225 <option name="timeStamp" value="87" />
1248 1226 </line-breakpoint>
1249 1227 <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 1228 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/warecellAllocation/WarecellAllocationServiceImpl.java</url>
1257 1229 <line>194</line>
1258 1230 <properties>
... ... @@ -1267,12 +1239,6 @@
1267 1239 <option name="timeStamp" value="121" />
1268 1240 </line-breakpoint>
1269 1241 <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 1242 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/configWarning/service/ConfigWarningService.java</url>
1277 1243 <line>110</line>
1278 1244 <properties />
... ... @@ -1332,423 +1298,398 @@
1332 1298 </SUITE>
1333 1299 </component>
1334 1300 <component name="editorHistoryManager">
1335   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ReceiptDomain.java">
  1301 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/qrcode/qrcode.min.js">
1336 1302 <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" />
  1303 + <state>
  1304 + <caret column="4" selection-start-column="4" selection-end-column="4" />
1339 1305 </state>
1340 1306 </provider>
1341 1307 </entry>
1342   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/LoginApi.java">
  1308 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html">
1343 1309 <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" />
  1310 + <state relative-caret-position="152">
  1311 + <caret line="675" column="43" lean-forward="true" selection-start-line="675" selection-start-column="43" selection-end-line="675" selection-end-column="43" />
1346 1312 </state>
1347 1313 </provider>
1348 1314 </entry>
1349   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java">
  1315 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/add.html">
1350 1316 <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" />
1353   - </state>
  1317 + <state relative-caret-position="-962" />
1354 1318 </provider>
1355 1319 </entry>
1356   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ShipmentDomain.java">
  1320 + <entry file="file://$USER_HOME$/Desktop/长沙华恒企网2.0_new/答题HTML/答题HTML/answer.html">
  1321 + <provider selected="true" editor-type-id="text-editor">
  1322 + <state relative-caret-position="-171" />
  1323 + </provider>
  1324 + </entry>
  1325 + <entry file="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.18/druid-1.1.18.jar!/support/http/resources/css/bootstrap.min.css">
1357 1326 <provider selected="true" editor-type-id="text-editor">
1358 1327 <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" />
  1328 + <caret line="8" column="25402" selection-start-line="8" selection-start-column="25402" selection-end-line="8" selection-end-column="25402" />
1360 1329 </state>
1361 1330 </provider>
1362 1331 </entry>
1363   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java">
  1332 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/main/style.min862f.css">
1364 1333 <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" />
  1334 + <state>
  1335 + <caret column="49663" selection-start-column="49663" selection-end-column="49663" />
1367 1336 </state>
1368 1337 </provider>
1369 1338 </entry>
1370   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/shipment/ShipmentDetailMapper.xml">
  1339 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
1371 1340 <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" />
  1341 + <state relative-caret-position="127">
  1342 + <caret line="2721" column="1" selection-start-line="2721" selection-start-column="1" selection-end-line="2721" selection-end-column="1" />
1374 1343 </state>
1375 1344 </provider>
1376 1345 </entry>
1377   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/mapper/ShipmentDetailMapper.java">
  1346 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css">
1378 1347 <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" />
  1348 + <state relative-caret-position="241">
  1349 + <caret line="3360" column="17" lean-forward="true" selection-start-line="3360" selection-start-column="17" selection-end-line="3360" selection-end-column="17" />
1381 1350 </state>
1382 1351 </provider>
1383 1352 </entry>
1384   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailService.java">
  1353 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/report.html">
1385 1354 <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" />
  1355 + <state relative-caret-position="1330">
  1356 + <caret line="70" column="4" lean-forward="true" selection-start-line="70" selection-start-column="4" selection-end-line="70" selection-end-column="22" />
  1357 + <folding>
  1358 + <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" />
  1359 + </folding>
1388 1360 </state>
1389 1361 </provider>
1390 1362 </entry>
1391   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/service/ShipmentDetailServiceImpl.java">
  1363 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html">
1392 1364 <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" />
  1365 + <state relative-caret-position="551">
  1366 + <caret line="29" column="24" lean-forward="true" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="24" />
  1367 + <folding>
  1368 + <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1369 + <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1370 + <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" />
  1371 + <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" />
  1372 + </folding>
1395 1373 </state>
1396 1374 </provider>
1397 1375 </entry>
1398   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ShipmentApiService.java">
  1376 + <entry file="file://$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html">
1399 1377 <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" />
  1378 + <state relative-caret-position="19">
  1379 + <caret line="47" column="36" selection-start-line="47" selection-start-column="36" selection-end-line="47" selection-end-column="36" />
  1380 + <folding>
  1381 + <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1382 + <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1383 + <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" />
  1384 + <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" />
  1385 + <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" />
  1386 + <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" />
  1387 + <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" />
  1388 + <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" />
  1389 + <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" />
  1390 + <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" />
  1391 + <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" />
  1392 + <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" />
  1393 + <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" />
  1394 + <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" />
  1395 + <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" />
  1396 + <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" />
  1397 + <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" />
  1398 + <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" />
  1399 + <element signature="e#3995#4001#0" expanded="true" />
  1400 + <element signature="e#4001#4007#0" expanded="true" />
  1401 + <element signature="e#4007#4013#0" expanded="true" />
  1402 + <element signature="e#4013#4019#0" expanded="true" />
  1403 + <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" />
  1404 + <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" />
  1405 + </folding>
1402 1406 </state>
1403 1407 </provider>
1404 1408 </entry>
1405   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/ShipmentApi.java">
  1409 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishServiceImpl.java">
1406 1410 <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" />
  1411 + <state relative-caret-position="149">
  1412 + <caret line="27" column="22" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />
1409 1413 </state>
1410 1414 </provider>
1411 1415 </entry>
1412   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java">
  1416 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskFinish/TaskFinishService.java">
1413 1417 <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" />
  1418 + <state relative-caret-position="133">
  1419 + <caret line="8" column="15" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
1416 1420 </state>
1417 1421 </provider>
1418 1422 </entry>
1419   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/ReceiptApi.java">
  1423 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/EmptyOutHandle.java">
1420 1424 <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" />
  1425 + <state relative-caret-position="149">
  1426 + <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
1423 1427 </state>
1424 1428 </provider>
1425 1429 </entry>
1426   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/domain/User.java">
  1430 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/OverrideHandle.java">
1427 1431 <provider selected="true" editor-type-id="text-editor">
1428   - <state relative-caret-position="209">
  1432 + <state relative-caret-position="149">
1429 1433 <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
1430 1434 </state>
1431 1435 </provider>
1432 1436 </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">
  1437 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/WarecellAllocation.java">
1434 1438 <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" />
  1439 + <state relative-caret-position="-70">
  1440 + <caret line="41" column="67" selection-start-line="41" selection-start-column="60" selection-end-line="41" selection-end-column="67" />
1437 1441 </state>
1438 1442 </provider>
1439 1443 </entry>
1440   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/system/UserMapper.xml">
  1444 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelServiceImpl.java">
1441 1445 <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" />
  1446 + <state relative-caret-position="209">
  1447 + <caret line="19" column="11" selection-start-line="19" selection-start-column="7" selection-end-line="19" selection-end-column="11" />
1444 1448 </state>
1445 1449 </provider>
1446 1450 </entry>
1447   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/IUserService.java">
  1451 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/service/taskCancel/TaskCancelService.java">
1448 1452 <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" />
  1453 + <state relative-caret-position="133">
  1454 + <caret line="7" column="15" selection-start-line="7" selection-start-column="15" selection-end-line="7" selection-end-column="15" />
1451 1455 </state>
1452 1456 </provider>
1453 1457 </entry>
1454   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialService.java">
  1458 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/TaskInfoController.java">
1455 1459 <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" />
  1460 + <state relative-caret-position="296">
  1461 + <caret line="24" column="34" lean-forward="true" selection-start-line="24" selection-start-column="34" selection-end-line="24" selection-end-column="34" />
1458 1462 </state>
1459 1463 </provider>
1460 1464 </entry>
1461   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialServiceImpl.java">
  1465 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/controller/TaskFinish.java">
1462 1466 <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" />
  1467 + <state relative-caret-position="310">
  1468 + <caret line="35" column="59" lean-forward="true" selection-start-line="35" selection-start-column="59" selection-end-line="35" selection-end-column="59" />
1465 1469 </state>
1466 1470 </provider>
1467 1471 </entry>
1468   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/controller/UserController.java">
  1472 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/BasicDataApi.java">
1469 1473 <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" />
  1474 + <state relative-caret-position="291">
  1475 + <caret line="170" column="1" selection-start-line="170" selection-start-column="1" selection-end-line="170" selection-end-column="1" />
1472 1476 </state>
1473 1477 </provider>
1474 1478 </entry>
1475   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/mapper/UserMapper.java">
  1479 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/wcs/domain/WcsTask.java">
1476 1480 <provider selected="true" editor-type-id="text-editor">
1477 1481 <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" />
  1482 + <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
1479 1483 </state>
1480 1484 </provider>
1481 1485 </entry>
1482   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java">
  1486 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ReceiptApiService.java">
1483 1487 <provider selected="true" editor-type-id="text-editor">
1484   - <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" />
1486   - <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" />
1501   - </folding>
  1488 + <state relative-caret-position="247">
  1489 + <caret line="44" column="13" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
1502 1490 </state>
1503 1491 </provider>
1504 1492 </entry>
1505   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/Receipt.java">
  1493 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/ReceiptController.java">
1506 1494 <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" />
  1495 + <state relative-caret-position="494">
  1496 + <caret line="35" column="51" selection-start-line="35" selection-start-column="51" selection-end-line="35" selection-end-column="51" />
1509 1497 </state>
1510 1498 </provider>
1511 1499 </entry>
1512   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/BasicDataApi.java">
  1500 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/ReceiptService.java">
1513 1501 <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" />
  1502 + <state relative-caret-position="665">
  1503 + <caret line="64" column="42" selection-start-line="64" selection-start-column="33" selection-end-line="64" selection-end-column="42" />
1516 1504 </state>
1517 1505 </provider>
1518 1506 </entry>
1519   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/InventoryDomain.java">
  1507 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengServletInitializer.java">
1520 1508 <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" />
  1509 + <state relative-caret-position="150">
  1510 + <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
1523 1511 </state>
1524 1512 </provider>
1525 1513 </entry>
1526   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/service/BasicDataApiService.java">
  1514 + <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
1527 1515 <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" />
  1516 + <state relative-caret-position="189">
  1517 + <caret line="66" column="12" lean-forward="true" selection-start-line="66" selection-start-column="12" selection-end-line="66" selection-end-column="12" />
1530 1518 </state>
1531 1519 </provider>
1532 1520 </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">
  1521 + <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
1534 1522 <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" />
1537   - </state>
  1523 + <state relative-caret-position="-824" />
1538 1524 </provider>
1539 1525 </entry>
1540   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java">
  1526 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java">
1541 1527 <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" />
  1528 + <state relative-caret-position="-26">
  1529 + <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
1544 1530 </state>
1545 1531 </provider>
1546 1532 </entry>
1547   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/service/InventoryTransactionService.java">
  1533 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java">
1548 1534 <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" />
  1535 + <state relative-caret-position="202">
  1536 + <caret line="156" lean-forward="true" selection-start-line="156" selection-end-line="156" />
1551 1537 </state>
1552 1538 </provider>
1553 1539 </entry>
1554   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html">
  1540 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/cycleCountHeader/controller/CycleCountHeaderController.java">
1555 1541 <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" />
  1542 + <state relative-caret-position="317">
  1543 + <caret line="71" selection-start-line="71" selection-end-line="71" />
1558 1544 </state>
1559 1545 </provider>
1560 1546 </entry>
1561   - <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es5.d.ts">
  1547 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkHeader/controller/CheckHeaderController.java">
1562 1548 <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" />
  1549 + <state relative-caret-position="190">
  1550 + <caret line="38" column="13" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" />
1565 1551 </state>
1566 1552 </provider>
1567 1553 </entry>
1568   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/plugins/metisMenu/jquery.metisMenu.js">
  1554 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/controller/ReceiptApi.java">
1569 1555 <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" />
  1556 + <state relative-caret-position="304">
  1557 + <caret line="25" column="7" selection-start-line="25" selection-start-column="7" selection-end-line="25" selection-end-column="7" />
1572 1558 </state>
1573 1559 </provider>
1574 1560 </entry>
1575   - <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.dom.d.ts">
  1561 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/api/general/domain/ReceiptDomain.java">
1576 1562 <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" />
  1563 + <state relative-caret-position="95">
  1564 + <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
1579 1565 </state>
1580 1566 </provider>
1581 1567 </entry>
1582   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/qrcode/qrcode.min.js">
  1568 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java">
1583 1569 <provider selected="true" editor-type-id="text-editor">
1584   - <state>
1585   - <caret column="4" selection-start-column="4" selection-end-column="4" />
  1570 + <state relative-caret-position="2812">
  1571 + <caret line="181" selection-start-line="181" selection-end-line="195" selection-end-column="5" />
1586 1572 </state>
1587 1573 </provider>
1588 1574 </entry>
1589   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java">
  1575 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/container.html">
1590 1576 <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" />
  1577 + <state relative-caret-position="61">
  1578 + <caret line="202" selection-start-line="202" selection-end-line="214" selection-end-column="9" />
1593 1579 </state>
1594 1580 </provider>
1595 1581 </entry>
1596   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html">
  1582 + <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es5.d.ts">
1597 1583 <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" />
  1584 + <state relative-caret-position="166">
  1585 + <caret line="1215" column="4" selection-start-line="1215" selection-start-column="4" selection-end-line="1215" selection-end-column="4" />
1600 1586 </state>
1601 1587 </provider>
1602 1588 </entry>
1603   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/add.html">
1604   - <provider selected="true" editor-type-id="text-editor">
1605   - <state relative-caret-position="-962" />
1606   - </provider>
1607   - </entry>
1608 1589 <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/echarts/echarts.js">
1609 1590 <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" />
  1591 + <state relative-caret-position="190">
  1592 + <caret line="11245" column="4" selection-start-line="11245" selection-start-column="4" selection-end-line="11245" selection-end-column="4" />
1612 1593 </state>
1613 1594 </provider>
1614 1595 </entry>
1615   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/report.html">
  1596 + <entry file="file://$USER_HOME$/Desktop/HttpPrinter3.0.0.5_20200103_014305_%E5%90%ABhtml%E7%A4%BA%E4%BE%8B/调用示例/Http协议示例/html/http_test_fastreport.html">
1616 1597 <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>
  1598 + <state relative-caret-position="-3819">
  1599 + <caret line="207" column="42" selection-start-line="207" selection-start-column="27" selection-end-line="207" selection-end-column="42" />
1622 1600 </state>
1623 1601 </provider>
1624 1602 </entry>
1625   - <entry file="file://$USER_HOME$/Desktop/长沙华恒企网2.0_new/答题HTML/答题HTML/answer.html">
  1603 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/jquery.jqprint-0.3.js">
1626 1604 <provider selected="true" editor-type-id="text-editor">
1627   - <state relative-caret-position="-171" />
  1605 + <state relative-caret-position="126">
  1606 + <caret line="60" column="104" selection-start-line="60" selection-start-column="104" selection-end-line="60" selection-end-column="104" />
  1607 + </state>
1628 1608 </provider>
1629 1609 </entry>
1630   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/container.html">
  1610 + <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/browser.d.ts">
1631 1611 <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" />
  1612 + <state relative-caret-position="240">
  1613 + <caret line="46" column="7" selection-start-line="46" selection-start-column="7" selection-end-line="46" selection-end-column="7" />
1634 1614 </state>
1635 1615 </provider>
1636 1616 </entry>
1637   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java">
  1617 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/report.html">
1638 1618 <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" />
  1619 + <state relative-caret-position="665">
  1620 + <caret line="47" column="29" lean-forward="true" selection-start-line="47" selection-start-column="29" selection-end-line="47" selection-end-column="29" />
  1621 + <folding>
  1622 + <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1623 + <element signature="n#style#0;n#span#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1624 + <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
  1625 + <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" />
  1626 + </folding>
1641 1627 </state>
1642 1628 </provider>
1643 1629 </entry>
1644   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/jquery.jqprint-0.3.js">
  1630 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/location/print.html">
1645 1631 <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" />
  1632 + <state relative-caret-position="146">
  1633 + <caret line="113" lean-forward="true" selection-start-line="113" selection-end-line="113" />
1648 1634 </state>
1649 1635 </provider>
1650 1636 </entry>
1651   - <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/browser.d.ts">
  1637 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/location/location.html">
1652 1638 <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" />
  1639 + <state relative-caret-position="285">
  1640 + <caret line="75" column="45" selection-start-line="75" selection-start-column="45" selection-end-line="75" selection-end-column="45" />
1655 1641 </state>
1656 1642 </provider>
1657 1643 </entry>
1658   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/report.html">
  1644 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html">
1659 1645 <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>
  1646 + <state relative-caret-position="179">
  1647 + <caret line="310" selection-start-line="310" selection-end-line="322" selection-end-column="10" />
1668 1648 </state>
1669 1649 </provider>
1670 1650 </entry>
1671   - <entry file="file://$USER_HOME$/Desktop/boot/boot/打印二维码 - 多个组2.html">
  1651 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java">
1672 1652 <provider selected="true" editor-type-id="text-editor">
1673 1653 <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>
  1654 + <caret line="105" column="28" lean-forward="true" selection-start-line="105" selection-start-column="28" selection-end-line="105" selection-end-column="28" />
1711 1655 </state>
1712 1656 </provider>
1713 1657 </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">
  1658 + <entry file="file://$USER_HOME$/Desktop/demo.html">
1715 1659 <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" />
  1660 + <state relative-caret-position="19">
  1661 + <caret line="1" column="6" lean-forward="true" selection-start-line="1" selection-start-column="6" selection-end-line="1" selection-end-column="6" />
1718 1662 </state>
1719 1663 </provider>
1720 1664 </entry>
1721   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/main/style.min862f.css">
  1665 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java">
1722 1666 <provider selected="true" editor-type-id="text-editor">
1723   - <state>
1724   - <caret column="49663" selection-start-column="49663" selection-end-column="49663" />
  1667 + <state relative-caret-position="208">
  1668 + <caret line="317" column="50" lean-forward="true" selection-start-line="317" selection-start-column="50" selection-end-line="317" selection-end-column="50" />
1725 1669 </state>
1726 1670 </provider>
1727 1671 </entry>
1728   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
  1672 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/material/material.html">
1729 1673 <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" />
  1674 + <state relative-caret-position="-3041">
  1675 + <caret line="67" column="12" selection-start-line="67" selection-start-column="12" selection-end-line="67" selection-end-column="12" />
1732 1676 </state>
1733 1677 </provider>
1734 1678 </entry>
1735   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css">
  1679 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java">
1736 1680 <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" />
  1681 + <state relative-caret-position="113">
  1682 + <caret line="193" column="28" lean-forward="true" selection-start-line="193" selection-start-column="28" selection-end-line="193" selection-end-column="28" />
1739 1683 </state>
1740 1684 </provider>
1741 1685 </entry>
1742   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html">
  1686 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/material/print.html">
1743 1687 <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" />
  1688 + <state relative-caret-position="133">
  1689 + <caret line="64" column="29" lean-forward="true" selection-start-line="64" selection-start-column="29" selection-end-line="64" selection-end-column="29" />
1746 1690 <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" />
  1691 + <element signature="n#style#0;n#input#0;n#td#1;n#tr#4;n#tbody#0;n#table#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
  1692 + <element signature="n#style#0;n#input#0;n#td#1;n#tr#4;n#tbody#0;n#table#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
1752 1693 </folding>
1753 1694 </state>
1754 1695 </provider>
... ...
src/main/java/com/huaheng/pc/config/location/controller/LocationController.java
  View file @3ff22a3
... ... @@ -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/java/com/huaheng/pc/config/material/controller/MaterialController.java
  View file @3ff22a3
... ... @@ -18,8 +18,10 @@ import com.huaheng.framework.web.page.TableDataInfo;
18 18 import com.huaheng.framework.web.page.TableSupport;
19 19 import com.huaheng.pc.config.material.domain.Material;
20 20 import com.huaheng.pc.config.material.service.MaterialService;
  21 +import com.huaheng.pc.config.material.service.MaterialServiceImpl;
21 22 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
22 23 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
  24 +import com.huaheng.pc.inventory.inventoryTransaction.domain.InventoryTransaction;
23 25 import io.swagger.annotations.Api;
24 26 import io.swagger.annotations.ApiOperation;
25 27 import io.swagger.annotations.ApiParam;
... ... @@ -30,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
30 32 import org.springframework.web.multipart.MultipartFile;
31 33  
32 34 import javax.annotation.Resource;
  35 +import java.util.ArrayList;
33 36 import java.util.List;
34 37  
35 38 @Api(tags={"物料控制类"})
... ... @@ -181,4 +184,19 @@ public class MaterialController extends BaseController {
181 184 return util.importTemplateExcel("物料");
182 185 }
183 186  
  187 + @RequiresPermissions("config:material:print")
  188 + @Log(title = "库存-库存交易明细", operating = "库存交易明细报表打印", action = BusinessType.OTHER)
  189 + @GetMapping("/print/{ids}")
  190 + public String report(@PathVariable("ids") Integer[] ids, ModelMap mmap)
  191 + {
  192 + List<Material> list = new ArrayList<>();
  193 + for(Integer id:ids){
  194 + if(id != null) {
  195 + Material material = materialService.getById(id);
  196 + list.add(material);
  197 + }
  198 + mmap.put("material", list);
  199 + }
  200 + return prefix + "/print";
  201 + }
184 202 }
... ...
src/main/resources/templates/config/location/location.html
  View file @3ff22a3
... ... @@ -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
  View file @3ff22a3
  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 + <!--&lt;!&ndash;[if IE]>-->
  11 + <!--<link href="css/font-awesome-ie7.min.css" rel="stylesheet" />-->
  12 + <!--<![endif]&ndash;&gt;-->
  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 +
... ...
src/main/resources/templates/config/material/material.html
  View file @3ff22a3
... ... @@ -50,6 +50,10 @@
50 50 <a class="btn btn-outline btn-info btn-rounded" onclick="$.table.importExcel()">
51 51 <i class="fa fa-upload"></i> 导入
52 52 </a>
  53 + <a class="btn btn-outline btn-success btn-rounded" onclick="report()"
  54 + shiro:hasPermission="inventory:inventoryTransaction:report">
  55 + <i class="fa fa-plus"></i> 打印
  56 + </a>
53 57 </div>
54 58  
55 59 <div class="col-sm-12 select-info">
... ... @@ -230,6 +234,20 @@
230 234 };
231 235 $.table.init(options);
232 236 });
  237 +
  238 + function report() {
  239 + var rows=$("#bootstrap-table").bootstrapTable('getSelections');
  240 + if (rows.length == 0) {
  241 + $.modal.alertWarning("请至少选择一条记录");
  242 + return;
  243 + }
  244 + var ids = "";
  245 + for(var i=0; i<rows.length; i++) {
  246 + ids = ids + rows[i].id + ","
  247 + }
  248 + let url=prefix+'/print/' + ids;
  249 + $.modal.open("打印",url);
  250 + }
233 251 </script>
234 252  
235 253 <!-- 导入区域 -->
... ...
src/main/resources/templates/config/material/print.html 0 → 100644
  View file @3ff22a3
  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 + <!--&lt;!&ndash;[if IE]>-->
  11 + <!--<link href="css/font-awesome-ie7.min.css" rel="stylesheet" />-->
  12 + <!--<![endif]&ndash;&gt;-->
  13 +
  14 + <style type="text/css">
  15 + .table-bordered td, .table-bordered th {
  16 + border: 1px solid #000 !important;
  17 + }
  18 + .table tbody tr td{
  19 + padding: 3px;
  20 + text-align: center;
  21 + }
  22 + </style>
  23 +</head>
  24 +
  25 +<body id="ddd">
  26 +<div class="noprint container" style="text-align:right; padding: 20px;float: right">
  27 + <span style="padding-left:20px;"><button type="button" onClick="a()"><i class="fa fa-print"></i> 打印</button></span>
  28 +</div>
  29 +<div class="container" style=" width:320px;/*height:228px;*/color: #333">
  30 + <div class="row">
  31 + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="dy-report table table-bordered"
  32 + th:each="row:${material}">
  33 + <caption style="font-size:18px;text-align:center; color:#333; padding-bottom: 3px;">长沙华恒机器人系统有限公司</caption>
  34 + <tbody>
  35 + <tr>
  36 + <td width="20%" scope="col">物料编码</td>
  37 + <td colspan="2" scope="col" style="text-align:center">
  38 + <span th:text="${row.code}" ></span>
  39 + </td>
  40 + </tr>
  41 + <tr>
  42 + <td scope="col">物料类别</td>
  43 + <td colspan="2" scope="col" style="text-align:center">
  44 + <span th:text="${row.type}" ></span>
  45 + </td>
  46 + </tr>
  47 + <tr style="vertical-align:middle">
  48 + <td>物料名称</td>
  49 + <td style="text-align:center">
  50 + <span th:text="${row.name}"></span>
  51 + </td>
  52 + <td rowspan="3" width="15%" style="padding: 2px">
  53 + <!--<img class="" align="center" valign="middle" style="vertical-align:middle; padding:2px;"/>-->
  54 + <!--<span class="qrcode"></span>-->
  55 + <div class="qrcode"></div>
  56 + </td>
  57 + </tr>
  58 + <tr>
  59 + <td>物料规格</td>
  60 + <td style="text-align:center">
  61 + <span th:text="${row.spec}"></span>
  62 + </td>
  63 + </tr>
  64 + <tr>
  65 + <td>物料数量</td>
  66 + <td style="text-align:center; padding: 0">
  67 + <!--<input name="" type="text" style="line-height:18px; border:0; text-align:center;" th:text="${receiptDetail.qty}"/>-->
  68 + <input id="qty" name="qty" value="" class="form-control" type="text" style="text-align:center;height:30px;border: none"/>
  69 + </td>
  70 + </tr>
  71 + <tr>
  72 + <td scope="col">项目号</td>
  73 + <td colspan="2" scope="col" style="text-align:center">
  74 + <input value="" class="form-control" type="text" style="text-align:center;height:30px;border: none"/>
  75 + </td>
  76 + </tr>
  77 + </tbody>
  78 + </table>
  79 + </div>
  80 +</div>
  81 +<div th:include="include :: footer"></div>
  82 +<style type="text/css">
  83 + @media print {
  84 + .noprint {
  85 + display: none;
  86 + }
  87 + }
  88 +</style>
  89 +<!--<script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>-->
  90 +<!--<script type="text/javascript" src="../../../js/jquery.jqprint-0.3.js"></script>-->
  91 +<script type="text/javascript" src="../../../js/qrcode/qrcode.min.js"></script>
  92 +<script type="text/javascript">
  93 + function a() {
  94 + // $("#ddd").jqprint();
  95 + $(".qrcode").children().remove();
  96 + print_qrcode();
  97 + window.print();
  98 + }
  99 + function print_qrcode(){
  100 + $('.dy-report').each(function (i,item) {
  101 + var company=$(this).children()[1].children[0].innerText;
  102 + var code16=$(this).children()[1].children[1].innerText;
  103 + var name=$(this).children()[1].children[2].innerText;
  104 + var spec=$(this).children()[1].children[3].innerText;
  105 + var projectNo=$(this).children()[1].children[5].innerText;
  106 + company=company.substring(5);
  107 + code16=code16.substring(5);
  108 + name=name.substring(5);
  109 + spec=spec.substring(5);
  110 + projectNo=projectNo.substring(5);
  111 + var reg=/\t/;
  112 + name=name.replace(reg,"");
  113 + var qty=$(this).find('input').val();
  114 + // var code_text=company+'/'+ code16 +'/' +name+'/'+spec+'/'+qty+'/'+project;
  115 + var code_text=company+'/'+ name +'/'+ spec +'/'+qty;
  116 + var QRcode=new QRCode($(this).find('.qrcode')[0],{
  117 + text:code_text,
  118 + width:56,
  119 + height:56,
  120 + correctLevel:QRCode.CorrectLevel.L
  121 + });
  122 + });
  123 + }
  124 + print_qrcode();
  125 +
  126 +</script>
  127 +
  128 +</body>
  129 +</html>
  130 +
  131 +
  132 +
  133 +
  134 +
  135 +
  136 +
  137 +
... ...