朱兆平 / agent · 提交

转到一个项目

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

优化针对订单的查询功能

内嵌 并排对比
正在显示 6 个修改的文件 包含 1030 行增加 和 886 行删除
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
<descriptors>
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
</descriptors>
<webroots>
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
</webroots>
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
</sourceRoots>
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="patchca-0.5.0" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$USER_HOME$/Documents/maven/apache-ant-zip.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf_jar/apiConfig.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf_jar/HeartbeatService.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf_jar/IMFClient.1.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf_jar/imfmsg.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf_jar/ProcessService.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf_jar/returnXml.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf_jar/UploadService.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/antlr-2.7.7.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/antlr-3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/antlr-runtime-3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/aopalliance-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/asm-3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/bcprov-jdk15-1.45.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/CL3Export.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/CL3Nonexport.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.axis2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.commonservices.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.defaultconfig.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.fta.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.headers.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.jmqi.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.jmqi.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.jms.Nojndi.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.soap.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.tools.ras.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.postcard.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mqjms.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mqetclient.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/com.ibm.mq.pcf.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/commons-collections-3.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/commons-lang-2.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/commons-logging-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/commons-pool-1.5.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/connector.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/cxf-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/cxf-xjc-boolean-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/cxf-xjc-bug671-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/cxf-xjc-dv-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/cxf-xjc-ts-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/dhbcore.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/FastInfoset-1.2.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/fscontext.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/geronimo-activation_1.1_spec-1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/geronimo-annotation_1.0_spec-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/geronimo-javamail_1.4_spec-1.7.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/geronimo-jaxws_2.2_spec-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/geronimo-jms_1.1_spec-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/geronimo-servlet_3.0_spec-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/geronimo-stax-api_1.0_spec-1.0.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/geronimo-ws-metadata_2.0_spec-1.1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/jaxb-api-2.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/jaxb-impl-2.2.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/jaxb-xjc-2.2.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/../../jar/imf/jaxb-xjc-2.2.1.1.jar!/1.0" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/jettison-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/jetty-continuation-7.2.2.v20101205.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/jetty-http-7.2.2.v20101205.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/jetty-io-7.2.2.v20101205.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/jetty-server-7.2.2.v20101205.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/jetty-util-7.2.2.v20101205.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/jms.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/jndi.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/jra-1.0-alpha-4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/js-1.7R2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/jsr173_1.0_api.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/jsr311-api-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/jta.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/ldap.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/neethi-2.0.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/oro-2.0.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/providerutil.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/resolver.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/rmm.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/saaj-api-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/saaj-impl-1.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/serializer-2.7.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/sigar.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/stax2-api-3.0.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/stringtemplate-3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/velocity-1.6.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/woodstox-core-asl-4.0.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/wsdl4j-1.6.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/wss4j-1.5.11.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/xalan-2.7.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/xbean.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/xbean_xpath.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/xml-resolver-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/xmlbeans-2.4.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/xmlbeans-qname.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/xmlpublic.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/XmlSchema-1.4.7.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../jar/imf/xmlsec-1.4.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:2.7.11" level="project" />
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<descriptors>
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
</descriptors>
<webroots>
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
</webroots>
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
</sourceRoots>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="imf" level="project" />
<orderEntry type="library" name="jiguang" level="project" />
<orderEntry type="library" name="lib" level="project" />
<orderEntry type="library" name="lib1" level="project" />
<orderEntry type="library" name="lib2" level="project" />
<orderEntry type="library" name="libhttp" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:2.7.5" level="project" />
<orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
<orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-api:2.7.11" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.2.1" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.1.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-api:2.7.5" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.2.0" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-javamail_1.4_spec:1.7.1" level="project" />
<orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-core:2.7.11" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.1.13" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:2.7.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:2.7.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:2.7.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:2.7.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:2.7.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:2.7.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-core:2.7.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:2.7.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:2.7.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:2.7.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:2.7.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:2.7.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:2.7.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:2.7.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-security:2.7.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.ws.security:wss4j:1.6.10" level="project" />
... ... @@ -894,6 +65,7 @@
<orderEntry type="library" name="Maven: javax.transaction:jta:1.1" level="project" />
<orderEntry type="library" name="Maven: jstl:jstl:1.2" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.16" level="project" />
<orderEntry type="library" name="Maven: org.jdom:jdom:1.1.3" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
... ... @@ -902,6 +74,7 @@
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.5" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.4.RELEASE" level="project" />
... ... @@ -914,6 +87,7 @@
<orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.9.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.11.2.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-orm:4.1.9.RELEASE" level="project" />
... ... @@ -937,7 +111,7 @@
<orderEntry type="module-library">
<library name="Maven: com.alibaba:jconsole:1.8.0">
<CLASSES>
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_74.jdk/Contents/Home/lib/jconsole.jar!/" />
<root url="jar://D:/Java/jdk/lib/jconsole.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
... ... @@ -946,7 +120,7 @@
<orderEntry type="module-library">
<library name="Maven: com.alibaba:tools:1.8.0">
<CLASSES>
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_74.jdk/Contents/Home/lib/tools.jar!/" />
<root url="jar://D:/Java/jdk/lib/tools.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
... ... @@ -979,15 +153,13 @@
<orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.14" level="project" />
<orderEntry type="library" name="Maven: javax.mail:mail:1.4" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.14" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.14" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.03" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" />
<orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8" level="project" />
<orderEntry type="library" name="Maven: commons-chain:commons-chain:1.1" level="project" />
... ... @@ -997,5 +169,17 @@
<orderEntry type="library" name="Maven: org.apache.struts:struts-core:1.3.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.struts:struts-taglib:1.3.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.struts:struts-tiles:1.3.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.6.2" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
<orderEntry type="library" name="Maven: redis.clients:jedis:2.1.0" level="project" />
<orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.7" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.2" level="project" />
<orderEntry type="library" name="Maven: com.jfinal:jfinal:3.4" level="project" />
<orderEntry type="library" name="Maven: cglib:cglib-nodep:3.2.5" level="project" />
</component>
</module>
\ No newline at end of file
... ...
... ... @@ -15,11 +15,14 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.agent.service.system.UserService;
import com.agent.vo.agent.ManifestVo;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
... ... @@ -139,6 +142,9 @@ public class ManifestController extends BasicController {
@Resource
private WaybillReceiptService receiptService;
@Resource
private UserService userService;
private BasicAgentEntity getAgent() {
UserEntity user = Tools.getUserEntity();
long agent_id = user.getAgent();
... ... @@ -509,7 +515,7 @@ public class ManifestController extends BasicController {
*/
@RequestMapping(value = "/grid.json")
@ResponseBody
public DataGrid<ManifestEntity> grid(HttpServletRequest request, EasyPage<ManifestEntity> pageForm) {
public DataGrid<ManifestVo> grid(HttpServletRequest request, EasyPage<ManifestEntity> pageForm) {
Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
// searchParams.put("EQ_isdelete", 0);
pageForm.setSearchParams(searchParams);
... ... @@ -527,7 +533,95 @@ public class ManifestController extends BasicController {
}
pageForm.parseData(manifestService.getPage(pageForm));
return pageForm.getData();
//
DataGrid<ManifestEntity> manis = pageForm.getData();
List<ManifestVo> manifestVos = new ArrayList<>();
for (ManifestEntity mani : manis.getRows()){
ManifestVo manifestVo = new ManifestVo();
manifestVo.setUnlodingcode(mani.getUnlodingcode());
manifestVo.setCnecusid(mani.getCnecusid());
manifestVo.setShpcusid(mani.getShpcusid());
manifestVo.setShpaeo(mani.getShpaeo());
manifestVo.setCneaeo(mani.getCneaeo());
manifestVo.setFlightno(mani.getFlightno());
manifestVo.setFlightdate(mani.getFlightdate());
manifestVo.setOriginatingstation(mani.getOriginatingstation());
manifestVo.setDestinationstation(mani.getDestinationstation());
manifestVo.setWaybillnomaster(mani.getWaybillnomaster());
manifestVo.setTotalweight(mani.getTotalweight());
manifestVo.setTotalpiece(mani.getTotalpiece());
manifestVo.setPreparetotalpiece(mani.getPreparetotalpiece());
manifestVo.setPreparetotalweight(mani.getPreparetotalweight());
manifestVo.setAgentcompanycode(mani.getAgentcompanycode());
manifestVo.setStowagedate(mani.getStowagedate());
manifestVo.setStatus(mani.getStatus());
manifestVo.setCarrier(mani.getCarrier());
manifestVo.setCustomsstatus(mani.getCustomsstatus());
manifestVo.setPaymode(mani.getPaymode());
manifestVo.setSpecialgoodscode(mani.getSpecialgoodscode());
manifestVo.setCustomscode(mani.getCustomscode());
manifestVo.setAgentman(mani.getAgentman());
manifestVo.setAgentcompany(mani.getAgentcompany());
manifestVo.setReceiptinformation(mani.getReceiptinformation());
manifestVo.setCreatedate(mani.getCreatedate());
manifestVo.setProductname(mani.getProductname());
manifestVo.setUnnumber(mani.getUnnumber());
manifestVo.setCategory(mani.getCategory());
manifestVo.setSh_company(mani.getSh_company());
manifestVo.setSh_address(mani.getSh_address());
manifestVo.setSh_zipcode(mani.getSh_zipcode());
manifestVo.setSh_city(mani.getSh_city());
manifestVo.setSh_deltaname(mani.getSh_deltaname());
manifestVo.setSh_country(mani.getSh_country());
manifestVo.setSh_telephone(mani.getSh_telephone());
manifestVo.setSh_fax(mani.getSh_fax());
manifestVo.setSh_name(mani.getSh_name());
manifestVo.setCo_company(mani.getCo_company());
manifestVo.setCo_address(mani.getCo_address());
manifestVo.setCo_zipcode(mani.getCo_zipcode());
manifestVo.setCo_city(mani.getCo_city());
manifestVo.setCo_deltaname(mani.getCo_deltaname());
manifestVo.setCo_country(mani.getCo_country());
manifestVo.setCo_telephone(mani.getCo_telephone());
manifestVo.setCo_fax(mani.getCo_fax());
manifestVo.setCo_name(mani.getCo_name());
manifestVo.setReach_station(mani.getReach_station());
manifestVo.setCarrier1(mani.getCarrier1());
manifestVo.setReach_station1(mani.getReach_station1());
manifestVo.setCarrier2(mani.getCarrier2());
manifestVo.setReach_station2(mani.getReach_station2());
manifestVo.setName_ofgoods(mani.getName_ofgoods());
manifestVo.setDelivery_station(mani.getDelivery_station());
manifestVo.setSh_provincecode(mani.getSh_provincecode());
manifestVo.setSh_provincename(mani.getSh_provincename());
manifestVo.setDe_number(mani.getDe_number());
manifestVo.setDe_weight(mani.getDe_weight());
manifestVo.setDe_chweight(mani.getDe_chweight());
manifestVo.setDe_size(mani.getDe_size());
manifestVo.setDe_volume(mani.getDe_volume());
manifestVo.setDe_type(mani.getDe_type());
manifestVo.setDe_trstation(mani.getDe_trstation());
manifestVo.setDe_packing(mani.getDe_packing());
manifestVo.setDe_remarks(mani.getDe_remarks());
manifestVo.setDe_ids(mani.getDe_ids());
manifestVo.setResponse_code(mani.getResponse_code());
manifestVo.setResponse_text(mani.getResponse_text());
manifestVo.setSave_time(mani.getSave_time());
manifestVo.setUSER_ID(mani.getUSER_ID());
if(mani.getUSER_ID() != null){
UserEntity one = userService.findOne(mani.getUSER_ID());
manifestVo.setLoginaccount(one.getLoginaccount());
BasicAgentEntity one1 = agentService.findOne(one.getAgent());
manifestVo.setAgentCode(one1.getThreeCode());
}
manifestVos.add(manifestVo);
}
DataGrid<ManifestVo> vo = new DataGrid<>();
vo.setRows(manifestVos);
vo.setTotal(manis.getTotal());
// return pageForm.getData();
return vo;
}
/**
... ... @@ -1240,8 +1334,8 @@ public class ManifestController extends BasicController {
/**
* 子单提交表单保存并且发送报文
*
* @param manifest
* @param preparesecondary
* @param request
* @return
*/
@RequestMapping(value = "/presavesend", method = { RequestMethod.POST })
... ...
package com.agent.vo.agent;
import java.util.Date;
/**
* @Auther: shenhl
* @Date: 2019/3/12 09:47
*/
public class ManifestVo {
private String unlodingcode;// 卸货地代码
private String cnecusid;// 收货人代码
private String shpcusid;// 发货人代码
/**
* 发货人aeo
*/
private String shpaeo;
/**
* 收货人aeo
*/
private String cneaeo;
/**
* 航班号
*/
private String flightno;
/**
* 航班日期
*/
private Date flightdate;
/**
* 起始地
*/
private String originatingstation;
/**
* 目的地
*/
private String destinationstation;
/**
* 主单号
*/
private String waybillnomaster;
/**
* 总重量
*/
private String totalweight;
/**
* 总件数
*/
private String totalpiece;
/**
* 舱单件数
*/
private String preparetotalpiece;
/**
* 舱单重量
*/
private String preparetotalweight;
/**
* 代理人代码
*/
private String agentcompanycode;
/**
* 装载日期
*/
private Date stowagedate;
/**
* 状态
*/
private Integer status;
/**
* 承运人
*/
private String carrier;
/**
* 海关状态
*/
private String customsstatus;
/**
* 付费方式
*/
private String paymode;
/**
* 特货代码
*/
private String specialgoodscode;
/**
* 海关关区
*/
private String customscode;
/**
* 代理人
*/
private String agentman;
/**
* 代理人公司
*/
private String agentcompany;
/**
* 回执信息
*/
private String receiptinformation;
/**
* 创建日期
*/
private Date createdate;
/**
* 货物描述
*/
private String productname;
/**
* UN编号
*/
private String unnumber;
/**
* 危险品类别
*/
private String category;
/**
* 收货人公司
*/
private String sh_company;
/**
* 收货人地址
*/
private String sh_address;
/**
* 收货人邮编
*/
private String sh_zipcode;
/**
* 收货人城市
*/
private String sh_city;
/**
* 收货人洲名
*/
private String sh_deltaname;
/**
* 收货人国家名字
*/
private String sh_country;
/**
* 收货人电话
*/
private String sh_telephone;
/**
* 收货人传真
*/
private String sh_fax;
/**
* 收货人名字
*/
private String sh_name;
/**
* 发货人公司
*/
private String co_company;
/**
* 发货人地址
*/
private String co_address;
/**
* 发货人邮编
*/
private String co_zipcode;
/**
* 发货人城市
*/
private String co_city;
/**
* 发货人洲名
*/
private String co_deltaname;
/**
* 发货人国家名字
*/
private String co_country;
/**
* 发货人电话
*/
private String co_telephone;
/**
* 发货人传真
*/
private String co_fax;
/**
* 发货人名字
*/
private String co_name;
/**
* 到达站
*/
private String reach_station;
/**
* 承运人
*/
private String carrier1;
/**
* 到达站
*/
private String reach_station1;
/**
* 承运人
*/
private String carrier2;
/**
* 到达站
*/
private String reach_station2;
/**
* 货物品名
*/
private String name_ofgoods;
/**
* 交运货站
*/
private String delivery_station;
/**
* 收货人省份代码
*/
private String sh_provincecode;
/**
* 收货人省份
*/
private String sh_provincename;
/**
* 交运件数
*/
private String de_number;
/**
* 交运重量
*/
private String de_weight;
/**
* 交运计费重量
*/
private String de_chweight;
/**
* 交运体尺寸
*/
private String de_size;
/**
* 交运体积
*/
private String de_volume;
/**
* 交运类型
*/
private String de_type;
/**
* 交运中转站
*/
private String de_trstation;
/**
* 交运包装信息
*/
private String de_packing;
/**
* 交运备注
*/
private String de_remarks;
/**
* 交运发送状态 1发送
*/
private Integer de_ids;
/*
* 回执代码
*/
private String response_code;
/*
* 回执状态文本
*/
private String response_text;
private Long save_time;
private Long USER_ID;//报文所属的用户id
//BasicAgentEntity 货代 代理人三字码
private String agentCode;
//UserEntity 用户账号
private String loginaccount;
public String getUnlodingcode() {
return unlodingcode;
}
public void setUnlodingcode(String unlodingcode) {
this.unlodingcode = unlodingcode;
}
public String getCnecusid() {
return cnecusid;
}
public void setCnecusid(String cnecusid) {
this.cnecusid = cnecusid;
}
public String getShpcusid() {
return shpcusid;
}
public void setShpcusid(String shpcusid) {
this.shpcusid = shpcusid;
}
public String getShpaeo() {
return shpaeo;
}
public void setShpaeo(String shpaeo) {
this.shpaeo = shpaeo;
}
public String getCneaeo() {
return cneaeo;
}
public void setCneaeo(String cneaeo) {
this.cneaeo = cneaeo;
}
public String getFlightno() {
return flightno;
}
public void setFlightno(String flightno) {
this.flightno = flightno;
}
public Date getFlightdate() {
return flightdate;
}
public void setFlightdate(Date flightdate) {
this.flightdate = flightdate;
}
public String getOriginatingstation() {
return originatingstation;
}
public void setOriginatingstation(String originatingstation) {
this.originatingstation = originatingstation;
}
public String getDestinationstation() {
return destinationstation;
}
public void setDestinationstation(String destinationstation) {
this.destinationstation = destinationstation;
}
public String getWaybillnomaster() {
return waybillnomaster;
}
public void setWaybillnomaster(String waybillnomaster) {
this.waybillnomaster = waybillnomaster;
}
public String getTotalweight() {
return totalweight;
}
public void setTotalweight(String totalweight) {
this.totalweight = totalweight;
}
public String getTotalpiece() {
return totalpiece;
}
public void setTotalpiece(String totalpiece) {
this.totalpiece = totalpiece;
}
public String getPreparetotalpiece() {
return preparetotalpiece;
}
public void setPreparetotalpiece(String preparetotalpiece) {
this.preparetotalpiece = preparetotalpiece;
}
public String getPreparetotalweight() {
return preparetotalweight;
}
public void setPreparetotalweight(String preparetotalweight) {
this.preparetotalweight = preparetotalweight;
}
public String getAgentcompanycode() {
return agentcompanycode;
}
public void setAgentcompanycode(String agentcompanycode) {
this.agentcompanycode = agentcompanycode;
}
public Date getStowagedate() {
return stowagedate;
}
public void setStowagedate(Date stowagedate) {
this.stowagedate = stowagedate;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public String getCarrier() {
return carrier;
}
public void setCarrier(String carrier) {
this.carrier = carrier;
}
public String getCustomsstatus() {
return customsstatus;
}
public void setCustomsstatus(String customsstatus) {
this.customsstatus = customsstatus;
}
public String getPaymode() {
return paymode;
}
public void setPaymode(String paymode) {
this.paymode = paymode;
}
public String getSpecialgoodscode() {
return specialgoodscode;
}
public void setSpecialgoodscode(String specialgoodscode) {
this.specialgoodscode = specialgoodscode;
}
public String getCustomscode() {
return customscode;
}
public void setCustomscode(String customscode) {
this.customscode = customscode;
}
public String getAgentman() {
return agentman;
}
public void setAgentman(String agentman) {
this.agentman = agentman;
}
public String getAgentcompany() {
return agentcompany;
}
public void setAgentcompany(String agentcompany) {
this.agentcompany = agentcompany;
}
public String getReceiptinformation() {
return receiptinformation;
}
public void setReceiptinformation(String receiptinformation) {
this.receiptinformation = receiptinformation;
}
public Date getCreatedate() {
return createdate;
}
public void setCreatedate(Date createdate) {
this.createdate = createdate;
}
public String getProductname() {
return productname;
}
public void setProductname(String productname) {
this.productname = productname;
}
public String getUnnumber() {
return unnumber;
}
public void setUnnumber(String unnumber) {
this.unnumber = unnumber;
}
public String getCategory() {
return category;
}
public void setCategory(String category) {
this.category = category;
}
public String getSh_company() {
return sh_company;
}
public void setSh_company(String sh_company) {
this.sh_company = sh_company;
}
public String getSh_address() {
return sh_address;
}
public void setSh_address(String sh_address) {
this.sh_address = sh_address;
}
public String getSh_zipcode() {
return sh_zipcode;
}
public void setSh_zipcode(String sh_zipcode) {
this.sh_zipcode = sh_zipcode;
}
public String getSh_city() {
return sh_city;
}
public void setSh_city(String sh_city) {
this.sh_city = sh_city;
}
public String getSh_deltaname() {
return sh_deltaname;
}
public void setSh_deltaname(String sh_deltaname) {
this.sh_deltaname = sh_deltaname;
}
public String getSh_country() {
return sh_country;
}
public void setSh_country(String sh_country) {
this.sh_country = sh_country;
}
public String getSh_telephone() {
return sh_telephone;
}
public void setSh_telephone(String sh_telephone) {
this.sh_telephone = sh_telephone;
}
public String getSh_fax() {
return sh_fax;
}
public void setSh_fax(String sh_fax) {
this.sh_fax = sh_fax;
}
public String getSh_name() {
return sh_name;
}
public void setSh_name(String sh_name) {
this.sh_name = sh_name;
}
public String getCo_company() {
return co_company;
}
public void setCo_company(String co_company) {
this.co_company = co_company;
}
public String getCo_address() {
return co_address;
}
public void setCo_address(String co_address) {
this.co_address = co_address;
}
public String getCo_zipcode() {
return co_zipcode;
}
public void setCo_zipcode(String co_zipcode) {
this.co_zipcode = co_zipcode;
}
public String getCo_city() {
return co_city;
}
public void setCo_city(String co_city) {
this.co_city = co_city;
}
public String getCo_deltaname() {
return co_deltaname;
}
public void setCo_deltaname(String co_deltaname) {
this.co_deltaname = co_deltaname;
}
public String getCo_country() {
return co_country;
}
public void setCo_country(String co_country) {
this.co_country = co_country;
}
public String getCo_telephone() {
return co_telephone;
}
public void setCo_telephone(String co_telephone) {
this.co_telephone = co_telephone;
}
public String getCo_fax() {
return co_fax;
}
public void setCo_fax(String co_fax) {
this.co_fax = co_fax;
}
public String getCo_name() {
return co_name;
}
public void setCo_name(String co_name) {
this.co_name = co_name;
}
public String getReach_station() {
return reach_station;
}
public void setReach_station(String reach_station) {
this.reach_station = reach_station;
}
public String getCarrier1() {
return carrier1;
}
public void setCarrier1(String carrier1) {
this.carrier1 = carrier1;
}
public String getReach_station1() {
return reach_station1;
}
public void setReach_station1(String reach_station1) {
this.reach_station1 = reach_station1;
}
public String getCarrier2() {
return carrier2;
}
public void setCarrier2(String carrier2) {
this.carrier2 = carrier2;
}
public String getReach_station2() {
return reach_station2;
}
public void setReach_station2(String reach_station2) {
this.reach_station2 = reach_station2;
}
public String getName_ofgoods() {
return name_ofgoods;
}
public void setName_ofgoods(String name_ofgoods) {
this.name_ofgoods = name_ofgoods;
}
public String getDelivery_station() {
return delivery_station;
}
public void setDelivery_station(String delivery_station) {
this.delivery_station = delivery_station;
}
public String getSh_provincecode() {
return sh_provincecode;
}
public void setSh_provincecode(String sh_provincecode) {
this.sh_provincecode = sh_provincecode;
}
public String getSh_provincename() {
return sh_provincename;
}
public void setSh_provincename(String sh_provincename) {
this.sh_provincename = sh_provincename;
}
public String getDe_number() {
return de_number;
}
public void setDe_number(String de_number) {
this.de_number = de_number;
}
public String getDe_weight() {
return de_weight;
}
public void setDe_weight(String de_weight) {
this.de_weight = de_weight;
}
public String getDe_chweight() {
return de_chweight;
}
public void setDe_chweight(String de_chweight) {
this.de_chweight = de_chweight;
}
public String getDe_size() {
return de_size;
}
public void setDe_size(String de_size) {
this.de_size = de_size;
}
public String getDe_volume() {
return de_volume;
}
public void setDe_volume(String de_volume) {
this.de_volume = de_volume;
}
public String getDe_type() {
return de_type;
}
public void setDe_type(String de_type) {
this.de_type = de_type;
}
public String getDe_trstation() {
return de_trstation;
}
public void setDe_trstation(String de_trstation) {
this.de_trstation = de_trstation;
}
public String getDe_packing() {
return de_packing;
}
public void setDe_packing(String de_packing) {
this.de_packing = de_packing;
}
public String getDe_remarks() {
return de_remarks;
}
public void setDe_remarks(String de_remarks) {
this.de_remarks = de_remarks;
}
public Integer getDe_ids() {
return de_ids;
}
public void setDe_ids(Integer de_ids) {
this.de_ids = de_ids;
}
public String getResponse_code() {
return response_code;
}
public void setResponse_code(String response_code) {
this.response_code = response_code;
}
public String getResponse_text() {
return response_text;
}
public void setResponse_text(String response_text) {
this.response_text = response_text;
}
public Long getSave_time() {
return save_time;
}
public void setSave_time(Long save_time) {
this.save_time = save_time;
}
public Long getUSER_ID() {
return USER_ID;
}
public void setUSER_ID(Long USER_ID) {
this.USER_ID = USER_ID;
}
public String getAgentCode() {
return agentCode;
}
public void setAgentCode(String agentCode) {
this.agentCode = agentCode;
}
public String getLoginaccount() {
return loginaccount;
}
public void setLoginaccount(String loginaccount) {
this.loginaccount = loginaccount;
}
}
... ...
... ... @@ -433,6 +433,10 @@ manifest.NotifyParty=Notify Party
manifest.dgContacts=DG Contacts
manifest.goods=Goods
manifest.loginaccount=Loginaccount
manifest.agentCode=AgentCode
manifest.jf.city=City
manifest.jf.Provincecode=Province Code
manifest.jf.Provincename=Province Name
... ...
... ... @@ -597,6 +597,8 @@ manifest.packing.information=\u5305\u88c5\u4fe1\u606f
manifest.Remarks=\u5907\u6ce8
manifest.delivery=\u4fdd\u5b58\u5e76\u53d1\u9001\u5230\u4ea4\u8fd0
manifest.response_text=\u8FD0\u5355\u72B6\u6001
manifest.loginaccount=\u7528\u6237\u8d26\u53f7
manifest.agentCode=\u8d27\u4ee3\u4fe1\u606f
manifest.customs_status_001 = \u666E\u901A\u8D27\u7269
manifest.customs_status_002 = \u56FD\u9645\u8F6C\u8FD0\u8D27\u7269
... ...
... ... @@ -37,6 +37,8 @@
<thead>
<tr>
<th field="." formatter="editFormat"><spring:message code="opt.edit" /></th>
<th field="loginaccount"><spring:message code="manifest.loginaccount"/></th>
<th field="agentCode"><spring:message code="manifest.agentCode"/></th>
<th field="waybillnomaster" sortable="true"><spring:message code="manifest.bill.number"/></th>
<th field="customscode"><spring:message code="manifest.customs"/></th>
<th field="flightno" formatter="appendCarrier"><spring:message code="manifest.flight.number"/></th>
... ...