Commit 2666a7d13d6f2df8f194393adec701378278b39b

Authored by wangyanxiong
1 parent 462f3a9b

物料打印

.idea/workspace.xml
... ... @@ -5,10 +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 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/material/print.html" afterDir="false" />
9 9 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java" afterDir="false" />
  11 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/material/material.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/material/material.html" afterDir="false" />
12 12 </list>
13 13 <ignored path="$PROJECT_DIR$/target/" />
14 14 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -52,47 +52,33 @@
52 52 </component>
53 53 <component name="FileEditorManager">
54 54 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
55   - <file pinned="false" current-in-tab="false">
56   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/location/print.html">
  55 + <file pinned="false" current-in-tab="true">
  56 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/material/print.html">
57 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" />
  58 + <state relative-caret-position="228">
  59 + <caret line="42" column="70" lean-forward="true" selection-start-line="42" selection-start-column="70" selection-end-line="42" selection-end-column="70" />
  60 + <folding>
  61 + <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" />
  62 + <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" />
  63 + </folding>
60 64 </state>
61 65 </provider>
62 66 </entry>
63 67 </file>
64 68 <file pinned="false" current-in-tab="false">
65   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/location/location.html">
  69 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/material/material.html">
66 70 <provider selected="true" editor-type-id="text-editor">
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" />
  71 + <state relative-caret-position="-3041">
  72 + <caret line="67" column="12" selection-start-line="67" selection-start-column="12" selection-end-line="67" selection-end-column="12" />
69 73 </state>
70 74 </provider>
71 75 </entry>
72 76 </file>
73 77 <file pinned="false" current-in-tab="false">
74   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java">
75   - <provider selected="true" editor-type-id="text-editor">
76   - <state relative-caret-position="108">
77   - <caret line="181" selection-start-line="181" selection-end-line="195" selection-end-column="5" />
78   - </state>
79   - </provider>
80   - </entry>
81   - </file>
82   - <file pinned="false" current-in-tab="true">
83   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java">
  78 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java">
84 79 <provider selected="true" editor-type-id="text-editor">
85   - <state relative-caret-position="431">
86   - <caret line="316" lean-forward="true" selection-start-line="316" selection-end-line="316" />
87   - </state>
88   - </provider>
89   - </entry>
90   - </file>
91   - <file pinned="false" current-in-tab="false">
92   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/container.html">
93   - <provider selected="true" editor-type-id="text-editor">
94   - <state relative-caret-position="61">
95   - <caret line="202" selection-start-line="202" selection-end-line="214" selection-end-column="9" />
  80 + <state relative-caret-position="113">
  81 + <caret line="193" column="28" lean-forward="true" selection-start-line="193" selection-start-column="28" selection-end-line="193" selection-end-column="28" />
96 82 </state>
97 83 </provider>
98 84 </entry>
... ... @@ -140,6 +126,10 @@
140 126 <option value="$PROJECT_DIR$/src/main/resources/templates/config/location/location.html" />
141 127 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java" />
142 128 <option value="$PROJECT_DIR$/src/main/resources/templates/config/location/print.html" />
  129 + <option value="$PROJECT_DIR$/src/main/resources/templates/config/material/material.html" />
  130 + <option value="$PROJECT_DIR$/src/main/resources/templates/config/material/report.html" />
  131 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java" />
  132 + <option value="$PROJECT_DIR$/src/main/resources/templates/config/material/print.html" />
143 133 </list>
144 134 </option>
145 135 </component>
... ... @@ -168,6 +158,7 @@
168 158 <foldersAlwaysOnTop value="true" />
169 159 </navigator>
170 160 <panes>
  161 + <pane id="Scope" />
171 162 <pane id="PackagesPane" />
172 163 <pane id="ProjectPane">
173 164 <subPane>
... ... @@ -272,6 +263,67 @@
272 263 <item name="wms2" type="462c0819:PsiDirectoryNode" />
273 264 <item name="src" type="462c0819:PsiDirectoryNode" />
274 265 <item name="main" type="462c0819:PsiDirectoryNode" />
  266 + <item name="java" type="462c0819:PsiDirectoryNode" />
  267 + <item name="com" type="462c0819:PsiDirectoryNode" />
  268 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  269 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  270 + <item name="config" type="462c0819:PsiDirectoryNode" />
  271 + <item name="material" type="462c0819:PsiDirectoryNode" />
  272 + </path>
  273 + <path>
  274 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  275 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  276 + <item name="src" type="462c0819:PsiDirectoryNode" />
  277 + <item name="main" type="462c0819:PsiDirectoryNode" />
  278 + <item name="java" type="462c0819:PsiDirectoryNode" />
  279 + <item name="com" type="462c0819:PsiDirectoryNode" />
  280 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  281 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  282 + <item name="config" type="462c0819:PsiDirectoryNode" />
  283 + <item name="material" type="462c0819:PsiDirectoryNode" />
  284 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  285 + </path>
  286 + <path>
  287 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  288 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  289 + <item name="src" type="462c0819:PsiDirectoryNode" />
  290 + <item name="main" type="462c0819:PsiDirectoryNode" />
  291 + <item name="java" type="462c0819:PsiDirectoryNode" />
  292 + <item name="com" type="462c0819:PsiDirectoryNode" />
  293 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  294 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  295 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  296 + </path>
  297 + <path>
  298 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  299 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  300 + <item name="src" type="462c0819:PsiDirectoryNode" />
  301 + <item name="main" type="462c0819:PsiDirectoryNode" />
  302 + <item name="java" type="462c0819:PsiDirectoryNode" />
  303 + <item name="com" type="462c0819:PsiDirectoryNode" />
  304 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  305 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  306 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  307 + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
  308 + </path>
  309 + <path>
  310 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  311 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  312 + <item name="src" type="462c0819:PsiDirectoryNode" />
  313 + <item name="main" type="462c0819:PsiDirectoryNode" />
  314 + <item name="java" type="462c0819:PsiDirectoryNode" />
  315 + <item name="com" type="462c0819:PsiDirectoryNode" />
  316 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  317 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  318 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  319 + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
  320 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  321 + </path>
  322 + <path>
  323 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  324 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  325 + <item name="src" type="462c0819:PsiDirectoryNode" />
  326 + <item name="main" type="462c0819:PsiDirectoryNode" />
275 327 <item name="resources" type="462c0819:PsiDirectoryNode" />
276 328 </path>
277 329 <path>
... ... @@ -299,7 +351,7 @@
299 351 <item name="resources" type="462c0819:PsiDirectoryNode" />
300 352 <item name="templates" type="462c0819:PsiDirectoryNode" />
301 353 <item name="config" type="462c0819:PsiDirectoryNode" />
302   - <item name="container" type="462c0819:PsiDirectoryNode" />
  354 + <item name="material" type="462c0819:PsiDirectoryNode" />
303 355 </path>
304 356 <path>
305 357 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -308,14 +360,22 @@
308 360 <item name="main" type="462c0819:PsiDirectoryNode" />
309 361 <item name="resources" type="462c0819:PsiDirectoryNode" />
310 362 <item name="templates" type="462c0819:PsiDirectoryNode" />
311   - <item name="config" type="462c0819:PsiDirectoryNode" />
312   - <item name="location" type="462c0819:PsiDirectoryNode" />
  363 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  364 + </path>
  365 + <path>
  366 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  367 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  368 + <item name="src" type="462c0819:PsiDirectoryNode" />
  369 + <item name="main" type="462c0819:PsiDirectoryNode" />
  370 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  371 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  372 + <item name="inventory" type="462c0819:PsiDirectoryNode" />
  373 + <item name="inventoryTransaction" type="462c0819:PsiDirectoryNode" />
313 374 </path>
314 375 </expand>
315 376 <select />
316 377 </subPane>
317 378 </pane>
318   - <pane id="Scope" />
319 379 </panes>
320 380 </component>
321 381 <component name="PropertiesComponent">
... ... @@ -327,7 +387,7 @@
327 387 <property name="RequestMappingsPanelWidth1" value="75" />
328 388 <property name="WebServerToolWindowFactoryState" value="false" />
329 389 <property name="aspect.path.notification.shown" value="true" />
330   - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1578384988709" />
  390 + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1578455269808" />
331 391 <property name="full.screen.before.presentation.mode" value="false" />
332 392 <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/static/ajax/libs/bootstrap-table/extensions/editable" />
333 393 <property name="node.js.detected.package.eslint" value="true" />
... ... @@ -344,16 +404,17 @@
344 404 <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
345 405 </component>
346 406 <component name="RecentsManager">
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" />
  407 + <key name="MoveFile.RECENT_KEYS">
  408 + <recent name="E:\code\wms2\src\main\resources\templates\config\configWarning" />
351 409 </key>
352 410 <key name="CopyClassDialog.RECENTS_KEY">
353 411 <recent name="com.huaheng.api.general.domain" />
354 412 </key>
355   - <key name="MoveFile.RECENT_KEYS">
356   - <recent name="E:\code\wms2\src\main\resources\templates\config\configWarning" />
  413 + <key name="CopyFile.RECENT_KEYS">
  414 + <recent name="D:\wms2\src\main\resources\templates\config\material" />
  415 + <recent name="D:\wms2\src\main\resources\templates\config\location" />
  416 + <recent name="D:\wms2\src\main\resources\templates\config\container" />
  417 + <recent name="E:\code\wms2\src\main\resources\static\ajax\libs\bootstrap-table\extensions\editable" />
357 418 </key>
358 419 </component>
359 420 <component name="RunAnythingCache">
... ... @@ -682,14 +743,8 @@
682 743 <workItem from="1578276289137" duration="660000" />
683 744 <workItem from="1578293993555" duration="9808000" />
684 745 <workItem from="1578358115196" duration="1507000" />
685   - <workItem from="1578379653786" duration="4948000" />
686   - </task>
687   - <task id="LOCAL-00024" summary="修改入库首选项修改添加模块为select">
688   - <created>1569411473661</created>
689   - <option name="number" value="00024" />
690   - <option name="presentableId" value="LOCAL-00024" />
691   - <option name="project" value="LOCAL" />
692   - <updated>1569411473661</updated>
  746 + <workItem from="1578379653786" duration="11257000" />
  747 + <workItem from="1578444006015" duration="6940000" />
693 748 </task>
694 749 <task id="LOCAL-00025" summary="修改任务取消入库组盘状态不回滚,修改任务完成入库单状态不完成">
695 750 <created>1569477488017</created>
... ... @@ -1027,17 +1082,24 @@
1027 1082 <option name="project" value="LOCAL" />
1028 1083 <updated>1577706582680</updated>
1029 1084 </task>
1030   - <option name="localTasksCounter" value="73" />
  1085 + <task id="LOCAL-00073" summary="库位条码打印">
  1086 + <created>1578385852154</created>
  1087 + <option name="number" value="00073" />
  1088 + <option name="presentableId" value="LOCAL-00073" />
  1089 + <option name="project" value="LOCAL" />
  1090 + <updated>1578385852155</updated>
  1091 + </task>
  1092 + <option name="localTasksCounter" value="74" />
1031 1093 <servers />
1032 1094 </component>
1033 1095 <component name="TimeTrackingManager">
1034   - <option name="totallyTimeSpent" value="145066000" />
  1096 + <option name="totallyTimeSpent" value="158315000" />
1035 1097 </component>
1036 1098 <component name="ToolWindowManager">
1037 1099 <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
1038 1100 <editor active="true" />
1039 1101 <layout>
1040   - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4978903" visible="true" weight="0.230563" />
  1102 + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4978903" visible="true" weight="0.23391421" />
1041 1103 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
1042 1104 <window_info id="Designer" order="2" />
1043 1105 <window_info id="Image Layers" order="3" />
... ... @@ -1058,8 +1120,8 @@
1058 1120 <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.09048257" side_tool="true" weight="0.44192636" />
1059 1121 <window_info anchor="bottom" id="Java Enterprise" order="11" />
1060 1122 <window_info anchor="bottom" id="Database Changes" order="12" />
1061   - <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.91152817" weight="0.3286119" />
1062   - <window_info active="true" anchor="bottom" id="Run Dashboard" order="14" sideWeight="0.9095174" visible="true" weight="0.30878186" />
  1123 + <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.91152817" weight="0.3281471" />
  1124 + <window_info active="true" anchor="bottom" id="Run Dashboard" order="14" sideWeight="0.9095174" visible="true" weight="0.43342775" />
1063 1125 <window_info anchor="bottom" id="Messages" order="15" sideWeight="0.49932975" weight="0.3286119" />
1064 1126 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
1065 1127 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
... ... @@ -1110,7 +1172,6 @@
1110 1172 </option>
1111 1173 </component>
1112 1174 <component name="VcsManagerConfiguration">
1113   - <MESSAGE value="添加站台表,入库组盘头表和任务表添加站台,默认为0" />
1114 1175 <MESSAGE value="修改任务执行接口" />
1115 1176 <MESSAGE value="修改接口实体类" />
1116 1177 <MESSAGE value="修改接口实体类&#10;修改仓位分配接口" />
... ... @@ -1135,7 +1196,8 @@
1135 1196 <MESSAGE value="修改时间搜索无效,添加入库单没有明细不可以提交审核" />
1136 1197 <MESSAGE value="修复接口bug,新增库存同步物料同步用户同步接口" />
1137 1198 <MESSAGE value="托盘条码打印" />
1138   - <option name="LAST_COMMIT_MESSAGE" value="托盘条码打印" />
  1199 + <MESSAGE value="库位条码打印" />
  1200 + <option name="LAST_COMMIT_MESSAGE" value="库位条码打印" />
1139 1201 </component>
1140 1202 <component name="XDebuggerManager">
1141 1203 <breakpoint-manager>
... ... @@ -1147,12 +1209,6 @@
1147 1209 <option name="timeStamp" value="24" />
1148 1210 </line-breakpoint>
1149 1211 <line-breakpoint enabled="true" type="java-line">
1150   - <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java</url>
1151   - <line>165</line>
1152   - <properties />
1153   - <option name="timeStamp" value="26" />
1154   - </line-breakpoint>
1155   - <line-breakpoint enabled="true" type="java-line">
1156 1212 <url>file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/check/checkingRegister/controller/CheckingRegisterController.java</url>
1157 1213 <line>179</line>
1158 1214 <properties />
... ... @@ -1244,55 +1300,6 @@
1244 1300 </SUITE>
1245 1301 </component>
1246 1302 <component name="editorHistoryManager">
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">
1248   - <provider selected="true" editor-type-id="text-editor">
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" />
1251   - </state>
1252   - </provider>
1253   - </entry>
1254   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/service/ContainerService.java">
1255   - <provider selected="true" editor-type-id="text-editor">
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" />
1258   - </state>
1259   - </provider>
1260   - </entry>
1261   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/service/InventoryTransactionService.java">
1262   - <provider selected="true" editor-type-id="text-editor">
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" />
1265   - </state>
1266   - </provider>
1267   - </entry>
1268   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html">
1269   - <provider selected="true" editor-type-id="text-editor">
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" />
1272   - </state>
1273   - </provider>
1274   - </entry>
1275   - <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es5.d.ts">
1276   - <provider selected="true" editor-type-id="text-editor">
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" />
1279   - </state>
1280   - </provider>
1281   - </entry>
1282   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/plugins/metisMenu/jquery.metisMenu.js">
1283   - <provider selected="true" editor-type-id="text-editor">
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" />
1286   - </state>
1287   - </provider>
1288   - </entry>
1289   - <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.dom.d.ts">
1290   - <provider selected="true" editor-type-id="text-editor">
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" />
1293   - </state>
1294   - </provider>
1295   - </entry>
1296 1303 <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/qrcode/qrcode.min.js">
1297 1304 <provider selected="true" editor-type-id="text-editor">
1298 1305 <state>
... ... @@ -1300,13 +1307,6 @@
1300 1307 </state>
1301 1308 </provider>
1302 1309 </entry>
1303   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java">
1304   - <provider selected="true" editor-type-id="text-editor">
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" />
1307   - </state>
1308   - </provider>
1309   - </entry>
1310 1310 <entry file="file://$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html">
1311 1311 <provider selected="true" editor-type-id="text-editor">
1312 1312 <state relative-caret-position="152">
... ... @@ -1319,31 +1319,11 @@
1319 1319 <state relative-caret-position="-962" />
1320 1320 </provider>
1321 1321 </entry>
1322   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/echarts/echarts.js">
1323   - <provider selected="true" editor-type-id="text-editor">
1324   - <state relative-caret-position="19">
1325   - <caret line="30207" selection-start-line="30207" selection-end-line="30207" />
1326   - </state>
1327   - </provider>
1328   - </entry>
1329 1322 <entry file="file://$USER_HOME$/Desktop/长沙华恒企网2.0_new/答题HTML/答题HTML/answer.html">
1330 1323 <provider selected="true" editor-type-id="text-editor">
1331 1324 <state relative-caret-position="-171" />
1332 1325 </provider>
1333 1326 </entry>
1334   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/report.html">
1335   - <provider selected="true" editor-type-id="text-editor">
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>
1344   - </state>
1345   - </provider>
1346   - </entry>
1347 1327 <entry file="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.1.18/druid-1.1.18.jar!/support/http/resources/css/bootstrap.min.css">
1348 1328 <provider selected="true" editor-type-id="text-editor">
1349 1329 <state relative-caret-position="152">
... ... @@ -1382,13 +1362,6 @@
1382 1362 </state>
1383 1363 </provider>
1384 1364 </entry>
1385   - <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/jquery.jqprint-0.3.js">
1386   - <provider selected="true" editor-type-id="text-editor">
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" />
1389   - </state>
1390   - </provider>
1391   - </entry>
1392 1365 <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/container/print.html">
1393 1366 <provider selected="true" editor-type-id="text-editor">
1394 1367 <state relative-caret-position="551">
... ... @@ -1594,10 +1567,10 @@
1594 1567 </state>
1595 1568 </provider>
1596 1569 </entry>
1597   - <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/browser.d.ts">
  1570 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java">
1598 1571 <provider selected="true" editor-type-id="text-editor">
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" />
  1572 + <state relative-caret-position="2812">
  1573 + <caret line="181" selection-start-line="181" selection-end-line="195" selection-end-column="5" />
1601 1574 </state>
1602 1575 </provider>
1603 1576 </entry>
... ... @@ -1608,31 +1581,118 @@
1608 1581 </state>
1609 1582 </provider>
1610 1583 </entry>
1611   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/container/controller/ContainerController.java">
  1584 + <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es5.d.ts">
1612 1585 <provider selected="true" editor-type-id="text-editor">
1613   - <state relative-caret-position="108">
1614   - <caret line="181" selection-start-line="181" selection-end-line="195" selection-end-column="5" />
  1586 + <state relative-caret-position="166">
  1587 + <caret line="1215" column="4" selection-start-line="1215" selection-start-column="4" selection-end-line="1215" selection-end-column="4" />
  1588 + </state>
  1589 + </provider>
  1590 + </entry>
  1591 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/echarts/echarts.js">
  1592 + <provider selected="true" editor-type-id="text-editor">
  1593 + <state relative-caret-position="190">
  1594 + <caret line="11245" column="4" selection-start-line="11245" selection-start-column="4" selection-end-line="11245" selection-end-column="4" />
  1595 + </state>
  1596 + </provider>
  1597 + </entry>
  1598 + <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">
  1599 + <provider selected="true" editor-type-id="text-editor">
  1600 + <state relative-caret-position="-3819">
  1601 + <caret line="207" column="42" selection-start-line="207" selection-start-column="27" selection-end-line="207" selection-end-column="42" />
  1602 + </state>
  1603 + </provider>
  1604 + </entry>
  1605 + <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/jquery.jqprint-0.3.js">
  1606 + <provider selected="true" editor-type-id="text-editor">
  1607 + <state relative-caret-position="126">
  1608 + <caret line="60" column="104" selection-start-line="60" selection-start-column="104" selection-end-line="60" selection-end-column="104" />
  1609 + </state>
  1610 + </provider>
  1611 + </entry>
  1612 + <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/browser.d.ts">
  1613 + <provider selected="true" editor-type-id="text-editor">
  1614 + <state relative-caret-position="240">
  1615 + <caret line="46" column="7" selection-start-line="46" selection-start-column="7" selection-end-line="46" selection-end-column="7" />
  1616 + </state>
  1617 + </provider>
  1618 + </entry>
  1619 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/report.html">
  1620 + <provider selected="true" editor-type-id="text-editor">
  1621 + <state relative-caret-position="665">
  1622 + <caret line="47" column="29" lean-forward="true" selection-start-line="47" selection-start-column="29" selection-end-line="47" selection-end-column="29" />
  1623 + <folding>
  1624 + <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1625 + <element signature="n#style#0;n#span#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  1626 + <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
  1627 + <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" />
  1628 + </folding>
  1629 + </state>
  1630 + </provider>
  1631 + </entry>
  1632 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/location/print.html">
  1633 + <provider selected="true" editor-type-id="text-editor">
  1634 + <state relative-caret-position="146">
  1635 + <caret line="113" lean-forward="true" selection-start-line="113" selection-end-line="113" />
1615 1636 </state>
1616 1637 </provider>
1617 1638 </entry>
1618 1639 <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/location/location.html">
1619 1640 <provider selected="true" editor-type-id="text-editor">
1620 1641 <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" />
  1642 + <caret line="75" column="45" selection-start-line="75" selection-start-column="45" selection-end-line="75" selection-end-column="45" />
1622 1643 </state>
1623 1644 </provider>
1624 1645 </entry>
1625   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/location/print.html">
  1646 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryTransaction/inventoryTransaction.html">
  1647 + <provider selected="true" editor-type-id="text-editor">
  1648 + <state relative-caret-position="179">
  1649 + <caret line="310" selection-start-line="310" selection-end-line="322" selection-end-column="10" />
  1650 + </state>
  1651 + </provider>
  1652 + </entry>
  1653 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryTransaction/controller/InventoryTransactionController.java">
1626 1654 <provider selected="true" editor-type-id="text-editor">
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" />
  1655 + <state relative-caret-position="241">
  1656 + <caret line="105" column="28" lean-forward="true" selection-start-line="105" selection-start-column="28" selection-end-line="105" selection-end-column="28" />
  1657 + </state>
  1658 + </provider>
  1659 + </entry>
  1660 + <entry file="file://$USER_HOME$/Desktop/demo.html">
  1661 + <provider selected="true" editor-type-id="text-editor">
  1662 + <state relative-caret-position="19">
  1663 + <caret line="1" column="6" lean-forward="true" selection-start-line="1" selection-start-column="6" selection-end-line="1" selection-end-column="6" />
1629 1664 </state>
1630 1665 </provider>
1631 1666 </entry>
1632 1667 <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java">
1633 1668 <provider selected="true" editor-type-id="text-editor">
1634   - <state relative-caret-position="431">
1635   - <caret line="316" lean-forward="true" selection-start-line="316" selection-end-line="316" />
  1669 + <state relative-caret-position="208">
  1670 + <caret line="317" column="50" lean-forward="true" selection-start-line="317" selection-start-column="50" selection-end-line="317" selection-end-column="50" />
  1671 + </state>
  1672 + </provider>
  1673 + </entry>
  1674 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/material/material.html">
  1675 + <provider selected="true" editor-type-id="text-editor">
  1676 + <state relative-caret-position="-3041">
  1677 + <caret line="67" column="12" selection-start-line="67" selection-start-column="12" selection-end-line="67" selection-end-column="12" />
  1678 + </state>
  1679 + </provider>
  1680 + </entry>
  1681 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java">
  1682 + <provider selected="true" editor-type-id="text-editor">
  1683 + <state relative-caret-position="113">
  1684 + <caret line="193" column="28" lean-forward="true" selection-start-line="193" selection-start-column="28" selection-end-line="193" selection-end-column="28" />
  1685 + </state>
  1686 + </provider>
  1687 + </entry>
  1688 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/material/print.html">
  1689 + <provider selected="true" editor-type-id="text-editor">
  1690 + <state relative-caret-position="228">
  1691 + <caret line="42" column="70" lean-forward="true" selection-start-line="42" selection-start-column="70" selection-end-line="42" selection-end-column="70" />
  1692 + <folding>
  1693 + <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" />
  1694 + <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" />
  1695 + </folding>
1636 1696 </state>
1637 1697 </provider>
1638 1698 </entry>
... ...
src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java
... ... @@ -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/material/material.html
... ... @@ -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
  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 +
... ...