wms / wms_wuhangelinmei · Commits

Commit 6e4eb5c99fd026fa03993c1da6e470919f345fe4

Authored by pengcheng
1 parent 9f6696cd

d多种格式导出修改

Inline Side-by-side
Showing 2 changed files with 283 additions and 284 deletions
.idea/workspace.xml
  View file @6e4eb5c
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4   - <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
5   - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/common/jasper/DocType.java" afterDir="false" />
6   - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/common/jasper/DocTypeUtil.java" afterDir="false" />
7   - <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/common/jasper/JasperreportUtils.java" afterDir="false" />
  4 + <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="d多种格式导出">
8 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
9   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/framework/jasper/JasperConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/jasper/JasperController.java" afterDir="false" />
10   - <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/report/jasper/controller/JasperController.java" beforeDir="false" />
  6 + <change beforePath="$PROJECT_DIR$/mypage" beforeDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/jasper/JasperController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/jasper/JasperController.java" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentType/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentType/edit.html" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentContainerHeader/shipmentContainerHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentContainerHeader/shipmentContainerHeader.html" afterDir="false" />
11 10 </list>
12 11 <ignored path="$PROJECT_DIR$/target/" />
13 12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -32,26 +31,56 @@
32 31 </component>
33 32 <component name="FileEditorManager">
34 33 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  34 + <file pinned="false" current-in-tab="false">
  35 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java">
  36 + <provider selected="true" editor-type-id="text-editor">
  37 + <state relative-caret-position="300">
  38 + <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
  39 + </state>
  40 + </provider>
  41 + </entry>
  42 + </file>
  43 + <file pinned="false" current-in-tab="false">
  44 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentContainerHeader/shipmentContainerHeader.html">
  45 + <provider selected="true" editor-type-id="text-editor">
  46 + <state relative-caret-position="100">
  47 + <caret line="16" column="72" selection-start-line="16" selection-start-column="72" selection-end-line="16" selection-end-column="72" />
  48 + </state>
  49 + </provider>
  50 + </entry>
  51 + </file>
35 52 <file pinned="false" current-in-tab="true">
36   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/jasper/JasperController.java">
  53 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/shipmentType/edit.html">
37 54 <provider selected="true" editor-type-id="text-editor">
38   - <state relative-caret-position="116">
39   - <caret line="92" column="27" selection-start-line="92" selection-start-column="27" selection-end-line="92" selection-end-column="27" />
40   - <folding>
41   - <element signature="imports" expanded="true" />
42   - </folding>
  55 + <state relative-caret-position="118">
  56 + <caret line="63" column="37" lean-forward="true" selection-start-line="63" selection-start-column="37" selection-end-line="63" selection-end-column="37" />
43 57 </state>
44 58 </provider>
45 59 </entry>
46 60 </file>
47 61 <file pinned="false" current-in-tab="false">
48   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/jasper/JasperreportUtils.java">
  62 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/shipmentType/add.html">
49 63 <provider selected="true" editor-type-id="text-editor">
50   - <state relative-caret-position="150">
51   - <caret line="297" column="69" selection-start-line="297" selection-start-column="66" selection-end-line="297" selection-end-column="69" />
52   - <folding>
53   - <element signature="imports" expanded="true" />
54   - </folding>
  64 + <state relative-caret-position="1200">
  65 + <caret line="48" column="144" selection-start-line="48" selection-start-column="130" selection-end-line="48" selection-end-column="144" />
  66 + </state>
  67 + </provider>
  68 + </entry>
  69 + </file>
  70 + <file pinned="false" current-in-tab="false">
  71 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/service/StatusFlowHeaderService.java">
  72 + <provider selected="true" editor-type-id="text-editor">
  73 + <state relative-caret-position="325">
  74 + <caret line="25" column="63" selection-start-line="25" selection-start-column="53" selection-end-line="25" selection-end-column="63" />
  75 + </state>
  76 + </provider>
  77 + </entry>
  78 + </file>
  79 + <file pinned="false" current-in-tab="false">
  80 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/controller/shipmentTypeController.java">
  81 + <provider selected="true" editor-type-id="text-editor">
  82 + <state relative-caret-position="2175">
  83 + <caret line="118" column="19" selection-start-line="118" selection-start-column="19" selection-end-line="118" selection-end-column="19" />
55 84 </state>
56 85 </provider>
57 86 </entry>
... ... @@ -103,9 +132,6 @@
103 132 <component name="IdeDocumentHistory">
104 133 <option name="CHANGED_PATHS">
105 134 <list>
106   - <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/materialType/controller/MaterialTypeController.java" />
107   - <option value="$PROJECT_DIR$/src/main/resources/templates/config/material/add.html" />
108   - <option value="$PROJECT_DIR$/src/main/resources/templates/config/materialType/edit.html" />
109 135 <option value="$PROJECT_DIR$/src/main/resources/templates/config/materialType/add.html" />
110 136 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/FilterConfigDetail/service/FilterConfigDetailService.java" />
111 137 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/service/StatusFlowHeaderService.java" />
... ... @@ -154,6 +180,9 @@
154 180 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/common/jasper/JasperUtils.java" />
155 181 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/common/jasper/JasperreportUtils.java" />
156 182 <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/jasper/JasperController.java" />
  183 + <option value="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentContainerHeader/shipmentContainerHeader.html" />
  184 + <option value="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/controller/shipmentTypeController.java" />
  185 + <option value="$PROJECT_DIR$/src/main/resources/templates/config/shipmentType/edit.html" />
157 186 </list>
158 187 </option>
159 188 </component>
... ... @@ -181,10 +210,10 @@
181 210 </treeState>
182 211 </component>
183 212 <component name="ProjectFrameBounds" extendedState="6">
184   - <option name="x" value="-1816" />
185   - <option name="y" value="258" />
186   - <option name="width" value="1552" />
187   - <option name="height" value="832" />
  213 + <option name="x" value="-10" />
  214 + <option name="y" value="-10" />
  215 + <option name="width" value="1940" />
  216 + <option name="height" value="1050" />
188 217 </component>
189 218 <component name="ProjectId" id="1QOzUtfkdeRmYuw3MIDHXXMLsFH" />
190 219 <component name="ProjectLevelVcsManager">
... ... @@ -197,7 +226,6 @@
197 226 </navigator>
198 227 <panes>
199 228 <pane id="Scope" />
200   - <pane id="PackagesPane" />
201 229 <pane id="ProjectPane">
202 230 <subPane>
203 231 <expand>
... ... @@ -258,8 +286,43 @@
258 286 <item name="java" type="462c0819:PsiDirectoryNode" />
259 287 <item name="com" type="462c0819:PsiDirectoryNode" />
260 288 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
261   - <item name="common" type="462c0819:PsiDirectoryNode" />
262   - <item name="jasper" type="462c0819:PsiDirectoryNode" />
  289 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  290 + </path>
  291 + <path>
  292 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  293 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  294 + <item name="src" type="462c0819:PsiDirectoryNode" />
  295 + <item name="main" type="462c0819:PsiDirectoryNode" />
  296 + <item name="java" type="462c0819:PsiDirectoryNode" />
  297 + <item name="com" type="462c0819:PsiDirectoryNode" />
  298 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  299 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  300 + <item name="config" type="462c0819:PsiDirectoryNode" />
  301 + </path>
  302 + <path>
  303 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  304 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  305 + <item name="src" type="462c0819:PsiDirectoryNode" />
  306 + <item name="main" type="462c0819:PsiDirectoryNode" />
  307 + <item name="java" type="462c0819:PsiDirectoryNode" />
  308 + <item name="com" type="462c0819:PsiDirectoryNode" />
  309 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  310 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  311 + <item name="config" type="462c0819:PsiDirectoryNode" />
  312 + <item name="shipmentType" type="462c0819:PsiDirectoryNode" />
  313 + </path>
  314 + <path>
  315 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  316 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  317 + <item name="src" type="462c0819:PsiDirectoryNode" />
  318 + <item name="main" type="462c0819:PsiDirectoryNode" />
  319 + <item name="java" type="462c0819:PsiDirectoryNode" />
  320 + <item name="com" type="462c0819:PsiDirectoryNode" />
  321 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  322 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  323 + <item name="config" type="462c0819:PsiDirectoryNode" />
  324 + <item name="shipmentType" type="462c0819:PsiDirectoryNode" />
  325 + <item name="controller" type="462c0819:PsiDirectoryNode" />
263 326 </path>
264 327 <path>
265 328 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -270,6 +333,39 @@
270 333 <item name="com" type="462c0819:PsiDirectoryNode" />
271 334 <item name="huaheng" type="462c0819:PsiDirectoryNode" />
272 335 <item name="pc" type="462c0819:PsiDirectoryNode" />
  336 + <item name="shipment" type="462c0819:PsiDirectoryNode" />
  337 + </path>
  338 + <path>
  339 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  340 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  341 + <item name="src" type="462c0819:PsiDirectoryNode" />
  342 + <item name="main" type="462c0819:PsiDirectoryNode" />
  343 + <item name="java" type="462c0819:PsiDirectoryNode" />
  344 + <item name="com" type="462c0819:PsiDirectoryNode" />
  345 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  346 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  347 + <item name="shipment" type="462c0819:PsiDirectoryNode" />
  348 + <item name="shipmentContainerHeader" type="462c0819:PsiDirectoryNode" />
  349 + </path>
  350 + <path>
  351 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  352 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  353 + <item name="src" type="462c0819:PsiDirectoryNode" />
  354 + <item name="main" type="462c0819:PsiDirectoryNode" />
  355 + <item name="java" type="462c0819:PsiDirectoryNode" />
  356 + <item name="com" type="462c0819:PsiDirectoryNode" />
  357 + <item name="huaheng" type="462c0819:PsiDirectoryNode" />
  358 + <item name="pc" type="462c0819:PsiDirectoryNode" />
  359 + <item name="shipment" type="462c0819:PsiDirectoryNode" />
  360 + <item name="shipmentContainerHeader" type="462c0819:PsiDirectoryNode" />
  361 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  362 + </path>
  363 + <path>
  364 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  365 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  366 + <item name="src" type="462c0819:PsiDirectoryNode" />
  367 + <item name="main" type="462c0819:PsiDirectoryNode" />
  368 + <item name="resources" type="462c0819:PsiDirectoryNode" />
273 369 </path>
274 370 <path>
275 371 <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -277,11 +373,51 @@
277 373 <item name="src" type="462c0819:PsiDirectoryNode" />
278 374 <item name="main" type="462c0819:PsiDirectoryNode" />
279 375 <item name="resources" type="462c0819:PsiDirectoryNode" />
  376 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  377 + </path>
  378 + <path>
  379 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  380 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  381 + <item name="src" type="462c0819:PsiDirectoryNode" />
  382 + <item name="main" type="462c0819:PsiDirectoryNode" />
  383 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  384 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  385 + <item name="config" type="462c0819:PsiDirectoryNode" />
  386 + </path>
  387 + <path>
  388 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  389 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  390 + <item name="src" type="462c0819:PsiDirectoryNode" />
  391 + <item name="main" type="462c0819:PsiDirectoryNode" />
  392 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  393 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  394 + <item name="config" type="462c0819:PsiDirectoryNode" />
  395 + <item name="shipmentType" type="462c0819:PsiDirectoryNode" />
  396 + </path>
  397 + <path>
  398 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  399 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  400 + <item name="src" type="462c0819:PsiDirectoryNode" />
  401 + <item name="main" type="462c0819:PsiDirectoryNode" />
  402 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  403 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  404 + <item name="shipment" type="462c0819:PsiDirectoryNode" />
  405 + </path>
  406 + <path>
  407 + <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
  408 + <item name="wms2" type="462c0819:PsiDirectoryNode" />
  409 + <item name="src" type="462c0819:PsiDirectoryNode" />
  410 + <item name="main" type="462c0819:PsiDirectoryNode" />
  411 + <item name="resources" type="462c0819:PsiDirectoryNode" />
  412 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  413 + <item name="shipment" type="462c0819:PsiDirectoryNode" />
  414 + <item name="shipmentContainerHeader" type="462c0819:PsiDirectoryNode" />
280 415 </path>
281 416 </expand>
282 417 <select />
283 418 </subPane>
284 419 </pane>
  420 + <pane id="PackagesPane" />
285 421 </panes>
286 422 </component>
287 423 <component name="PropertiesComponent">
... ... @@ -293,7 +429,7 @@
293 429 <property name="RequestMappingsPanelWidth1" value="75" />
294 430 <property name="WebServerToolWindowFactoryState" value="false" />
295 431 <property name="aspect.path.notification.shown" value="true" />
296   - <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1574307557097" />
  432 + <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1574413107783" />
297 433 <property name="full.screen.before.presentation.mode" value="false" />
298 434 <property name="last_opened_file_path" value="$MAVEN_REPOSITORY$/com/font/fonts/1.0.0/fonts-1.0.0.jar!/" />
299 435 <property name="node.js.detected.package.eslint" value="true" />
... ... @@ -626,14 +762,10 @@
626 762 <workItem from="1574037819650" duration="15257000" />
627 763 <workItem from="1574123142144" duration="23459000" />
628 764 <workItem from="1574209886131" duration="15642000" />
629   - <workItem from="1574296268709" duration="11029000" />
630   - </task>
631   - <task id="LOCAL-00014" summary="修改入库明细添加加载定位规则的错误">
632   - <created>1568788287608</created>
633   - <option name="number" value="00014" />
634   - <option name="presentableId" value="LOCAL-00014" />
635   - <option name="project" value="LOCAL" />
636   - <updated>1568788287608</updated>
  765 + <workItem from="1574296268709" duration="15155000" />
  766 + <workItem from="1574382813105" duration="7331000" />
  767 + <workItem from="1574416919078" duration="1230000" />
  768 + <workItem from="1574642048568" duration="282000" />
637 769 </task>
638 770 <task id="LOCAL-00015" summary="添加入库质检行内编辑">
639 771 <created>1568857387442</created>
... ... @@ -971,7 +1103,14 @@
971 1103 <option name="project" value="LOCAL" />
972 1104 <updated>1574210318481</updated>
973 1105 </task>
974   - <option name="localTasksCounter" value="63" />
  1106 + <task id="LOCAL-00063" summary="d多种格式导出">
  1107 + <created>1574307636322</created>
  1108 + <option name="number" value="00063" />
  1109 + <option name="presentableId" value="LOCAL-00063" />
  1110 + <option name="project" value="LOCAL" />
  1111 + <updated>1574307636322</updated>
  1112 + </task>
  1113 + <option name="localTasksCounter" value="64" />
975 1114 <servers />
976 1115 </component>
977 1116 <component name="TestHistory">
... ... @@ -1007,7 +1146,7 @@
1007 1146 </history-entry>
1008 1147 </component>
1009 1148 <component name="TimeTrackingManager">
1010   - <option name="totallyTimeSpent" value="312014000" />
  1149 + <option name="totallyTimeSpent" value="324983000" />
1011 1150 </component>
1012 1151 <component name="TodoView">
1013 1152 <todo-panel id="selected-file">
... ... @@ -1019,10 +1158,10 @@
1019 1158 </todo-panel>
1020 1159 </component>
1021 1160 <component name="ToolWindowManager">
1022   - <frame x="-1928" y="-8" width="1936" height="1056" extended-state="6" />
  1161 + <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
1023 1162 <editor active="true" />
1024 1163 <layout>
1025   - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17004265" />
  1164 + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22117962" />
1026 1165 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
1027 1166 <window_info id="Designer" order="2" />
1028 1167 <window_info id="Image Layers" order="3" />
... ... @@ -1040,12 +1179,12 @@
1040 1179 <window_info anchor="bottom" id="Spring" order="7" sideWeight="0.49865952" weight="0.3286119" />
1041 1180 <window_info anchor="bottom" id="Terminal" order="8" weight="0.3286119" />
1042 1181 <window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
1043   - <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.08955224" side_tool="true" visible="true" weight="0.4913232" />
  1182 + <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.09115282" side_tool="true" weight="0.6489971" />
1044 1183 <window_info anchor="bottom" id="Messages" order="11" sideWeight="0.4978678" weight="0.3275488" />
1045 1184 <window_info anchor="bottom" id="Java Enterprise" order="12" sideWeight="0.49932975" weight="0.3286119" />
1046 1185 <window_info anchor="bottom" id="Database Changes" order="13" weight="0.32719547" />
1047   - <window_info anchor="bottom" id="Version Control" order="14" sideWeight="0.49865952" weight="0.04249292" />
1048   - <window_info active="true" anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.9104478" visible="true" weight="0.4913232" />
  1186 + <window_info anchor="bottom" id="Version Control" order="14" sideWeight="0.4978678" weight="0.04229935" />
  1187 + <window_info active="true" anchor="bottom" id="Run Dashboard" order="15" sideWeight="0.9088472" visible="true" weight="0.4631728" />
1049 1188 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
1050 1189 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
1051 1190 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
... ... @@ -1125,7 +1264,6 @@
1125 1264 </option>
1126 1265 </component>
1127 1266 <component name="VcsManagerConfiguration">
1128   - <MESSAGE value="添加根据code查询物料" />
1129 1267 <MESSAGE value="添加根据容器编码查找容器的方法&#10;配置规则添加自动添加模块类型&#10;添加是否自动生成临时容器" />
1130 1268 <MESSAGE value="wcs接口修改" />
1131 1269 <MESSAGE value="页面格式和排版更改" />
... ... @@ -1150,7 +1288,8 @@
1150 1288 <MESSAGE value="jasperreport集成spring boot,jasper文件，中文不显示" />
1151 1289 <MESSAGE value="方法移除" />
1152 1290 <MESSAGE value="pdf预览完成" />
1153   - <option name="LAST_COMMIT_MESSAGE" value="pdf预览完成" />
  1291 + <MESSAGE value="d多种格式导出" />
  1292 + <option name="LAST_COMMIT_MESSAGE" value="d多种格式导出" />
1154 1293 </component>
1155 1294 <component name="XDebuggerManager">
1156 1295 <breakpoint-manager>
... ... @@ -1227,96 +1366,6 @@
1227 1366 </SUITE>
1228 1367 </component>
1229 1368 <component name="editorHistoryManager">
1230   - <entry file="file://$PROJECT_DIR$/src/main/resources/templates/jasperreports_extension.properties" />
1231   - <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
1232   - <provider selected="true" editor-type-id="text-editor">
1233   - <state relative-caret-position="275">
1234   - <caret line="11" column="10" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="10" />
1235   - </state>
1236   - </provider>
1237   - </entry>
1238   - <entry file="file://$PROJECT_DIR$/src/main/resources/application-druid.properties">
1239   - <provider selected="true" editor-type-id="text-editor">
1240   - <state relative-caret-position="-497">
1241   - <caret line="2" column="58" selection-start-line="2" selection-start-column="58" selection-end-line="2" selection-end-column="58" />
1242   - </state>
1243   - </provider>
1244   - </entry>
1245   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/mapper/InventoryDetailMapper.java">
1246   - <provider selected="true" editor-type-id="text-editor">
1247   - <state relative-caret-position="193">
1248   - <caret line="15" column="21" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
1249   - </state>
1250   - </provider>
1251   - </entry>
1252   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java">
1253   - <provider selected="true" editor-type-id="text-editor">
1254   - <state relative-caret-position="156">
1255   - <caret line="247" column="39" selection-start-line="247" selection-start-column="39" selection-end-line="247" selection-end-column="39" />
1256   - <folding>
1257   - <element signature="e#11006#11007#0" expanded="true" />
1258   - <element signature="e#11033#11034#0" expanded="true" />
1259   - </folding>
1260   - </state>
1261   - </provider>
1262   - </entry>
1263   - <entry file="jar://C:/Program Files (x86)/jdk1.9/jre/lib/rt.jar!/sun/reflect/NativeMethodAccessorImpl.class">
1264   - <provider selected="true" editor-type-id="text-editor">
1265   - <state relative-caret-position="203">
1266   - <caret line="33" column="33" selection-start-line="33" selection-start-column="33" selection-end-line="33" selection-end-column="33" />
1267   - </state>
1268   - </provider>
1269   - </entry>
1270   - <entry file="file://$PROJECT_DIR$/src/main/resources/mybatis/inventory/InventoryDetailMapper.xml">
1271   - <provider selected="true" editor-type-id="text-editor">
1272   - <state relative-caret-position="1700">
1273   - <caret line="68" column="13" selection-start-line="68" selection-start-column="13" selection-end-line="68" selection-end-column="13" />
1274   - </state>
1275   - </provider>
1276   - </entry>
1277   - <entry file="file://$PROJECT_DIR$/src/main/resources/jaspers/mypage.jasper">
1278   - <provider selected="true" editor-type-id="text-editor">
1279   - <state relative-caret-position="175">
1280   - <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
1281   - </state>
1282   - </provider>
1283   - </entry>
1284   - <entry file="file://$PROJECT_DIR$/src/main/resources/jaspers/mypage.jrxml">
1285   - <provider selected="true" editor-type-id="text-editor">
1286   - <state relative-caret-position="1000">
1287   - <caret line="40" column="17" selection-start-line="40" selection-start-column="17" selection-end-line="40" selection-end-column="17" />
1288   - </state>
1289   - </provider>
1290   - </entry>
1291   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java">
1292   - <provider selected="true" editor-type-id="text-editor">
1293   - <state relative-caret-position="400">
1294   - <caret line="24" selection-start-line="24" selection-end-line="24" />
1295   - </state>
1296   - </provider>
1297   - </entry>
1298   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/framework/jasper/JasperReportsPdfView.java" />
1299   - <entry file="jar://$MAVEN_REPOSITORY$/net/sf/jasperreports/jasperreports/6.10.0/jasperreports-6.10.0.jar!/net/sf/jasperreports/engine/util/JRLoader.class">
1300   - <provider selected="true" editor-type-id="text-editor">
1301   - <state relative-caret-position="152">
1302   - <caret line="136" column="25" selection-start-line="136" selection-start-column="25" selection-end-line="136" selection-end-column="25" />
1303   - </state>
1304   - </provider>
1305   - </entry>
1306   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/sendMail/domain/SendMail.java">
1307   - <provider selected="true" editor-type-id="text-editor">
1308   - <state relative-caret-position="-1735">
1309   - <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
1310   - </state>
1311   - </provider>
1312   - </entry>
1313   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/sendMail/mapper/SendMailMapper.java">
1314   - <provider selected="true" editor-type-id="text-editor">
1315   - <state relative-caret-position="100">
1316   - <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
1317   - </state>
1318   - </provider>
1319   - </entry>
1320 1369 <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
1321 1370 <provider selected="true" editor-type-id="text-editor">
1322 1371 <state relative-caret-position="1023">
... ... @@ -1559,26 +1608,118 @@
1559 1608 </state>
1560 1609 </provider>
1561 1610 </entry>
1562   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/jasper/JasperreportUtils.java">
  1611 + <entry file="file://$PROJECT_DIR$/mypage" />
  1612 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/jasper/JasperController.java">
1563 1613 <provider selected="true" editor-type-id="text-editor">
1564   - <state relative-caret-position="150">
1565   - <caret line="297" column="69" selection-start-line="297" selection-start-column="66" selection-end-line="297" selection-end-column="69" />
  1614 + <state relative-caret-position="75">
  1615 + <caret line="71" column="24" lean-forward="true" selection-start-line="71" selection-start-column="24" selection-end-line="71" selection-end-column="24" />
1566 1616 <folding>
1567 1617 <element signature="imports" expanded="true" />
1568 1618 </folding>
1569 1619 </state>
1570 1620 </provider>
1571 1621 </entry>
1572   - <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/jasper/JasperController.java">
  1622 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/common/jasper/JasperreportUtils.java">
1573 1623 <provider selected="true" editor-type-id="text-editor">
1574   - <state relative-caret-position="116">
1575   - <caret line="92" column="27" selection-start-line="92" selection-start-column="27" selection-end-line="92" selection-end-column="27" />
  1624 + <state relative-caret-position="7000">
  1625 + <caret line="303" column="30" selection-start-line="303" selection-start-column="27" selection-end-line="303" selection-end-column="30" />
1576 1626 <folding>
1577 1627 <element signature="imports" expanded="true" />
1578 1628 </folding>
1579 1629 </state>
1580 1630 </provider>
1581 1631 </entry>
  1632 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java">
  1633 + <provider selected="true" editor-type-id="text-editor">
  1634 + <state relative-caret-position="-4818">
  1635 + <caret line="42" column="13" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" />
  1636 + </state>
  1637 + </provider>
  1638 + </entry>
  1639 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shippingCombination/controller/ShippingCombinationController.java">
  1640 + <provider selected="true" editor-type-id="text-editor">
  1641 + <state relative-caret-position="182">
  1642 + <caret line="153" column="93" selection-start-line="153" selection-start-column="93" selection-end-line="153" selection-end-column="93" />
  1643 + </state>
  1644 + </provider>
  1645 + </entry>
  1646 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderService.java">
  1647 + <provider selected="true" editor-type-id="text-editor">
  1648 + <state relative-caret-position="132">
  1649 + <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
  1650 + </state>
  1651 + </provider>
  1652 + </entry>
  1653 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentPreference/service/ShipmentPreferenceService.java">
  1654 + <provider selected="true" editor-type-id="text-editor">
  1655 + <state relative-caret-position="159">
  1656 + <caret line="12" column="26" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="26" />
  1657 + </state>
  1658 + </provider>
  1659 + </entry>
  1660 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/controller/ShipmentDetailController.java">
  1661 + <provider selected="true" editor-type-id="text-editor">
  1662 + <state relative-caret-position="168">
  1663 + <caret line="191" selection-start-line="191" selection-end-line="191" />
  1664 + </state>
  1665 + </provider>
  1666 + </entry>
  1667 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentPreference/service/ShipmentPreferenceServiceImpl.java">
  1668 + <provider selected="true" editor-type-id="text-editor">
  1669 + <state relative-caret-position="192">
  1670 + <caret line="54" selection-start-line="54" selection-end-line="54" />
  1671 + </state>
  1672 + </provider>
  1673 + </entry>
  1674 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java">
  1675 + <provider selected="true" editor-type-id="text-editor">
  1676 + <state relative-caret-position="232">
  1677 + <caret line="104" selection-start-line="104" selection-end-line="104" />
  1678 + </state>
  1679 + </provider>
  1680 + </entry>
  1681 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java">
  1682 + <provider selected="true" editor-type-id="text-editor">
  1683 + <state relative-caret-position="300">
  1684 + <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
  1685 + </state>
  1686 + </provider>
  1687 + </entry>
  1688 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/shipmentType/add.html">
  1689 + <provider selected="true" editor-type-id="text-editor">
  1690 + <state relative-caret-position="1200">
  1691 + <caret line="48" column="144" selection-start-line="48" selection-start-column="130" selection-end-line="48" selection-end-column="144" />
  1692 + </state>
  1693 + </provider>
  1694 + </entry>
  1695 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/statusFlow/service/StatusFlowHeaderService.java">
  1696 + <provider selected="true" editor-type-id="text-editor">
  1697 + <state relative-caret-position="325">
  1698 + <caret line="25" column="63" selection-start-line="25" selection-start-column="53" selection-end-line="25" selection-end-column="63" />
  1699 + </state>
  1700 + </provider>
  1701 + </entry>
  1702 + <entry file="file://$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/controller/shipmentTypeController.java">
  1703 + <provider selected="true" editor-type-id="text-editor">
  1704 + <state relative-caret-position="2175">
  1705 + <caret line="118" column="19" selection-start-line="118" selection-start-column="19" selection-end-line="118" selection-end-column="19" />
  1706 + </state>
  1707 + </provider>
  1708 + </entry>
  1709 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentContainerHeader/shipmentContainerHeader.html">
  1710 + <provider selected="true" editor-type-id="text-editor">
  1711 + <state relative-caret-position="100">
  1712 + <caret line="16" column="72" selection-start-line="16" selection-start-column="72" selection-end-line="16" selection-end-column="72" />
  1713 + </state>
  1714 + </provider>
  1715 + </entry>
  1716 + <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/shipmentType/edit.html">
  1717 + <provider selected="true" editor-type-id="text-editor">
  1718 + <state relative-caret-position="118">
  1719 + <caret line="63" column="37" lean-forward="true" selection-start-line="63" selection-start-column="37" selection-end-line="63" selection-end-column="37" />
  1720 + </state>
  1721 + </provider>
  1722 + </entry>
1582 1723 </component>
1583 1724 <component name="masterDetails">
1584 1725 <states>
... ...
mypage deleted
View file @9f6696c
1   -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2   -<html>
3   -<head>
4   - <title></title>
5   - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
6   - <style type="text/css">
7   - a {text-decoration: none}
8   - </style>
9   -</head>
10   -<body text="#000000" link="#000000" alink="#000000" vlink="#000000">
11   -<table width="100%" cellpadding="0" cellspacing="0" border="0">
12   -<tr><td width="50%">&nbsp;</td><td align="center">
13   -
14   -<a name="JR_PAGE_ANCHOR_0_1"></a>
15   -<table class="jrPage" cellpadding="0" cellspacing="0" border="0" style="empty-cells: show; width: 595px; border-collapse: collapse; background-color: white;">
16   -<tr valign="top" style="height:0">
17   -<td style="width:10px"></td>
18   -<td style="width:80px"></td>
19   -<td style="width:20px"></td>
20   -<td style="width:80px"></td>
21   -<td style="width:20px"></td>
22   -<td style="width:30px"></td>
23   -<td style="width:50px"></td>
24   -<td style="width:50px"></td>
25   -<td style="width:20px"></td>
26   -<td style="width:30px"></td>
27   -<td style="width:70px"></td>
28   -<td style="width:30px"></td>
29   -<td style="width:70px"></td>
30   -<td style="width:30px"></td>
31   -<td style="width:5px"></td>
32   -</tr>
33   -<tr valign="top" style="height:50px">
34   -<td colspan="15">
35   -</td>
36   -</tr>
37   -<tr valign="top" style="height:30px">
38   -<td colspan="6">
39   -</td>
40   -<td colspan="2" style="text-indent: 0px; vertical-align: middle;text-align: center;">
41   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 20px; line-height: 1.3002853;">库存报表</span></td>
42   -<td colspan="7">
43   -</td>
44   -</tr>
45   -<tr valign="top" style="height:24px">
46   -<td colspan="15">
47   -</td>
48   -</tr>
49   -<tr valign="top" style="height:1px">
50   -<td colspan="9">
51   -</td>
52   -<td colspan="2" rowspan="2" style="text-indent: 0px; vertical-align: middle;text-align: right;">
53   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">时间：</span></td>
54   -<td colspan="2" rowspan="2" style="text-indent: 0px; vertical-align: middle;text-align: left;">
55   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">十一月 20, 2019</span></td>
56   -<td colspan="2">
57   -</td>
58   -</tr>
59   -<tr valign="top" style="height:29px">
60   -<td>
61   -</td>
62   -<td colspan="2" rowspan="2" style="text-indent: 0px; vertical-align: middle;text-align: right;">
63   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">公司：</span></td>
64   -<td colspan="2" rowspan="2" style="text-indent: 0px; vertical-align: middle;text-align: left;">
65   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">华恒机器人</span></td>
66   -<td colspan="4">
67   -</td>
68   -<td colspan="2">
69   -</td>
70   -</tr>
71   -<tr valign="top" style="height:1px">
72   -<td>
73   -</td>
74   -<td colspan="10">
75   -</td>
76   -</tr>
77   -<tr valign="top" style="height:14px">
78   -<td colspan="15">
79   -</td>
80   -</tr>
81   -<tr valign="top" style="height:30px">
82   -<td colspan="2" style="text-indent: 0px; vertical-align: middle;text-align: center;">
83   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">序号</span></td>
84   -<td colspan="2" style="text-indent: 0px; vertical-align: middle;text-align: center;">
85   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">物料</span></td>
86   -<td colspan="3" style="text-indent: 0px; vertical-align: middle;text-align: center;">
87   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">库位</span></td>
88   -<td colspan="3" style="text-indent: 0px; vertical-align: middle;text-align: center;">
89   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">数量</span></td>
90   -<td colspan="2" style="text-indent: 0px; vertical-align: middle;text-align: center;">
91   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">状态</span></td>
92   -<td colspan="2" style="text-indent: 0px; vertical-align: middle;text-align: center;">
93   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">距今时间</span></td>
94   -<td>
95   -</td>
96   -</tr>
97   -<tr valign="top" style="height:30px">
98   -<td colspan="2" style="text-indent: 0px; vertical-align: middle;text-align: center;">
99   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">53</span></td>
100   -<td colspan="2" style="text-indent: 0px; vertical-align: middle;text-align: center;">
101   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">20200000432</span></td>
102   -<td colspan="3" style="text-indent: 0px; vertical-align: middle;text-align: center;">
103   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">LK02-21-44-01</span></td>
104   -<td colspan="3" style="text-indent: 0px; vertical-align: middle;text-align: center;">
105   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">50</span></td>
106   -<td colspan="2" style="text-indent: 0px; vertical-align: middle;text-align: center;">
107   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">good</span></td>
108   -<td colspan="2" style="text-indent: 0px; vertical-align: middle;text-align: center;">
109   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">12</span></td>
110   -<td>
111   -</td>
112   -</tr>
113   -<tr valign="top" style="height:1px">
114   -<td colspan="15">
115   -</td>
116   -</tr>
117   -<tr valign="top" style="height:30px">
118   -<td colspan="2" style="text-indent: 0px; vertical-align: middle;text-align: center;">
119   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">54</span></td>
120   -<td colspan="2" style="text-indent: 0px; vertical-align: middle;text-align: center;">
121   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">21000000020</span></td>
122   -<td colspan="3" style="text-indent: 0px; vertical-align: middle;text-align: center;">
123   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">LK02-21-44-01</span></td>
124   -<td colspan="3" style="text-indent: 0px; vertical-align: middle;text-align: center;">
125   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">100</span></td>
126   -<td colspan="2" style="text-indent: 0px; vertical-align: middle;text-align: center;">
127   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">good</span></td>
128   -<td colspan="2" style="text-indent: 0px; vertical-align: middle;text-align: center;">
129   -<span style="font-family: '华文宋体', Arial, Helvetica, sans-serif; color: #000000; font-size: 10px; line-height: 1.3002853;">12</span></td>
130   -<td>
131   -</td>
132   -</tr>
133   -<tr valign="top" style="height:602px">
134   -<td colspan="15">
135   -</td>
136   -</tr>
137   -</table>
138   -
139   -</td><td width="50%">&nbsp;</td></tr>
140   -</table>
141   -</body>
142   -</html>