朱兆平 / agent · 提交

转到一个项目

作者 申海龙
提交 0c0611e644b4613b3cc7de5f5bc6ca73f13a6351 1 个父辈 e522d181

优化针对订单的查询功能

内嵌 并排对比
正在显示 6 个修改的文件 包含 1035 行增加 和 891 行删除
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> 2 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3 <component name="FacetManager"> 3 <component name="FacetManager">
4 - <facet type="web" name="Web">  
5 - <configuration>  
6 - <descriptors>  
7 - <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />  
8 - </descriptors>  
9 - <webroots>  
10 - <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />  
11 - </webroots>  
12 - <sourceRoots>  
13 - <root url="file://$MODULE_DIR$/src/main/java" />  
14 - <root url="file://$MODULE_DIR$/src/main/resources" />  
15 - </sourceRoots>  
16 - </configuration>  
17 - </facet>  
18 - <facet type="Spring" name="Spring">  
19 - <configuration />  
20 - </facet>  
21 - </component>  
22 - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">  
23 - <output url="file://$MODULE_DIR$/target/classes" />  
24 - <output-test url="file://$MODULE_DIR$/target/test-classes" />  
25 - <content url="file://$MODULE_DIR$">  
26 - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />  
27 - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />  
28 - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />  
29 - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />  
30 - <excludeFolder url="file://$MODULE_DIR$/target" />  
31 - </content>  
32 - <orderEntry type="inheritedJdk" />  
33 - <orderEntry type="sourceFolder" forTests="false" />  
34 - <orderEntry type="library" name="patchca-0.5.0" level="project" />  
35 - <orderEntry type="module-library">  
36 - <library>  
37 - <CLASSES>  
38 - <root url="jar://$USER_HOME$/Documents/maven/apache-ant-zip.jar!/" />  
39 - </CLASSES>  
40 - <JAVADOC />  
41 - <SOURCES />  
42 - </library>  
43 - </orderEntry>  
44 - <orderEntry type="module-library">  
45 - <library>  
46 - <CLASSES>  
47 - <root url="jar://$MODULE_DIR$/../../jar/imf_jar/apiConfig.jar!/" />  
48 - </CLASSES>  
49 - <JAVADOC />  
50 - <SOURCES />  
51 - </library>  
52 - </orderEntry>  
53 - <orderEntry type="module-library">  
54 - <library>  
55 - <CLASSES>  
56 - <root url="jar://$MODULE_DIR$/../../jar/imf_jar/HeartbeatService.jar!/" />  
57 - </CLASSES>  
58 - <JAVADOC />  
59 - <SOURCES />  
60 - </library>  
61 - </orderEntry>  
62 - <orderEntry type="module-library">  
63 - <library>  
64 - <CLASSES>  
65 - <root url="jar://$MODULE_DIR$/../../jar/imf_jar/IMFClient.1.0.0.jar!/" />  
66 - </CLASSES>  
67 - <JAVADOC />  
68 - <SOURCES />  
69 - </library>  
70 - </orderEntry>  
71 - <orderEntry type="module-library">  
72 - <library>  
73 - <CLASSES>  
74 - <root url="jar://$MODULE_DIR$/../../jar/imf_jar/imfmsg.jar!/" />  
75 - </CLASSES>  
76 - <JAVADOC />  
77 - <SOURCES />  
78 - </library>  
79 - </orderEntry>  
80 - <orderEntry type="module-library">  
81 - <library>  
82 - <CLASSES>  
83 - <root url="jar://$MODULE_DIR$/../../jar/imf_jar/ProcessService.jar!/" />  
84 - </CLASSES>  
85 - <JAVADOC />  
86 - <SOURCES />  
87 - </library>  
88 - </orderEntry>  
89 - <orderEntry type="module-library">  
90 - <library>  
91 - <CLASSES>  
92 - <root url="jar://$MODULE_DIR$/../../jar/imf_jar/returnXml.jar!/" />  
93 - </CLASSES>  
94 - <JAVADOC />  
95 - <SOURCES />  
96 - </library>  
97 - </orderEntry>  
98 - <orderEntry type="module-library">  
99 - <library>  
100 - <CLASSES>  
101 - <root url="jar://$MODULE_DIR$/../../jar/imf_jar/UploadService.jar!/" />  
102 - </CLASSES>  
103 - <JAVADOC />  
104 - <SOURCES />  
105 - </library>  
106 - </orderEntry>  
107 - <orderEntry type="module-library">  
108 - <library>  
109 - <CLASSES>  
110 - <root url="jar://$MODULE_DIR$/../../jar/imf/antlr-2.7.7.jar!/" />  
111 - </CLASSES>  
112 - <JAVADOC />  
113 - <SOURCES />  
114 - </library>  
115 - </orderEntry>  
116 - <orderEntry type="module-library">  
117 - <library>  
118 - <CLASSES>  
119 - <root url="jar://$MODULE_DIR$/../../jar/imf/antlr-3.2.jar!/" />  
120 - </CLASSES>  
121 - <JAVADOC />  
122 - <SOURCES />  
123 - </library>  
124 - </orderEntry>  
125 - <orderEntry type="module-library">  
126 - <library>  
127 - <CLASSES>  
128 - <root url="jar://$MODULE_DIR$/../../jar/imf/antlr-runtime-3.2.jar!/" />  
129 - </CLASSES>  
130 - <JAVADOC />  
131 - <SOURCES />  
132 - </library>  
133 - </orderEntry>  
134 - <orderEntry type="module-library">  
135 - <library>  
136 - <CLASSES>  
137 - <root url="jar://$MODULE_DIR$/../../jar/imf/aopalliance-1.0.jar!/" />  
138 - </CLASSES>  
139 - <JAVADOC />  
140 - <SOURCES />  
141 - </library>  
142 - </orderEntry>  
143 - <orderEntry type="module-library">  
144 - <library>  
145 - <CLASSES>  
146 - <root url="jar://$MODULE_DIR$/../../jar/imf/asm-3.3.jar!/" />  
147 - </CLASSES>  
148 - <JAVADOC />  
149 - <SOURCES />  
150 - </library>  
151 - </orderEntry>  
152 - <orderEntry type="module-library">  
153 - <library>  
154 - <CLASSES>  
155 - <root url="jar://$MODULE_DIR$/../../jar/imf/bcprov-jdk15-1.45.jar!/" />  
156 - </CLASSES>  
157 - <JAVADOC />  
158 - <SOURCES />  
159 - </library>  
160 - </orderEntry>  
161 - <orderEntry type="module-library">  
162 - <library>  
163 - <CLASSES>  
164 - <root url="jar://$MODULE_DIR$/../../jar/imf/CL3Export.jar!/" />  
165 - </CLASSES>  
166 - <JAVADOC />  
167 - <SOURCES />  
168 - </library>  
169 - </orderEntry>  
170 - <orderEntry type="module-library">  
171 - <library>  
172 - <CLASSES>  
173 - <root url="jar://$MODULE_DIR$/../../jar/imf/CL3Nonexport.jar!/" />  
174 - </CLASSES>  
175 - <JAVADOC />  
176 - <SOURCES />  
177 - </library>  
178 - </orderEntry>  
179 - <orderEntry type="module-library">  
180 - <library>  
181 - <CLASSES>  
182 - <root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.axis2.jar!/" />  
183 - </CLASSES>  
184 - <JAVADOC />  
185 - <SOURCES />  
186 - </library>  
187 - </orderEntry>  
188 - <orderEntry type="module-library">  
189 - <library>  
190 - <CLASSES>  
191 - <root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.commonservices.jar!/" />  
192 - </CLASSES>  
193 - <JAVADOC />  
194 - <SOURCES />  
195 - </library>  
196 - </orderEntry>  
197 - <orderEntry type="module-library">  
198 - <library>  
199 - <CLASSES>  
200 - <root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.defaultconfig.jar!/" />  
201 - </CLASSES>  
202 - <JAVADOC />  
203 - <SOURCES />  
204 - </library>  
205 - </orderEntry>  
206 - <orderEntry type="module-library">  
207 - <library>  
208 - <CLASSES>  
209 - <root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.fta.jar!/" />  
210 - </CLASSES>  
211 - <JAVADOC />  
212 - <SOURCES />  
213 - </library>  
214 - </orderEntry>  
215 - <orderEntry type="module-library">  
216 - <library>  
217 - <CLASSES>  
218 - <root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.headers.jar!/" />  
219 - </CLASSES>  
220 - <JAVADOC />  
221 - <SOURCES />  
222 - </library>  
223 - </orderEntry>  
224 - <orderEntry type="module-library">  
225 - <library>  
226 - <CLASSES>  
227 - <root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.jar!/" />  
228 - </CLASSES>  
229 - <JAVADOC />  
230 - <SOURCES />  
231 - </library>  
232 - </orderEntry>  
233 - <orderEntry type="module-library">  
234 - <library>  
235 - <CLASSES>  
236 - <root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.jmqi.jar!/" />  
237 - </CLASSES>  
238 - <JAVADOC />  
239 - <SOURCES>  
240 - <root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.jmqi.jar!/" />  
241 - </SOURCES>  
242 - </library>  
243 - </orderEntry>  
244 - <orderEntry type="module-library">  
245 - <library>  
246 - <CLASSES>  
247 - <root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.jms.Nojndi.jar!/" />  
248 - </CLASSES>  
249 - <JAVADOC />  
250 - <SOURCES />  
251 - </library>  
252 - </orderEntry>  
253 - <orderEntry type="module-library">  
254 - <library>  
255 - <CLASSES>  
256 - <root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.soap.jar!/" />  
257 - </CLASSES>  
258 - <JAVADOC />  
259 - <SOURCES />  
260 - </library>  
261 - </orderEntry>  
262 - <orderEntry type="module-library">  
263 - <library>  
264 - <CLASSES>  
265 - <root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.tools.ras.jar!/" />  
266 - </CLASSES>  
267 - <JAVADOC />  
268 - <SOURCES />  
269 - </library>  
270 - </orderEntry>  
271 - <orderEntry type="module-library">  
272 - <library>  
273 - <CLASSES>  
274 - <root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.postcard.jar!/" />  
275 - </CLASSES>  
276 - <JAVADOC />  
277 - <SOURCES />  
278 - </library>  
279 - </orderEntry>  
280 - <orderEntry type="module-library">  
281 - <library>  
282 - <CLASSES>  
283 - <root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mqjms.jar!/" />  
284 - </CLASSES>  
285 - <JAVADOC />  
286 - <SOURCES />  
287 - </library>  
288 - </orderEntry>  
289 - <orderEntry type="module-library">  
290 - <library>  
291 - <CLASSES>  
292 - <root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mqetclient.jar!/" />  
293 - </CLASSES>  
294 - <JAVADOC />  
295 - <SOURCES />  
296 - </library>  
297 - </orderEntry>  
298 - <orderEntry type="module-library">  
299 - <library>  
300 - <CLASSES>  
301 - <root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.pcf.jar!/" />  
302 - </CLASSES>  
303 - <JAVADOC />  
304 - <SOURCES />  
305 - </library>  
306 - </orderEntry>  
307 - <orderEntry type="module-library">  
308 - <library>  
309 - <CLASSES>  
310 - <root url="jar://$MODULE_DIR$/../../jar/imf/commons-collections-3.2.1.jar!/" />  
311 - </CLASSES>  
312 - <JAVADOC />  
313 - <SOURCES />  
314 - </library>  
315 - </orderEntry>  
316 - <orderEntry type="module-library">  
317 - <library>  
318 - <CLASSES>  
319 - <root url="jar://$MODULE_DIR$/../../jar/imf/commons-lang-2.5.jar!/" />  
320 - </CLASSES>  
321 - <JAVADOC />  
322 - <SOURCES />  
323 - </library>  
324 - </orderEntry>  
325 - <orderEntry type="module-library">  
326 - <library>  
327 - <CLASSES>  
328 - <root url="jar://$MODULE_DIR$/../../jar/imf/commons-logging-1.1.1.jar!/" />  
329 - </CLASSES>  
330 - <JAVADOC />  
331 - <SOURCES />  
332 - </library>  
333 - </orderEntry>  
334 - <orderEntry type="module-library">  
335 - <library>  
336 - <CLASSES>  
337 - <root url="jar://$MODULE_DIR$/../../jar/imf/commons-pool-1.5.5.jar!/" />  
338 - </CLASSES>  
339 - <JAVADOC />  
340 - <SOURCES />  
341 - </library>  
342 - </orderEntry>  
343 - <orderEntry type="module-library">  
344 - <library>  
345 - <CLASSES>  
346 - <root url="jar://$MODULE_DIR$/../../jar/imf/connector.jar!/" />  
347 - </CLASSES>  
348 - <JAVADOC />  
349 - <SOURCES />  
350 - </library>  
351 - </orderEntry>  
352 - <orderEntry type="module-library">  
353 - <library>  
354 - <CLASSES>  
355 - <root url="jar://$MODULE_DIR$/../../jar/imf/cxf-2.3.2.jar!/" />  
356 - </CLASSES>  
357 - <JAVADOC />  
358 - <SOURCES />  
359 - </library>  
360 - </orderEntry>  
361 - <orderEntry type="module-library">  
362 - <library>  
363 - <CLASSES>  
364 - <root url="jar://$MODULE_DIR$/../../jar/imf/cxf-xjc-boolean-2.3.2.jar!/" />  
365 - </CLASSES>  
366 - <JAVADOC />  
367 - <SOURCES />  
368 - </library>  
369 - </orderEntry>  
370 - <orderEntry type="module-library">  
371 - <library>  
372 - <CLASSES>  
373 - <root url="jar://$MODULE_DIR$/../../jar/imf/cxf-xjc-bug671-2.3.2.jar!/" />  
374 - </CLASSES>  
375 - <JAVADOC />  
376 - <SOURCES />  
377 - </library>  
378 - </orderEntry>  
379 - <orderEntry type="module-library">  
380 - <library>  
381 - <CLASSES>  
382 - <root url="jar://$MODULE_DIR$/../../jar/imf/cxf-xjc-dv-2.3.2.jar!/" />  
383 - </CLASSES>  
384 - <JAVADOC />  
385 - <SOURCES />  
386 - </library>  
387 - </orderEntry>  
388 - <orderEntry type="module-library">  
389 - <library>  
390 - <CLASSES>  
391 - <root url="jar://$MODULE_DIR$/../../jar/imf/cxf-xjc-ts-2.3.2.jar!/" />  
392 - </CLASSES>  
393 - <JAVADOC />  
394 - <SOURCES />  
395 - </library>  
396 - </orderEntry>  
397 - <orderEntry type="module-library">  
398 - <library>  
399 - <CLASSES>  
400 - <root url="jar://$MODULE_DIR$/../../jar/imf/dhbcore.jar!/" />  
401 - </CLASSES>  
402 - <JAVADOC />  
403 - <SOURCES />  
404 - </library>  
405 - </orderEntry>  
406 - <orderEntry type="module-library">  
407 - <library>  
408 - <CLASSES>  
409 - <root url="jar://$MODULE_DIR$/../../jar/imf/FastInfoset-1.2.8.jar!/" />  
410 - </CLASSES>  
411 - <JAVADOC />  
412 - <SOURCES />  
413 - </library>  
414 - </orderEntry>  
415 - <orderEntry type="module-library">  
416 - <library>  
417 - <CLASSES>  
418 - <root url="jar://$MODULE_DIR$/../../jar/imf/fscontext.jar!/" />  
419 - </CLASSES>  
420 - <JAVADOC />  
421 - <SOURCES />  
422 - </library>  
423 - </orderEntry>  
424 - <orderEntry type="module-library">  
425 - <library>  
426 - <CLASSES>  
427 - <root url="jar://$MODULE_DIR$/../../jar/imf/geronimo-activation_1.1_spec-1.1.jar!/" />  
428 - </CLASSES>  
429 - <JAVADOC />  
430 - <SOURCES />  
431 - </library>  
432 - </orderEntry>  
433 - <orderEntry type="module-library">  
434 - <library>  
435 - <CLASSES>  
436 - <root url="jar://$MODULE_DIR$/../../jar/imf/geronimo-annotation_1.0_spec-1.1.1.jar!/" />  
437 - </CLASSES>  
438 - <JAVADOC />  
439 - <SOURCES />  
440 - </library>  
441 - </orderEntry>  
442 - <orderEntry type="module-library">  
443 - <library>  
444 - <CLASSES>  
445 - <root url="jar://$MODULE_DIR$/../../jar/imf/geronimo-javamail_1.4_spec-1.7.1.jar!/" />  
446 - </CLASSES>  
447 - <JAVADOC />  
448 - <SOURCES />  
449 - </library>  
450 - </orderEntry>  
451 - <orderEntry type="module-library">  
452 - <library>  
453 - <CLASSES>  
454 - <root url="jar://$MODULE_DIR$/../../jar/imf/geronimo-jaxws_2.2_spec-1.0.jar!/" />  
455 - </CLASSES>  
456 - <JAVADOC />  
457 - <SOURCES />  
458 - </library>  
459 - </orderEntry>  
460 - <orderEntry type="module-library">  
461 - <library>  
462 - <CLASSES>  
463 - <root url="jar://$MODULE_DIR$/../../jar/imf/geronimo-jms_1.1_spec-1.1.1.jar!/" />  
464 - </CLASSES>  
465 - <JAVADOC />  
466 - <SOURCES />  
467 - </library>  
468 - </orderEntry>  
469 - <orderEntry type="module-library">  
470 - <library>  
471 - <CLASSES>  
472 - <root url="jar://$MODULE_DIR$/../../jar/imf/geronimo-servlet_3.0_spec-1.0.jar!/" />  
473 - </CLASSES>  
474 - <JAVADOC />  
475 - <SOURCES />  
476 - </library>  
477 - </orderEntry>  
478 - <orderEntry type="module-library">  
479 - <library>  
480 - <CLASSES>  
481 - <root url="jar://$MODULE_DIR$/../../jar/imf/geronimo-stax-api_1.0_spec-1.0.1.jar!/" />  
482 - </CLASSES>  
483 - <JAVADOC />  
484 - <SOURCES />  
485 - </library>  
486 - </orderEntry>  
487 - <orderEntry type="module-library">  
488 - <library>  
489 - <CLASSES>  
490 - <root url="jar://$MODULE_DIR$/../../jar/imf/geronimo-ws-metadata_2.0_spec-1.1.3.jar!/" />  
491 - </CLASSES>  
492 - <JAVADOC />  
493 - <SOURCES />  
494 - </library>  
495 - </orderEntry>  
496 - <orderEntry type="module-library">  
497 - <library>  
498 - <CLASSES>  
499 - <root url="jar://$MODULE_DIR$/../../jar/imf/jaxb-api-2.2.1.jar!/" />  
500 - </CLASSES>  
501 - <JAVADOC />  
502 - <SOURCES />  
503 - </library>  
504 - </orderEntry>  
505 - <orderEntry type="module-library">  
506 - <library>  
507 - <CLASSES>  
508 - <root url="jar://$MODULE_DIR$/../../jar/imf/jaxb-impl-2.2.1.1.jar!/" />  
509 - </CLASSES>  
510 - <JAVADOC />  
511 - <SOURCES />  
512 - </library>  
513 - </orderEntry>  
514 - <orderEntry type="module-library">  
515 - <library>  
516 - <CLASSES>  
517 - <root url="jar://$MODULE_DIR$/../../jar/imf/jaxb-xjc-2.2.1.1.jar!/" />  
518 - </CLASSES>  
519 - <JAVADOC />  
520 - <SOURCES>  
521 - <root url="jar://$MODULE_DIR$/../../jar/imf/jaxb-xjc-2.2.1.1.jar!/1.0" />  
522 - </SOURCES>  
523 - </library>  
524 - </orderEntry>  
525 - <orderEntry type="module-library">  
526 - <library>  
527 - <CLASSES>  
528 - <root url="jar://$MODULE_DIR$/../../jar/imf/jettison-1.2.jar!/" />  
529 - </CLASSES>  
530 - <JAVADOC />  
531 - <SOURCES />  
532 - </library>  
533 - </orderEntry>  
534 - <orderEntry type="module-library">  
535 - <library>  
536 - <CLASSES>  
537 - <root url="jar://$MODULE_DIR$/../../jar/imf/jetty-continuation-7.2.2.v20101205.jar!/" />  
538 - </CLASSES>  
539 - <JAVADOC />  
540 - <SOURCES />  
541 - </library>  
542 - </orderEntry>  
543 - <orderEntry type="module-library">  
544 - <library>  
545 - <CLASSES>  
546 - <root url="jar://$MODULE_DIR$/../../jar/imf/jetty-http-7.2.2.v20101205.jar!/" />  
547 - </CLASSES>  
548 - <JAVADOC />  
549 - <SOURCES />  
550 - </library>  
551 - </orderEntry>  
552 - <orderEntry type="module-library">  
553 - <library>  
554 - <CLASSES>  
555 - <root url="jar://$MODULE_DIR$/../../jar/imf/jetty-io-7.2.2.v20101205.jar!/" />  
556 - </CLASSES>  
557 - <JAVADOC />  
558 - <SOURCES />  
559 - </library>  
560 - </orderEntry>  
561 - <orderEntry type="module-library">  
562 - <library>  
563 - <CLASSES>  
564 - <root url="jar://$MODULE_DIR$/../../jar/imf/jetty-server-7.2.2.v20101205.jar!/" />  
565 - </CLASSES>  
566 - <JAVADOC />  
567 - <SOURCES />  
568 - </library>  
569 - </orderEntry>  
570 - <orderEntry type="module-library">  
571 - <library>  
572 - <CLASSES>  
573 - <root url="jar://$MODULE_DIR$/../../jar/imf/jetty-util-7.2.2.v20101205.jar!/" />  
574 - </CLASSES>  
575 - <JAVADOC />  
576 - <SOURCES />  
577 - </library>  
578 - </orderEntry>  
579 - <orderEntry type="module-library">  
580 - <library>  
581 - <CLASSES>  
582 - <root url="jar://$MODULE_DIR$/../../jar/imf/jms.jar!/" />  
583 - </CLASSES>  
584 - <JAVADOC />  
585 - <SOURCES />  
586 - </library>  
587 - </orderEntry>  
588 - <orderEntry type="module-library">  
589 - <library>  
590 - <CLASSES>  
591 - <root url="jar://$MODULE_DIR$/../../jar/imf/jndi.jar!/" />  
592 - </CLASSES>  
593 - <JAVADOC />  
594 - <SOURCES />  
595 - </library>  
596 - </orderEntry>  
597 - <orderEntry type="module-library">  
598 - <library>  
599 - <CLASSES>  
600 - <root url="jar://$MODULE_DIR$/../../jar/imf/jra-1.0-alpha-4.jar!/" />  
601 - </CLASSES>  
602 - <JAVADOC />  
603 - <SOURCES />  
604 - </library>  
605 - </orderEntry>  
606 - <orderEntry type="module-library">  
607 - <library>  
608 - <CLASSES>  
609 - <root url="jar://$MODULE_DIR$/../../jar/imf/js-1.7R2.jar!/" />  
610 - </CLASSES>  
611 - <JAVADOC />  
612 - <SOURCES />  
613 - </library>  
614 - </orderEntry>  
615 - <orderEntry type="module-library">  
616 - <library>  
617 - <CLASSES>  
618 - <root url="jar://$MODULE_DIR$/../../jar/imf/jsr173_1.0_api.jar!/" />  
619 - </CLASSES>  
620 - <JAVADOC />  
621 - <SOURCES />  
622 - </library>  
623 - </orderEntry>  
624 - <orderEntry type="module-library">  
625 - <library>  
626 - <CLASSES>  
627 - <root url="jar://$MODULE_DIR$/../../jar/imf/jsr311-api-1.1.1.jar!/" />  
628 - </CLASSES>  
629 - <JAVADOC />  
630 - <SOURCES />  
631 - </library>  
632 - </orderEntry>  
633 - <orderEntry type="module-library">  
634 - <library>  
635 - <CLASSES>  
636 - <root url="jar://$MODULE_DIR$/../../jar/imf/jta.jar!/" />  
637 - </CLASSES>  
638 - <JAVADOC />  
639 - <SOURCES />  
640 - </library>  
641 - </orderEntry>  
642 - <orderEntry type="module-library">  
643 - <library>  
644 - <CLASSES>  
645 - <root url="jar://$MODULE_DIR$/../../jar/imf/ldap.jar!/" />  
646 - </CLASSES>  
647 - <JAVADOC />  
648 - <SOURCES />  
649 - </library>  
650 - </orderEntry>  
651 - <orderEntry type="module-library">  
652 - <library>  
653 - <CLASSES>  
654 - <root url="jar://$MODULE_DIR$/../../jar/imf/neethi-2.0.4.jar!/" />  
655 - </CLASSES>  
656 - <JAVADOC />  
657 - <SOURCES />  
658 - </library>  
659 - </orderEntry>  
660 - <orderEntry type="module-library">  
661 - <library>  
662 - <CLASSES>  
663 - <root url="jar://$MODULE_DIR$/../../jar/imf/oro-2.0.8.jar!/" />  
664 - </CLASSES>  
665 - <JAVADOC />  
666 - <SOURCES />  
667 - </library>  
668 - </orderEntry>  
669 - <orderEntry type="module-library">  
670 - <library>  
671 - <CLASSES>  
672 - <root url="jar://$MODULE_DIR$/../../jar/imf/providerutil.jar!/" />  
673 - </CLASSES>  
674 - <JAVADOC />  
675 - <SOURCES />  
676 - </library>  
677 - </orderEntry>  
678 - <orderEntry type="module-library">  
679 - <library>  
680 - <CLASSES>  
681 - <root url="jar://$MODULE_DIR$/../../jar/imf/resolver.jar!/" />  
682 - </CLASSES>  
683 - <JAVADOC />  
684 - <SOURCES />  
685 - </library>  
686 - </orderEntry>  
687 - <orderEntry type="module-library">  
688 - <library>  
689 - <CLASSES>  
690 - <root url="jar://$MODULE_DIR$/../../jar/imf/rmm.jar!/" />  
691 - </CLASSES>  
692 - <JAVADOC />  
693 - <SOURCES />  
694 - </library>  
695 - </orderEntry>  
696 - <orderEntry type="module-library">  
697 - <library>  
698 - <CLASSES>  
699 - <root url="jar://$MODULE_DIR$/../../jar/imf/saaj-api-1.3.jar!/" />  
700 - </CLASSES>  
701 - <JAVADOC />  
702 - <SOURCES />  
703 - </library>  
704 - </orderEntry>  
705 - <orderEntry type="module-library">  
706 - <library>  
707 - <CLASSES>  
708 - <root url="jar://$MODULE_DIR$/../../jar/imf/saaj-impl-1.3.2.jar!/" />  
709 - </CLASSES>  
710 - <JAVADOC />  
711 - <SOURCES />  
712 - </library>  
713 - </orderEntry>  
714 - <orderEntry type="module-library">  
715 - <library>  
716 - <CLASSES>  
717 - <root url="jar://$MODULE_DIR$/../../jar/imf/serializer-2.7.1.jar!/" />  
718 - </CLASSES>  
719 - <JAVADOC />  
720 - <SOURCES />  
721 - </library>  
722 - </orderEntry>  
723 - <orderEntry type="module-library">  
724 - <library>  
725 - <CLASSES>  
726 - <root url="jar://$MODULE_DIR$/../../jar/imf/sigar.jar!/" />  
727 - </CLASSES>  
728 - <JAVADOC />  
729 - <SOURCES />  
730 - </library>  
731 - </orderEntry>  
732 - <orderEntry type="module-library">  
733 - <library>  
734 - <CLASSES>  
735 - <root url="jar://$MODULE_DIR$/../../jar/imf/stax2-api-3.0.2.jar!/" />  
736 - </CLASSES>  
737 - <JAVADOC />  
738 - <SOURCES />  
739 - </library>  
740 - </orderEntry>  
741 - <orderEntry type="module-library">  
742 - <library>  
743 - <CLASSES>  
744 - <root url="jar://$MODULE_DIR$/../../jar/imf/stringtemplate-3.2.jar!/" />  
745 - </CLASSES>  
746 - <JAVADOC />  
747 - <SOURCES />  
748 - </library>  
749 - </orderEntry>  
750 - <orderEntry type="module-library">  
751 - <library>  
752 - <CLASSES>  
753 - <root url="jar://$MODULE_DIR$/../../jar/imf/velocity-1.6.4.jar!/" />  
754 - </CLASSES>  
755 - <JAVADOC />  
756 - <SOURCES />  
757 - </library>  
758 - </orderEntry>  
759 - <orderEntry type="module-library">  
760 - <library>  
761 - <CLASSES>  
762 - <root url="jar://$MODULE_DIR$/../../jar/imf/woodstox-core-asl-4.0.8.jar!/" />  
763 - </CLASSES>  
764 - <JAVADOC />  
765 - <SOURCES />  
766 - </library>  
767 - </orderEntry>  
768 - <orderEntry type="module-library">  
769 - <library>  
770 - <CLASSES>  
771 - <root url="jar://$MODULE_DIR$/../../jar/imf/wsdl4j-1.6.2.jar!/" />  
772 - </CLASSES>  
773 - <JAVADOC />  
774 - <SOURCES />  
775 - </library>  
776 - </orderEntry>  
777 - <orderEntry type="module-library">  
778 - <library>  
779 - <CLASSES>  
780 - <root url="jar://$MODULE_DIR$/../../jar/imf/wss4j-1.5.11.jar!/" />  
781 - </CLASSES>  
782 - <JAVADOC />  
783 - <SOURCES />  
784 - </library>  
785 - </orderEntry>  
786 - <orderEntry type="module-library">  
787 - <library>  
788 - <CLASSES>  
789 - <root url="jar://$MODULE_DIR$/../../jar/imf/xalan-2.7.1.jar!/" />  
790 - </CLASSES>  
791 - <JAVADOC />  
792 - <SOURCES />  
793 - </library>  
794 - </orderEntry>  
795 - <orderEntry type="module-library">  
796 - <library>  
797 - <CLASSES>  
798 - <root url="jar://$MODULE_DIR$/../../jar/imf/xbean.jar!/" />  
799 - </CLASSES>  
800 - <JAVADOC />  
801 - <SOURCES />  
802 - </library>  
803 - </orderEntry>  
804 - <orderEntry type="module-library">  
805 - <library>  
806 - <CLASSES>  
807 - <root url="jar://$MODULE_DIR$/../../jar/imf/xbean_xpath.jar!/" />  
808 - </CLASSES>  
809 - <JAVADOC />  
810 - <SOURCES />  
811 - </library>  
812 - </orderEntry>  
813 - <orderEntry type="module-library">  
814 - <library>  
815 - <CLASSES>  
816 - <root url="jar://$MODULE_DIR$/../../jar/imf/xml-resolver-1.2.jar!/" />  
817 - </CLASSES>  
818 - <JAVADOC />  
819 - <SOURCES />  
820 - </library>  
821 - </orderEntry>  
822 - <orderEntry type="module-library">  
823 - <library>  
824 - <CLASSES>  
825 - <root url="jar://$MODULE_DIR$/../../jar/imf/xmlbeans-2.4.0.jar!/" />  
826 - </CLASSES>  
827 - <JAVADOC />  
828 - <SOURCES />  
829 - </library>  
830 - </orderEntry>  
831 - <orderEntry type="module-library">  
832 - <library>  
833 - <CLASSES>  
834 - <root url="jar://$MODULE_DIR$/../../jar/imf/xmlbeans-qname.jar!/" />  
835 - </CLASSES>  
836 - <JAVADOC />  
837 - <SOURCES />  
838 - </library>  
839 - </orderEntry>  
840 - <orderEntry type="module-library">  
841 - <library>  
842 - <CLASSES>  
843 - <root url="jar://$MODULE_DIR$/../../jar/imf/xmlpublic.jar!/" />  
844 - </CLASSES>  
845 - <JAVADOC />  
846 - <SOURCES />  
847 - </library>  
848 - </orderEntry>  
849 - <orderEntry type="module-library">  
850 - <library>  
851 - <CLASSES>  
852 - <root url="jar://$MODULE_DIR$/../../jar/imf/XmlSchema-1.4.7.jar!/" />  
853 - </CLASSES>  
854 - <JAVADOC />  
855 - <SOURCES />  
856 - </library>  
857 - </orderEntry>  
858 - <orderEntry type="module-library">  
859 - <library>  
860 - <CLASSES>  
861 - <root url="jar://$MODULE_DIR$/../../jar/imf/xmlsec-1.4.4.jar!/" />  
862 - </CLASSES>  
863 - <JAVADOC />  
864 - <SOURCES />  
865 - </library>  
866 - </orderEntry>  
867 - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:2.7.11" level="project" /> 4 + <facet type="Spring" name="Spring">
  5 + <configuration />
  6 + </facet>
  7 + <facet type="web" name="Web">
  8 + <configuration>
  9 + <descriptors>
  10 + <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
  11 + </descriptors>
  12 + <webroots>
  13 + <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
  14 + </webroots>
  15 + <sourceRoots>
  16 + <root url="file://$MODULE_DIR$/src/main/java" />
  17 + <root url="file://$MODULE_DIR$/src/main/resources" />
  18 + </sourceRoots>
  19 + </configuration>
  20 + </facet>
  21 + </component>
  22 + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
  23 + <output url="file://$MODULE_DIR$/target/classes" />
  24 + <output-test url="file://$MODULE_DIR$/target/test-classes" />
  25 + <content url="file://$MODULE_DIR$">
  26 + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
  27 + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
  28 + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
  29 + <excludeFolder url="file://$MODULE_DIR$/target" />
  30 + </content>
  31 + <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
  32 + <orderEntry type="sourceFolder" forTests="false" />
  33 + <orderEntry type="library" name="imf" level="project" />
  34 + <orderEntry type="library" name="jiguang" level="project" />
  35 + <orderEntry type="library" name="lib" level="project" />
  36 + <orderEntry type="library" name="lib1" level="project" />
  37 + <orderEntry type="library" name="lib2" level="project" />
  38 + <orderEntry type="library" name="libhttp" level="project" />
  39 + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:2.7.5" level="project" />
868 <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" /> 40 <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
869 <orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" /> 41 <orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" />
870 - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-api:2.7.11" level="project" />  
871 - <orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.2.1" level="project" />  
872 - <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />  
873 - <orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.1.0" level="project" /> 42 + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-api:2.7.5" level="project" />
  43 + <orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.2.0" level="project" />
  44 + <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.1" level="project" />
  45 + <orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.0.3" level="project" />
874 <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-javamail_1.4_spec:1.7.1" level="project" /> 46 <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-javamail_1.4_spec:1.7.1" level="project" />
875 <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" /> 47 <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
876 - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-core:2.7.11" level="project" />  
877 - <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.1.13" level="project" />  
878 - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:2.7.11" level="project" />  
879 - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:2.7.11" level="project" />  
880 - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:2.7.11" level="project" />  
881 - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:2.7.11" level="project" />  
882 - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:2.7.11" level="project" />  
883 - <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:2.7.11" level="project" />  
884 - <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.3" level="project" /> 48 + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-core:2.7.5" level="project" />
  49 + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:2.7.5" level="project" />
  50 + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:2.7.5" level="project" />
  51 + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:2.7.5" level="project" />
  52 + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:2.7.5" level="project" />
  53 + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:2.7.5" level="project" />
  54 + <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:2.7.5" level="project" />
  55 + <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.2" level="project" />
885 <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:2.7.5" level="project" /> 56 <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:2.7.5" level="project" />
886 <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-security:2.7.5" level="project" /> 57 <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-security:2.7.5" level="project" />
887 <orderEntry type="library" name="Maven: org.apache.ws.security:wss4j:1.6.10" level="project" /> 58 <orderEntry type="library" name="Maven: org.apache.ws.security:wss4j:1.6.10" level="project" />
@@ -894,6 +65,7 @@ @@ -894,6 +65,7 @@
894 <orderEntry type="library" name="Maven: javax.transaction:jta:1.1" level="project" /> 65 <orderEntry type="library" name="Maven: javax.transaction:jta:1.1" level="project" />
895 <orderEntry type="library" name="Maven: jstl:jstl:1.2" level="project" /> 66 <orderEntry type="library" name="Maven: jstl:jstl:1.2" level="project" />
896 <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.16" level="project" /> 67 <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.16" level="project" />
  68 + <orderEntry type="library" name="Maven: org.jdom:jdom:1.1.3" level="project" />
897 <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" /> 69 <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
898 <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> 70 <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
899 <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" /> 71 <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
@@ -902,6 +74,7 @@ @@ -902,6 +74,7 @@
902 <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.5" level="project" /> 74 <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.5" level="project" />
903 <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.5" level="project" /> 75 <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.5" level="project" />
904 <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.5" level="project" /> 76 <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.5" level="project" />
  77 + <orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
905 <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.4.RELEASE" level="project" /> 78 <orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.4.RELEASE" level="project" />
906 <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.4.RELEASE" level="project" /> 79 <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.4.RELEASE" level="project" />
907 <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.4.RELEASE" level="project" /> 80 <orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.4.RELEASE" level="project" />
@@ -914,6 +87,7 @@ @@ -914,6 +87,7 @@
914 <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.4.RELEASE" level="project" /> 87 <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.4.RELEASE" level="project" />
915 <orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.4.RELEASE" level="project" /> 88 <orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.4.RELEASE" level="project" />
916 <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.4.RELEASE" level="project" /> 89 <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.4.RELEASE" level="project" />
  90 + <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.0" level="project" />
917 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.9.2.RELEASE" level="project" /> 91 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.9.2.RELEASE" level="project" />
918 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.11.2.RELEASE" level="project" /> 92 <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.11.2.RELEASE" level="project" />
919 <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.1.9.RELEASE" level="project" /> 93 <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.1.9.RELEASE" level="project" />
@@ -937,7 +111,7 @@ @@ -937,7 +111,7 @@
937 <orderEntry type="module-library"> 111 <orderEntry type="module-library">
938 <library name="Maven: com.alibaba:jconsole:1.8.0"> 112 <library name="Maven: com.alibaba:jconsole:1.8.0">
939 <CLASSES> 113 <CLASSES>
940 - <root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_74.jdk/Contents/Home/lib/jconsole.jar!/" /> 114 + <root url="jar://D:/Java/jdk/lib/jconsole.jar!/" />
941 </CLASSES> 115 </CLASSES>
942 <JAVADOC /> 116 <JAVADOC />
943 <SOURCES /> 117 <SOURCES />
@@ -946,7 +120,7 @@ @@ -946,7 +120,7 @@
946 <orderEntry type="module-library"> 120 <orderEntry type="module-library">
947 <library name="Maven: com.alibaba:tools:1.8.0"> 121 <library name="Maven: com.alibaba:tools:1.8.0">
948 <CLASSES> 122 <CLASSES>
949 - <root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_74.jdk/Contents/Home/lib/tools.jar!/" /> 123 + <root url="jar://D:/Java/jdk/lib/tools.jar!/" />
950 </CLASSES> 124 </CLASSES>
951 <JAVADOC /> 125 <JAVADOC />
952 <SOURCES /> 126 <SOURCES />
@@ -979,15 +153,13 @@ @@ -979,15 +153,13 @@
979 <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" /> 153 <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
980 <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" /> 154 <orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
981 <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" /> 155 <orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
982 - <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" /> 156 + <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
983 <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.14" level="project" /> 157 <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.14" level="project" />
984 <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.14" level="project" /> 158 <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.14" level="project" />
985 <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" /> 159 <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
986 <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" /> 160 <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
987 <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.03" level="project" /> 161 <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.03" level="project" />
988 <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" /> 162 <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
989 - <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />  
990 - <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />  
991 <orderEntry type="library" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" /> 163 <orderEntry type="library" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" />
992 <orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8" level="project" /> 164 <orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8" level="project" />
993 <orderEntry type="library" name="Maven: commons-chain:commons-chain:1.1" level="project" /> 165 <orderEntry type="library" name="Maven: commons-chain:commons-chain:1.1" level="project" />
@@ -997,5 +169,17 @@ @@ -997,5 +169,17 @@
997 <orderEntry type="library" name="Maven: org.apache.struts:struts-core:1.3.8" level="project" /> 169 <orderEntry type="library" name="Maven: org.apache.struts:struts-core:1.3.8" level="project" />
998 <orderEntry type="library" name="Maven: org.apache.struts:struts-taglib:1.3.8" level="project" /> 170 <orderEntry type="library" name="Maven: org.apache.struts:struts-taglib:1.3.8" level="project" />
999 <orderEntry type="library" name="Maven: org.apache.struts:struts-tiles:1.3.8" level="project" /> 171 <orderEntry type="library" name="Maven: org.apache.struts:struts-tiles:1.3.8" level="project" />
  172 + <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.6.2" level="project" />
  173 + <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
  174 + <orderEntry type="library" name="Maven: redis.clients:jedis:2.1.0" level="project" />
  175 + <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.5" level="project" />
  176 + <orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.7" level="project" />
  177 + <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.7" level="project" />
  178 + <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.0" level="project" />
  179 + <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
  180 + <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
  181 + <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.2" level="project" />
  182 + <orderEntry type="library" name="Maven: com.jfinal:jfinal:3.4" level="project" />
  183 + <orderEntry type="library" name="Maven: cglib:cglib-nodep:3.2.5" level="project" />
1000 </component> 184 </component>
1001 </module> 185 </module>
@@ -15,11 +15,14 @@ import javax.annotation.Resource; @@ -15,11 +15,14 @@ import javax.annotation.Resource;
15 import javax.servlet.http.HttpServletRequest; 15 import javax.servlet.http.HttpServletRequest;
16 import javax.servlet.http.HttpServletResponse; 16 import javax.servlet.http.HttpServletResponse;
17 17
  18 +import com.agent.service.system.UserService;
  19 +import com.agent.vo.agent.ManifestVo;
18 import org.apache.commons.collections.CollectionUtils; 20 import org.apache.commons.collections.CollectionUtils;
19 import org.apache.commons.lang.StringUtils; 21 import org.apache.commons.lang.StringUtils;
20 import org.apache.shiro.SecurityUtils; 22 import org.apache.shiro.SecurityUtils;
21 import org.slf4j.Logger; 23 import org.slf4j.Logger;
22 import org.slf4j.LoggerFactory; 24 import org.slf4j.LoggerFactory;
  25 +import org.springframework.beans.factory.annotation.Autowired;
23 import org.springframework.stereotype.Controller; 26 import org.springframework.stereotype.Controller;
24 import org.springframework.ui.Model; 27 import org.springframework.ui.Model;
25 import org.springframework.web.bind.annotation.RequestMapping; 28 import org.springframework.web.bind.annotation.RequestMapping;
@@ -139,6 +142,9 @@ public class ManifestController extends BasicController { @@ -139,6 +142,9 @@ public class ManifestController extends BasicController {
139 @Resource 142 @Resource
140 private WaybillReceiptService receiptService; 143 private WaybillReceiptService receiptService;
141 144
  145 + @Resource
  146 + private UserService userService;
  147 +
142 private BasicAgentEntity getAgent() { 148 private BasicAgentEntity getAgent() {
143 UserEntity user = Tools.getUserEntity(); 149 UserEntity user = Tools.getUserEntity();
144 long agent_id = user.getAgent(); 150 long agent_id = user.getAgent();
@@ -509,7 +515,7 @@ public class ManifestController extends BasicController { @@ -509,7 +515,7 @@ public class ManifestController extends BasicController {
509 */ 515 */
510 @RequestMapping(value = "/grid.json") 516 @RequestMapping(value = "/grid.json")
511 @ResponseBody 517 @ResponseBody
512 - public DataGrid<ManifestEntity> grid(HttpServletRequest request, EasyPage<ManifestEntity> pageForm) { 518 + public DataGrid<ManifestVo> grid(HttpServletRequest request, EasyPage<ManifestEntity> pageForm) {
513 Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_"); 519 Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
514 // searchParams.put("EQ_isdelete", 0); 520 // searchParams.put("EQ_isdelete", 0);
515 pageForm.setSearchParams(searchParams); 521 pageForm.setSearchParams(searchParams);
@@ -527,7 +533,95 @@ public class ManifestController extends BasicController { @@ -527,7 +533,95 @@ public class ManifestController extends BasicController {
527 } 533 }
528 534
529 pageForm.parseData(manifestService.getPage(pageForm)); 535 pageForm.parseData(manifestService.getPage(pageForm));
530 - return pageForm.getData(); 536 + //
  537 + DataGrid<ManifestEntity> manis = pageForm.getData();
  538 + List<ManifestVo> manifestVos = new ArrayList<>();
  539 + for (ManifestEntity mani : manis.getRows()){
  540 + ManifestVo manifestVo = new ManifestVo();
  541 + manifestVo.setUnlodingcode(mani.getUnlodingcode());
  542 + manifestVo.setCnecusid(mani.getCnecusid());
  543 + manifestVo.setShpcusid(mani.getShpcusid());
  544 + manifestVo.setShpaeo(mani.getShpaeo());
  545 + manifestVo.setCneaeo(mani.getCneaeo());
  546 + manifestVo.setFlightno(mani.getFlightno());
  547 + manifestVo.setFlightdate(mani.getFlightdate());
  548 + manifestVo.setOriginatingstation(mani.getOriginatingstation());
  549 + manifestVo.setDestinationstation(mani.getDestinationstation());
  550 + manifestVo.setWaybillnomaster(mani.getWaybillnomaster());
  551 + manifestVo.setTotalweight(mani.getTotalweight());
  552 + manifestVo.setTotalpiece(mani.getTotalpiece());
  553 + manifestVo.setPreparetotalpiece(mani.getPreparetotalpiece());
  554 + manifestVo.setPreparetotalweight(mani.getPreparetotalweight());
  555 + manifestVo.setAgentcompanycode(mani.getAgentcompanycode());
  556 + manifestVo.setStowagedate(mani.getStowagedate());
  557 + manifestVo.setStatus(mani.getStatus());
  558 + manifestVo.setCarrier(mani.getCarrier());
  559 + manifestVo.setCustomsstatus(mani.getCustomsstatus());
  560 + manifestVo.setPaymode(mani.getPaymode());
  561 + manifestVo.setSpecialgoodscode(mani.getSpecialgoodscode());
  562 + manifestVo.setCustomscode(mani.getCustomscode());
  563 + manifestVo.setAgentman(mani.getAgentman());
  564 + manifestVo.setAgentcompany(mani.getAgentcompany());
  565 + manifestVo.setReceiptinformation(mani.getReceiptinformation());
  566 + manifestVo.setCreatedate(mani.getCreatedate());
  567 + manifestVo.setProductname(mani.getProductname());
  568 + manifestVo.setUnnumber(mani.getUnnumber());
  569 + manifestVo.setCategory(mani.getCategory());
  570 + manifestVo.setSh_company(mani.getSh_company());
  571 + manifestVo.setSh_address(mani.getSh_address());
  572 + manifestVo.setSh_zipcode(mani.getSh_zipcode());
  573 + manifestVo.setSh_city(mani.getSh_city());
  574 + manifestVo.setSh_deltaname(mani.getSh_deltaname());
  575 + manifestVo.setSh_country(mani.getSh_country());
  576 + manifestVo.setSh_telephone(mani.getSh_telephone());
  577 + manifestVo.setSh_fax(mani.getSh_fax());
  578 + manifestVo.setSh_name(mani.getSh_name());
  579 + manifestVo.setCo_company(mani.getCo_company());
  580 + manifestVo.setCo_address(mani.getCo_address());
  581 + manifestVo.setCo_zipcode(mani.getCo_zipcode());
  582 + manifestVo.setCo_city(mani.getCo_city());
  583 + manifestVo.setCo_deltaname(mani.getCo_deltaname());
  584 + manifestVo.setCo_country(mani.getCo_country());
  585 + manifestVo.setCo_telephone(mani.getCo_telephone());
  586 + manifestVo.setCo_fax(mani.getCo_fax());
  587 + manifestVo.setCo_name(mani.getCo_name());
  588 + manifestVo.setReach_station(mani.getReach_station());
  589 + manifestVo.setCarrier1(mani.getCarrier1());
  590 + manifestVo.setReach_station1(mani.getReach_station1());
  591 + manifestVo.setCarrier2(mani.getCarrier2());
  592 + manifestVo.setReach_station2(mani.getReach_station2());
  593 + manifestVo.setName_ofgoods(mani.getName_ofgoods());
  594 + manifestVo.setDelivery_station(mani.getDelivery_station());
  595 + manifestVo.setSh_provincecode(mani.getSh_provincecode());
  596 + manifestVo.setSh_provincename(mani.getSh_provincename());
  597 + manifestVo.setDe_number(mani.getDe_number());
  598 + manifestVo.setDe_weight(mani.getDe_weight());
  599 + manifestVo.setDe_chweight(mani.getDe_chweight());
  600 + manifestVo.setDe_size(mani.getDe_size());
  601 + manifestVo.setDe_volume(mani.getDe_volume());
  602 + manifestVo.setDe_type(mani.getDe_type());
  603 + manifestVo.setDe_trstation(mani.getDe_trstation());
  604 + manifestVo.setDe_packing(mani.getDe_packing());
  605 + manifestVo.setDe_remarks(mani.getDe_remarks());
  606 + manifestVo.setDe_ids(mani.getDe_ids());
  607 + manifestVo.setResponse_code(mani.getResponse_code());
  608 + manifestVo.setResponse_text(mani.getResponse_text());
  609 + manifestVo.setSave_time(mani.getSave_time());
  610 + manifestVo.setUSER_ID(mani.getUSER_ID());
  611 +
  612 + if(mani.getUSER_ID() != null){
  613 + UserEntity one = userService.findOne(mani.getUSER_ID());
  614 + manifestVo.setLoginaccount(one.getLoginaccount());
  615 + BasicAgentEntity one1 = agentService.findOne(one.getAgent());
  616 + manifestVo.setAgentCode(one1.getThreeCode());
  617 + }
  618 + manifestVos.add(manifestVo);
  619 + }
  620 + DataGrid<ManifestVo> vo = new DataGrid<>();
  621 + vo.setRows(manifestVos);
  622 + vo.setTotal(manis.getTotal());
  623 +// return pageForm.getData();
  624 + return vo;
531 } 625 }
532 626
533 /** 627 /**
@@ -1238,12 +1332,12 @@ public class ManifestController extends BasicController { @@ -1238,12 +1332,12 @@ public class ManifestController extends BasicController {
1238 return model; 1332 return model;
1239 } 1333 }
1240 1334
1241 - /**  
1242 - * 子单提交表单保存并且发送报文  
1243 - *  
1244 - * @param manifest  
1245 - * @return  
1246 - */ 1335 + /**
  1336 + * 子单提交表单保存并且发送报文
  1337 + * @param preparesecondary
  1338 + * @param request
  1339 + * @return
  1340 + */
1247 @RequestMapping(value = "/presavesend", method = { RequestMethod.POST }) 1341 @RequestMapping(value = "/presavesend", method = { RequestMethod.POST })
1248 @ResponseBody 1342 @ResponseBody
1249 public ResponseModel presavesend(PreparesecondaryEntity preparesecondary, HttpServletRequest request) { 1343 public ResponseModel presavesend(PreparesecondaryEntity preparesecondary, HttpServletRequest request) {
  1 +package com.agent.vo.agent;
  2 +
  3 +import java.util.Date;
  4 +
  5 +/**
  6 + * @Auther: shenhl
  7 + * @Date: 2019/3/12 09:47
  8 + */
  9 +public class ManifestVo {
  10 +
  11 + private String unlodingcode;// 卸货地代码
  12 + private String cnecusid;// 收货人代码
  13 + private String shpcusid;// 发货人代码
  14 + /**
  15 + * 发货人aeo
  16 + */
  17 + private String shpaeo;
  18 + /**
  19 + * 收货人aeo
  20 + */
  21 + private String cneaeo;
  22 + /**
  23 + * 航班号
  24 + */
  25 + private String flightno;
  26 + /**
  27 + * 航班日期
  28 + */
  29 + private Date flightdate;
  30 + /**
  31 + * 起始地
  32 + */
  33 + private String originatingstation;
  34 + /**
  35 + * 目的地
  36 + */
  37 + private String destinationstation;
  38 + /**
  39 + * 主单号
  40 + */
  41 + private String waybillnomaster;
  42 + /**
  43 + * 总重量
  44 + */
  45 + private String totalweight;
  46 + /**
  47 + * 总件数
  48 + */
  49 + private String totalpiece;
  50 + /**
  51 + * 舱单件数
  52 + */
  53 + private String preparetotalpiece;
  54 + /**
  55 + * 舱单重量
  56 + */
  57 + private String preparetotalweight;
  58 + /**
  59 + * 代理人代码
  60 + */
  61 + private String agentcompanycode;
  62 + /**
  63 + * 装载日期
  64 + */
  65 + private Date stowagedate;
  66 + /**
  67 + * 状态
  68 + */
  69 + private Integer status;
  70 + /**
  71 + * 承运人
  72 + */
  73 + private String carrier;
  74 + /**
  75 + * 海关状态
  76 + */
  77 + private String customsstatus;
  78 + /**
  79 + * 付费方式
  80 + */
  81 + private String paymode;
  82 + /**
  83 + * 特货代码
  84 + */
  85 + private String specialgoodscode;
  86 + /**
  87 + * 海关关区
  88 + */
  89 + private String customscode;
  90 + /**
  91 + * 代理人
  92 + */
  93 + private String agentman;
  94 + /**
  95 + * 代理人公司
  96 + */
  97 + private String agentcompany;
  98 + /**
  99 + * 回执信息
  100 + */
  101 + private String receiptinformation;
  102 + /**
  103 + * 创建日期
  104 + */
  105 + private Date createdate;
  106 + /**
  107 + * 货物描述
  108 + */
  109 + private String productname;
  110 + /**
  111 + * UN编号
  112 + */
  113 + private String unnumber;
  114 + /**
  115 + * 危险品类别
  116 + */
  117 + private String category;
  118 + /**
  119 + * 收货人公司
  120 + */
  121 + private String sh_company;
  122 + /**
  123 + * 收货人地址
  124 + */
  125 + private String sh_address;
  126 + /**
  127 + * 收货人邮编
  128 + */
  129 + private String sh_zipcode;
  130 + /**
  131 + * 收货人城市
  132 + */
  133 + private String sh_city;
  134 + /**
  135 + * 收货人洲名
  136 + */
  137 + private String sh_deltaname;
  138 + /**
  139 + * 收货人国家名字
  140 + */
  141 + private String sh_country;
  142 + /**
  143 + * 收货人电话
  144 + */
  145 + private String sh_telephone;
  146 + /**
  147 + * 收货人传真
  148 + */
  149 + private String sh_fax;
  150 + /**
  151 + * 收货人名字
  152 + */
  153 + private String sh_name;
  154 + /**
  155 + * 发货人公司
  156 + */
  157 + private String co_company;
  158 + /**
  159 + * 发货人地址
  160 + */
  161 + private String co_address;
  162 + /**
  163 + * 发货人邮编
  164 + */
  165 + private String co_zipcode;
  166 + /**
  167 + * 发货人城市
  168 + */
  169 + private String co_city;
  170 + /**
  171 + * 发货人洲名
  172 + */
  173 + private String co_deltaname;
  174 + /**
  175 + * 发货人国家名字
  176 + */
  177 + private String co_country;
  178 + /**
  179 + * 发货人电话
  180 + */
  181 + private String co_telephone;
  182 + /**
  183 + * 发货人传真
  184 + */
  185 + private String co_fax;
  186 + /**
  187 + * 发货人名字
  188 + */
  189 + private String co_name;
  190 + /**
  191 + * 到达站
  192 + */
  193 + private String reach_station;
  194 + /**
  195 + * 承运人
  196 + */
  197 + private String carrier1;
  198 + /**
  199 + * 到达站
  200 + */
  201 + private String reach_station1;
  202 + /**
  203 + * 承运人
  204 + */
  205 + private String carrier2;
  206 + /**
  207 + * 到达站
  208 + */
  209 + private String reach_station2;
  210 + /**
  211 + * 货物品名
  212 + */
  213 + private String name_ofgoods;
  214 + /**
  215 + * 交运货站
  216 + */
  217 + private String delivery_station;
  218 + /**
  219 + * 收货人省份代码
  220 + */
  221 + private String sh_provincecode;
  222 + /**
  223 + * 收货人省份
  224 + */
  225 + private String sh_provincename;
  226 + /**
  227 + * 交运件数
  228 + */
  229 + private String de_number;
  230 + /**
  231 + * 交运重量
  232 + */
  233 + private String de_weight;
  234 + /**
  235 + * 交运计费重量
  236 + */
  237 + private String de_chweight;
  238 + /**
  239 + * 交运体尺寸
  240 + */
  241 + private String de_size;
  242 + /**
  243 + * 交运体积
  244 + */
  245 + private String de_volume;
  246 + /**
  247 + * 交运类型
  248 + */
  249 + private String de_type;
  250 + /**
  251 + * 交运中转站
  252 + */
  253 + private String de_trstation;
  254 + /**
  255 + * 交运包装信息
  256 + */
  257 + private String de_packing;
  258 + /**
  259 + * 交运备注
  260 + */
  261 + private String de_remarks;
  262 + /**
  263 + * 交运发送状态 1发送
  264 + */
  265 + private Integer de_ids;
  266 + /*
  267 + * 回执代码
  268 + */
  269 + private String response_code;
  270 + /*
  271 + * 回执状态文本
  272 + */
  273 + private String response_text;
  274 + private Long save_time;
  275 + private Long USER_ID;//报文所属的用户id
  276 +
  277 + //BasicAgentEntity 货代 代理人三字码
  278 + private String agentCode;
  279 +
  280 + //UserEntity 用户账号
  281 + private String loginaccount;
  282 +
  283 + public String getUnlodingcode() {
  284 + return unlodingcode;
  285 + }
  286 +
  287 + public void setUnlodingcode(String unlodingcode) {
  288 + this.unlodingcode = unlodingcode;
  289 + }
  290 +
  291 + public String getCnecusid() {
  292 + return cnecusid;
  293 + }
  294 +
  295 + public void setCnecusid(String cnecusid) {
  296 + this.cnecusid = cnecusid;
  297 + }
  298 +
  299 + public String getShpcusid() {
  300 + return shpcusid;
  301 + }
  302 +
  303 + public void setShpcusid(String shpcusid) {
  304 + this.shpcusid = shpcusid;
  305 + }
  306 +
  307 + public String getShpaeo() {
  308 + return shpaeo;
  309 + }
  310 +
  311 + public void setShpaeo(String shpaeo) {
  312 + this.shpaeo = shpaeo;
  313 + }
  314 +
  315 + public String getCneaeo() {
  316 + return cneaeo;
  317 + }
  318 +
  319 + public void setCneaeo(String cneaeo) {
  320 + this.cneaeo = cneaeo;
  321 + }
  322 +
  323 + public String getFlightno() {
  324 + return flightno;
  325 + }
  326 +
  327 + public void setFlightno(String flightno) {
  328 + this.flightno = flightno;
  329 + }
  330 +
  331 + public Date getFlightdate() {
  332 + return flightdate;
  333 + }
  334 +
  335 + public void setFlightdate(Date flightdate) {
  336 + this.flightdate = flightdate;
  337 + }
  338 +
  339 + public String getOriginatingstation() {
  340 + return originatingstation;
  341 + }
  342 +
  343 + public void setOriginatingstation(String originatingstation) {
  344 + this.originatingstation = originatingstation;
  345 + }
  346 +
  347 + public String getDestinationstation() {
  348 + return destinationstation;
  349 + }
  350 +
  351 + public void setDestinationstation(String destinationstation) {
  352 + this.destinationstation = destinationstation;
  353 + }
  354 +
  355 + public String getWaybillnomaster() {
  356 + return waybillnomaster;
  357 + }
  358 +
  359 + public void setWaybillnomaster(String waybillnomaster) {
  360 + this.waybillnomaster = waybillnomaster;
  361 + }
  362 +
  363 + public String getTotalweight() {
  364 + return totalweight;
  365 + }
  366 +
  367 + public void setTotalweight(String totalweight) {
  368 + this.totalweight = totalweight;
  369 + }
  370 +
  371 + public String getTotalpiece() {
  372 + return totalpiece;
  373 + }
  374 +
  375 + public void setTotalpiece(String totalpiece) {
  376 + this.totalpiece = totalpiece;
  377 + }
  378 +
  379 + public String getPreparetotalpiece() {
  380 + return preparetotalpiece;
  381 + }
  382 +
  383 + public void setPreparetotalpiece(String preparetotalpiece) {
  384 + this.preparetotalpiece = preparetotalpiece;
  385 + }
  386 +
  387 + public String getPreparetotalweight() {
  388 + return preparetotalweight;
  389 + }
  390 +
  391 + public void setPreparetotalweight(String preparetotalweight) {
  392 + this.preparetotalweight = preparetotalweight;
  393 + }
  394 +
  395 + public String getAgentcompanycode() {
  396 + return agentcompanycode;
  397 + }
  398 +
  399 + public void setAgentcompanycode(String agentcompanycode) {
  400 + this.agentcompanycode = agentcompanycode;
  401 + }
  402 +
  403 + public Date getStowagedate() {
  404 + return stowagedate;
  405 + }
  406 +
  407 + public void setStowagedate(Date stowagedate) {
  408 + this.stowagedate = stowagedate;
  409 + }
  410 +
  411 + public Integer getStatus() {
  412 + return status;
  413 + }
  414 +
  415 + public void setStatus(Integer status) {
  416 + this.status = status;
  417 + }
  418 +
  419 + public String getCarrier() {
  420 + return carrier;
  421 + }
  422 +
  423 + public void setCarrier(String carrier) {
  424 + this.carrier = carrier;
  425 + }
  426 +
  427 + public String getCustomsstatus() {
  428 + return customsstatus;
  429 + }
  430 +
  431 + public void setCustomsstatus(String customsstatus) {
  432 + this.customsstatus = customsstatus;
  433 + }
  434 +
  435 + public String getPaymode() {
  436 + return paymode;
  437 + }
  438 +
  439 + public void setPaymode(String paymode) {
  440 + this.paymode = paymode;
  441 + }
  442 +
  443 + public String getSpecialgoodscode() {
  444 + return specialgoodscode;
  445 + }
  446 +
  447 + public void setSpecialgoodscode(String specialgoodscode) {
  448 + this.specialgoodscode = specialgoodscode;
  449 + }
  450 +
  451 + public String getCustomscode() {
  452 + return customscode;
  453 + }
  454 +
  455 + public void setCustomscode(String customscode) {
  456 + this.customscode = customscode;
  457 + }
  458 +
  459 + public String getAgentman() {
  460 + return agentman;
  461 + }
  462 +
  463 + public void setAgentman(String agentman) {
  464 + this.agentman = agentman;
  465 + }
  466 +
  467 + public String getAgentcompany() {
  468 + return agentcompany;
  469 + }
  470 +
  471 + public void setAgentcompany(String agentcompany) {
  472 + this.agentcompany = agentcompany;
  473 + }
  474 +
  475 + public String getReceiptinformation() {
  476 + return receiptinformation;
  477 + }
  478 +
  479 + public void setReceiptinformation(String receiptinformation) {
  480 + this.receiptinformation = receiptinformation;
  481 + }
  482 +
  483 + public Date getCreatedate() {
  484 + return createdate;
  485 + }
  486 +
  487 + public void setCreatedate(Date createdate) {
  488 + this.createdate = createdate;
  489 + }
  490 +
  491 + public String getProductname() {
  492 + return productname;
  493 + }
  494 +
  495 + public void setProductname(String productname) {
  496 + this.productname = productname;
  497 + }
  498 +
  499 + public String getUnnumber() {
  500 + return unnumber;
  501 + }
  502 +
  503 + public void setUnnumber(String unnumber) {
  504 + this.unnumber = unnumber;
  505 + }
  506 +
  507 + public String getCategory() {
  508 + return category;
  509 + }
  510 +
  511 + public void setCategory(String category) {
  512 + this.category = category;
  513 + }
  514 +
  515 + public String getSh_company() {
  516 + return sh_company;
  517 + }
  518 +
  519 + public void setSh_company(String sh_company) {
  520 + this.sh_company = sh_company;
  521 + }
  522 +
  523 + public String getSh_address() {
  524 + return sh_address;
  525 + }
  526 +
  527 + public void setSh_address(String sh_address) {
  528 + this.sh_address = sh_address;
  529 + }
  530 +
  531 + public String getSh_zipcode() {
  532 + return sh_zipcode;
  533 + }
  534 +
  535 + public void setSh_zipcode(String sh_zipcode) {
  536 + this.sh_zipcode = sh_zipcode;
  537 + }
  538 +
  539 + public String getSh_city() {
  540 + return sh_city;
  541 + }
  542 +
  543 + public void setSh_city(String sh_city) {
  544 + this.sh_city = sh_city;
  545 + }
  546 +
  547 + public String getSh_deltaname() {
  548 + return sh_deltaname;
  549 + }
  550 +
  551 + public void setSh_deltaname(String sh_deltaname) {
  552 + this.sh_deltaname = sh_deltaname;
  553 + }
  554 +
  555 + public String getSh_country() {
  556 + return sh_country;
  557 + }
  558 +
  559 + public void setSh_country(String sh_country) {
  560 + this.sh_country = sh_country;
  561 + }
  562 +
  563 + public String getSh_telephone() {
  564 + return sh_telephone;
  565 + }
  566 +
  567 + public void setSh_telephone(String sh_telephone) {
  568 + this.sh_telephone = sh_telephone;
  569 + }
  570 +
  571 + public String getSh_fax() {
  572 + return sh_fax;
  573 + }
  574 +
  575 + public void setSh_fax(String sh_fax) {
  576 + this.sh_fax = sh_fax;
  577 + }
  578 +
  579 + public String getSh_name() {
  580 + return sh_name;
  581 + }
  582 +
  583 + public void setSh_name(String sh_name) {
  584 + this.sh_name = sh_name;
  585 + }
  586 +
  587 + public String getCo_company() {
  588 + return co_company;
  589 + }
  590 +
  591 + public void setCo_company(String co_company) {
  592 + this.co_company = co_company;
  593 + }
  594 +
  595 + public String getCo_address() {
  596 + return co_address;
  597 + }
  598 +
  599 + public void setCo_address(String co_address) {
  600 + this.co_address = co_address;
  601 + }
  602 +
  603 + public String getCo_zipcode() {
  604 + return co_zipcode;
  605 + }
  606 +
  607 + public void setCo_zipcode(String co_zipcode) {
  608 + this.co_zipcode = co_zipcode;
  609 + }
  610 +
  611 + public String getCo_city() {
  612 + return co_city;
  613 + }
  614 +
  615 + public void setCo_city(String co_city) {
  616 + this.co_city = co_city;
  617 + }
  618 +
  619 + public String getCo_deltaname() {
  620 + return co_deltaname;
  621 + }
  622 +
  623 + public void setCo_deltaname(String co_deltaname) {
  624 + this.co_deltaname = co_deltaname;
  625 + }
  626 +
  627 + public String getCo_country() {
  628 + return co_country;
  629 + }
  630 +
  631 + public void setCo_country(String co_country) {
  632 + this.co_country = co_country;
  633 + }
  634 +
  635 + public String getCo_telephone() {
  636 + return co_telephone;
  637 + }
  638 +
  639 + public void setCo_telephone(String co_telephone) {
  640 + this.co_telephone = co_telephone;
  641 + }
  642 +
  643 + public String getCo_fax() {
  644 + return co_fax;
  645 + }
  646 +
  647 + public void setCo_fax(String co_fax) {
  648 + this.co_fax = co_fax;
  649 + }
  650 +
  651 + public String getCo_name() {
  652 + return co_name;
  653 + }
  654 +
  655 + public void setCo_name(String co_name) {
  656 + this.co_name = co_name;
  657 + }
  658 +
  659 + public String getReach_station() {
  660 + return reach_station;
  661 + }
  662 +
  663 + public void setReach_station(String reach_station) {
  664 + this.reach_station = reach_station;
  665 + }
  666 +
  667 + public String getCarrier1() {
  668 + return carrier1;
  669 + }
  670 +
  671 + public void setCarrier1(String carrier1) {
  672 + this.carrier1 = carrier1;
  673 + }
  674 +
  675 + public String getReach_station1() {
  676 + return reach_station1;
  677 + }
  678 +
  679 + public void setReach_station1(String reach_station1) {
  680 + this.reach_station1 = reach_station1;
  681 + }
  682 +
  683 + public String getCarrier2() {
  684 + return carrier2;
  685 + }
  686 +
  687 + public void setCarrier2(String carrier2) {
  688 + this.carrier2 = carrier2;
  689 + }
  690 +
  691 + public String getReach_station2() {
  692 + return reach_station2;
  693 + }
  694 +
  695 + public void setReach_station2(String reach_station2) {
  696 + this.reach_station2 = reach_station2;
  697 + }
  698 +
  699 + public String getName_ofgoods() {
  700 + return name_ofgoods;
  701 + }
  702 +
  703 + public void setName_ofgoods(String name_ofgoods) {
  704 + this.name_ofgoods = name_ofgoods;
  705 + }
  706 +
  707 + public String getDelivery_station() {
  708 + return delivery_station;
  709 + }
  710 +
  711 + public void setDelivery_station(String delivery_station) {
  712 + this.delivery_station = delivery_station;
  713 + }
  714 +
  715 + public String getSh_provincecode() {
  716 + return sh_provincecode;
  717 + }
  718 +
  719 + public void setSh_provincecode(String sh_provincecode) {
  720 + this.sh_provincecode = sh_provincecode;
  721 + }
  722 +
  723 + public String getSh_provincename() {
  724 + return sh_provincename;
  725 + }
  726 +
  727 + public void setSh_provincename(String sh_provincename) {
  728 + this.sh_provincename = sh_provincename;
  729 + }
  730 +
  731 + public String getDe_number() {
  732 + return de_number;
  733 + }
  734 +
  735 + public void setDe_number(String de_number) {
  736 + this.de_number = de_number;
  737 + }
  738 +
  739 + public String getDe_weight() {
  740 + return de_weight;
  741 + }
  742 +
  743 + public void setDe_weight(String de_weight) {
  744 + this.de_weight = de_weight;
  745 + }
  746 +
  747 + public String getDe_chweight() {
  748 + return de_chweight;
  749 + }
  750 +
  751 + public void setDe_chweight(String de_chweight) {
  752 + this.de_chweight = de_chweight;
  753 + }
  754 +
  755 + public String getDe_size() {
  756 + return de_size;
  757 + }
  758 +
  759 + public void setDe_size(String de_size) {
  760 + this.de_size = de_size;
  761 + }
  762 +
  763 + public String getDe_volume() {
  764 + return de_volume;
  765 + }
  766 +
  767 + public void setDe_volume(String de_volume) {
  768 + this.de_volume = de_volume;
  769 + }
  770 +
  771 + public String getDe_type() {
  772 + return de_type;
  773 + }
  774 +
  775 + public void setDe_type(String de_type) {
  776 + this.de_type = de_type;
  777 + }
  778 +
  779 + public String getDe_trstation() {
  780 + return de_trstation;
  781 + }
  782 +
  783 + public void setDe_trstation(String de_trstation) {
  784 + this.de_trstation = de_trstation;
  785 + }
  786 +
  787 + public String getDe_packing() {
  788 + return de_packing;
  789 + }
  790 +
  791 + public void setDe_packing(String de_packing) {
  792 + this.de_packing = de_packing;
  793 + }
  794 +
  795 + public String getDe_remarks() {
  796 + return de_remarks;
  797 + }
  798 +
  799 + public void setDe_remarks(String de_remarks) {
  800 + this.de_remarks = de_remarks;
  801 + }
  802 +
  803 + public Integer getDe_ids() {
  804 + return de_ids;
  805 + }
  806 +
  807 + public void setDe_ids(Integer de_ids) {
  808 + this.de_ids = de_ids;
  809 + }
  810 +
  811 + public String getResponse_code() {
  812 + return response_code;
  813 + }
  814 +
  815 + public void setResponse_code(String response_code) {
  816 + this.response_code = response_code;
  817 + }
  818 +
  819 + public String getResponse_text() {
  820 + return response_text;
  821 + }
  822 +
  823 + public void setResponse_text(String response_text) {
  824 + this.response_text = response_text;
  825 + }
  826 +
  827 + public Long getSave_time() {
  828 + return save_time;
  829 + }
  830 +
  831 + public void setSave_time(Long save_time) {
  832 + this.save_time = save_time;
  833 + }
  834 +
  835 + public Long getUSER_ID() {
  836 + return USER_ID;
  837 + }
  838 +
  839 + public void setUSER_ID(Long USER_ID) {
  840 + this.USER_ID = USER_ID;
  841 + }
  842 +
  843 + public String getAgentCode() {
  844 + return agentCode;
  845 + }
  846 +
  847 + public void setAgentCode(String agentCode) {
  848 + this.agentCode = agentCode;
  849 + }
  850 +
  851 + public String getLoginaccount() {
  852 + return loginaccount;
  853 + }
  854 +
  855 + public void setLoginaccount(String loginaccount) {
  856 + this.loginaccount = loginaccount;
  857 + }
  858 +}
@@ -433,6 +433,10 @@ manifest.NotifyParty=Notify Party @@ -433,6 +433,10 @@ manifest.NotifyParty=Notify Party
433 manifest.dgContacts=DG Contacts 433 manifest.dgContacts=DG Contacts
434 manifest.goods=Goods 434 manifest.goods=Goods
435 435
  436 +
  437 +manifest.loginaccount=Loginaccount
  438 +manifest.agentCode=AgentCode
  439 +
436 manifest.jf.city=City 440 manifest.jf.city=City
437 manifest.jf.Provincecode=Province Code 441 manifest.jf.Provincecode=Province Code
438 manifest.jf.Provincename=Province Name 442 manifest.jf.Provincename=Province Name
@@ -597,6 +597,8 @@ manifest.packing.information=\u5305\u88c5\u4fe1\u606f @@ -597,6 +597,8 @@ manifest.packing.information=\u5305\u88c5\u4fe1\u606f
597 manifest.Remarks=\u5907\u6ce8 597 manifest.Remarks=\u5907\u6ce8
598 manifest.delivery=\u4fdd\u5b58\u5e76\u53d1\u9001\u5230\u4ea4\u8fd0 598 manifest.delivery=\u4fdd\u5b58\u5e76\u53d1\u9001\u5230\u4ea4\u8fd0
599 manifest.response_text=\u8FD0\u5355\u72B6\u6001 599 manifest.response_text=\u8FD0\u5355\u72B6\u6001
  600 +manifest.loginaccount=\u7528\u6237\u8d26\u53f7
  601 +manifest.agentCode=\u8d27\u4ee3\u4fe1\u606f
600 602
601 manifest.customs_status_001 = \u666E\u901A\u8D27\u7269 603 manifest.customs_status_001 = \u666E\u901A\u8D27\u7269
602 manifest.customs_status_002 = \u56FD\u9645\u8F6C\u8FD0\u8D27\u7269 604 manifest.customs_status_002 = \u56FD\u9645\u8F6C\u8FD0\u8D27\u7269
@@ -37,6 +37,8 @@ @@ -37,6 +37,8 @@
37 <thead> 37 <thead>
38 <tr> 38 <tr>
39 <th field="." formatter="editFormat"><spring:message code="opt.edit" /></th> 39 <th field="." formatter="editFormat"><spring:message code="opt.edit" /></th>
  40 + <th field="loginaccount"><spring:message code="manifest.loginaccount"/></th>
  41 + <th field="agentCode"><spring:message code="manifest.agentCode"/></th>
40 <th field="waybillnomaster" sortable="true"><spring:message code="manifest.bill.number"/></th> 42 <th field="waybillnomaster" sortable="true"><spring:message code="manifest.bill.number"/></th>
41 <th field="customscode"><spring:message code="manifest.customs"/></th> 43 <th field="customscode"><spring:message code="manifest.customs"/></th>
42 <th field="flightno" formatter="appendCarrier"><spring:message code="manifest.flight.number"/></th> 44 <th field="flightno" formatter="appendCarrier"><spring:message code="manifest.flight.number"/></th>
@@ -149,7 +151,7 @@ @@ -149,7 +151,7 @@
149 height:'auto', 151 height:'auto',
150 autoRowHeight:"true", 152 autoRowHeight:"true",
151 columns:[[ 153 columns:[[
152 - {field:'.',title:'<spring:message code="opt.name"/>',formatter:editHbillFormat}, 154 + {field:'.',title:'<spring:message code="opt.name"/>',formatter:editHbillFormat},
153 {field:'waybillnosecondary',title:'<spring:message code="manifest.odd.number"/>'}, 155 {field:'waybillnosecondary',title:'<spring:message code="manifest.odd.number"/>'},
154 {field:'originatingstation',title:'<spring:message code="manifest.starting.point"/>'}, 156 {field:'originatingstation',title:'<spring:message code="manifest.starting.point"/>'},
155 {field:'destinationstation',title:'<spring:message code="manifest.destination"/>'}, 157 {field:'destinationstation',title:'<spring:message code="manifest.destination"/>'},