增加联合创泰、顺丰、富森、得尔达等

.idea/artifacts/hsl_jar.xml

@@ -1,34 +1,25 @@
 <component name="ArtifactManager">
   <artifact type="jar" name="hsl:jar">
-    <output-path>$PROJECT_DIR$/classes/artifacts/hsl_jar</output-path>
+    <output-path>$PROJECT_DIR$/bin/artifacts/hsl_jar</output-path>
     <root id="archive" name="hsl.jar">
       <element id="directory" name="META-INF">
         <element id="file-copy" path="$PROJECT_DIR$/META-INF/MANIFEST.MF" />
       </element>
       <element id="module-output" name="hsl" />
-      <element id="library" level="module" name="commons-csv-1.4.jar" module-name="hsl" />
-      <element id="library" level="module" name="flexjson-2.1.jar" module-name="hsl" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-csv-1.4.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/ojdbc6-11.2.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/httpcore-4.4.10.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-net-3.6.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/dom4j-1.6.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/flexjson-2.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/ojdbc6-11.2.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/slf4j-api-1.7.21.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/jackson-core-asl-1.9.13.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/jackson-mapper-asl-1.9.13.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/jsch-0.1.54.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/junit.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/dom4j-1.6.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/jackson-mapper-asl-1.9.13.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-csv-1.4.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/flexjson-2.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-io-2.4.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/log4j-1.2.15.jar" path-in-jar="/" />
-      <element id="library" level="module" name="ojdbc6-11.2.0.jar" module-name="hsl" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/slf4j-api-1.7.21.jar" path-in-jar="/" />
-      <element id="library" level="module" name="log4j-1.2.15.jar" module-name="hsl" />
-      <element id="library" level="module" name="jackson-core-asl-1.9.13.jar" module-name="hsl" />
-      <element id="library" level="project" name="jsch-0.1.51-sources" />
-      <element id="library" level="module" name="jackson-mapper-asl-1.9.13.jar" module-name="hsl" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-io-1.4.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/jsch-0.1.54.jar" path-in-jar="/" />
-      <element id="library" level="module" name="junit.jar" module-name="hsl" />
-      <element id="library" level="module" name="commons-net-3.6.jar" module-name="hsl" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/javax.servlet.jar" path-in-jar="/" />
-      <element id="library" level="module" name="dom4j-1.6.1.jar" module-name="hsl" />
     </root>
   </artifact>
 </component>

.idea/libraries/commons_csv_1_4.xml

@@ -2,14 +2,6 @@
   <library name="commons-csv-1.4">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/commons-csv-1.4.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/ojdbc6-11.2.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/commons-net-3.6.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/dom4j-1.6.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/flexjson-2.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jackson-core-asl-1.9.13.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/jackson-mapper-asl-1.9.13.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/junit.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/log4j-1.2.15.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/libraries/commons_io_1_4.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="commons-io-1.4">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/commons-io-1.4.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/commons_io_2_4.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="commons-io-2.4">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/commons-io-2.4.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/commons_net_3_6.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="commons-net-3.6">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/commons-net-3.6.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/dom4j_1_6_1.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="dom4j-1.6.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/dom4j-1.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/flexjson_2_1.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="flexjson-2.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/flexjson-2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/httpcore_4_4_10.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="httpcore-4.4.10">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/httpcore-4.4.10.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/jackson_core_asl_1_9_13.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="jackson-core-asl-1.9.13">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/jackson-core-asl-1.9.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/jackson_mapper_asl_1_9_13.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="jackson-mapper-asl-1.9.13">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/jackson-mapper-asl-1.9.13.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/jsch_0_1_51_sources.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="jsch-0.1.51-sources">
-    <CLASSES />
-    <JAVADOC />
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/jsch-0.1.51-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/libraries/junit.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="junit">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/junit.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/log4j_1_2_15.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="log4j-1.2.15">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/log4j-1.2.15.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/ojdbc6_11_2_0.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="ojdbc6-11.2.0">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/ojdbc6-11.2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/misc.xml

@@ -3,6 +3,9 @@
   <component name="AndroidDexCompilerConfiguration">
     <option name="MAX_HEAP_SIZE" value="2048" />
   </component>
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
   <component name="Kotlin2JsCompilerArguments">
     <option name="sourceMapEmbedSources" />
   </component>
@@ -63,20 +66,7 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/classes" />
-  </component>
-  <component name="SvnBranchConfigurationManager">
-    <option name="myConfigurationMap">
-      <map>
-        <entry key="$PROJECT_DIR$">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="trunkUrl" value="svn+ssh://10.10.101.21/source/uas/hslftp" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-      </map>
-    </option>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/bin" />
   </component>
 </project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/hsl.iml" filepath="$PROJECT_DIR$/hsl.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="svn" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7

hsl.iml

@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="EclipseModuleManager">
-    <libelement value="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/commons-csv-1.4.jar" />
-    <libelement value="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/commons-net-3.6.jar" />
-    <libelement value="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/dom4j-1.6.1.jar" />
-    <libelement value="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/flexjson-2.1.jar" />
-    <libelement value="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/jackson-core-asl-1.9.13.jar" />
-    <libelement value="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/jackson-mapper-asl-1.9.13.jar" />
-    <libelement value="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/junit.jar" />
-    <libelement value="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/log4j-1.2.15.jar" />
-    <libelement value="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/ojdbc6-11.2.0.jar" />
-    <src_description expected_position="1">
-      <src_folder value="file://$MODULE_DIR$/src" expected_position="1" />
-    </src_description>
-  </component>
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/bin" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library name="commons-csv-1.4.jar">
-        <CLASSES>
-          <root url="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/commons-csv-1.4.jar" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="commons-net-3.6.jar">
-        <CLASSES>
-          <root url="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/commons-net-3.6.jar" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="dom4j-1.6.1.jar">
-        <CLASSES>
-          <root url="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/dom4j-1.6.1.jar" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="flexjson-2.1.jar">
-        <CLASSES>
-          <root url="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/flexjson-2.1.jar" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="jackson-core-asl-1.9.13.jar">
-        <CLASSES>
-          <root url="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/jackson-core-asl-1.9.13.jar" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="jackson-mapper-asl-1.9.13.jar">
-        <CLASSES>
-          <root url="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/jackson-mapper-asl-1.9.13.jar" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="junit.jar">
-        <CLASSES>
-          <root url="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/junit.jar" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="log4j-1.2.15.jar">
-        <CLASSES>
-          <root url="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/log4j-1.2.15.jar" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="ojdbc6-11.2.0.jar">
-        <CLASSES>
-          <root url="file://D:/Documents/Tencent Files/396996717/FileRecv/jar/ojdbc6-11.2.0.jar" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="commons-csv-1.4" level="project" />
-    <orderEntry type="library" name="jsch-0.1.51-sources" level="project" />
-    <orderEntry type="library" name="jsch-0.1.54" level="project" />
-    <orderEntry type="library" name="commons-io-1.4" level="project" />
-    <orderEntry type="library" name="slf4j-api-1.7.21" level="project" />
-    <orderEntry type="library" name="javax.servlet" level="project" />
-  </component>
-</module>

src/com/uas/main/Download.java

@@ -65,15 +65,18 @@ public class Download{
 		if(xmlConfig.get("xd_detail_conditiontag")!=null&&detailData!=null){
 			if("Packing".equals(caller)||"Invoice".equals(caller)){
 			detailXmlConfig = getXmlConfigDetail(statement,xmlConfig.get("xd_id"),"1"); //获取明细表的配置	
-			}else
-				detailXmlConfig = getXmlConfigDetail(statement,xmlConfig.get("xd_id"),"1",xmlConfig.get("xd_detail_conditiontag")); //获取明细表的配置	
-		}		
+			}else {
+                detailXmlConfig = getXmlConfigDetail(statement, xmlConfig.get("xd_id"), "1", xmlConfig.get("xd_detail_conditiontag")); //获取明细表的配置
+            }
+			}
 		
-		String updateMainConditon = getUpdateMainCondtion(mainData,xmlConfig); //主表更新条件
+		String updateMainConditon = getUpdateMainCondtion(mainData,xmlConfig);
+        updateMainConditon = updateMainConditon.replace(" pi_inoutno='' and ","");
 		String maincode = mainData.get(xmlConfig.get("xd_main_conditiontag"));
 		if(mainXmlConfig.size()>0){
 			mainTableUpdateSql = getUpdateMainFields(mainData,xmlConfig,mainXmlConfig); //主表更新字段
 			mainTableUpdateSql += " where " + updateMainConditon;
+
 			sqls.add(mainTableUpdateSql);
 		}
 		if(detailXmlConfig!=null&&detailXmlConfig.size()>0){
@@ -426,12 +429,28 @@ public class Download{
 	}			
     public static void run(){
 		downloadByDepotAndSob("N_YITOA_LHCT-SF","N_YITOA_LHCT","聯合創泰科技有限公司"); //联合创泰-顺丰
-		downloadByDepotAndSob("N_YITOA_LHCT-QF","N_YITOA_LHCT","聯合創泰科技有限公司"); //联合创泰-旗丰
-        downloadByDepotAndSob("N_HUASL-FS","N_HUASL","香港华商龙"); //华商龙-富森
+		//downloadByDepotAndSob("N_YITOA_LHCT-QF","N_YITOA_LHCT","聯合創泰科技有限公司"); //联合创泰-旗丰
+		downloadByDepotAndSob("N_YITOA_LHCT-FS","N_YITOA_LHCT","聯合創泰科技有限公司"); //联合创泰-富森
+        downloadByDepotAndSob("N_YITOA_LHCT-SLC","N_YITOA_LHCT","聯合創泰科技有限公司"); //联合创泰-SLC上海保税仓
+        downloadByDepotAndSob("N_YITOA_LHCT-ZSD","N_YITOA_LHCT","聯合創泰科技有限公司"); //联合创泰-准时达
+		downloadByDepotAndSob("N_YITOA_LHCT_HK-FS","N_YITOA_LHCT_HK","英唐創泰香港科技有限公司");//英唐创泰香港-富森
+		downloadByDepotAndSob("N_HUASL-FS","N_HUASL","香港华商龙"); //华商龙-富森
     	downloadByDepotAndSob("N_HUASL-XN","N_HUASL","香港华商龙"); //华商龙-新宁
-    	downloadByDepotAndSob("N_HUASL-QF","N_HUASL","香港华商龙");//华商龙-旗丰
+    	//downloadByDepotAndSob("N_HUASL-QF","N_HUASL","香港华商龙");//华商龙-旗丰
     	downloadByDepotAndSob("N_WILICHK-QF","N_WILICHK","(华商龙)威尔电子");//威尔电子-旗丰
-    	downloadByDepotAndSob("N_BJKG-QF","N_BJKG","柏建控股");//柏建控股-旗丰
+		downloadByDepotAndSob("N_WILICHK-FS","N_WILICHK","(华商龙)威尔电子");//威尔电子-富森
+    	//downloadByDepotAndSob("N_BJKG-QF","N_BJKG","柏建控股");//柏建控股-旗丰
+		downloadByDepotAndSob("N_BJKG-FS","N_BJKG","柏建控股"); //柏建控股-富森
+		//深圳华商龙-准时达
+		downloadByDepotAndSob("N_HUASL_SZ-DRD","N_HUASL_SZ","深圳华商龙");
+		//上海宇声-准时达
+		downloadByDepotAndSob("N_E_SHINE_SH-DRD","N_E_SHINE_SH","上海宇声");
+		//重庆华商龙-准时达
+		downloadByDepotAndSob("HSL_CQ-DRD","HSL_CQ","重庆华商龙");
+		//北京华商龙-准时达
+		downloadByDepotAndSob("HSL_BJ-DRD","HSL_BJ","北京华商龙");
+		//青岛华商龙-准时达
+		downloadByDepotAndSob("N_HUASL_QD-DRD","N_HUASL_QD","青岛华商龙");
     	
     	
     	
@@ -466,56 +485,61 @@ public class Download{
 			}else {
 				client = FtpUtil.connect(ftpMap);
 			}
-			if(client!=null||sftp!=null){
+			if(client!=null||sftp!=null) {
 				List<File> files = null;
-				if ("N_YITOA_LHCT-SF".equals(depot)){
+				if ("N_YITOA_LHCT-SF".equals(depot)) {
 					files = sftp.download(ftpMap.get("downloadpath").toString());
 
-				}else {
-					files = FtpUtil.downloadAllFileByType(client,"XML");
+				}else if("N_YITOA_LHCT-SLC".equals(depot)){
+					files = FtpUtil.downloadDirFileByType(client, "XML",
+							ftpMap.get("downloadpath").toString());
+				}else{
+					files = FtpUtil.downloadAllFileByType(client, "XML");
 				}
 				String fileName = "";
-				if(files!=null&&files.size()>0){
+				if (files != null && files.size() > 0) {
 					connect = JdbcUtil.getConnectBySob(sob);
-					if(connect!=null){
-						for (File file:files)
+					if (connect != null) {
+						for (File file : files) {
 							try {
 								fileName += "," + file.getName();
 								Statement statement = connect.createStatement();
 								System.err.println(statement);
-									//判断当前帐套和文件是否一致
-									if (!checkXmlFileToSqlToEnterprise(file, enterprise)) {
-										continue;
-									}
-									sqls = parseXmlFileToSqls(file, statement);
-									if (sqls == null) {
-										continue;
-									}
+								//判断当前帐套和文件是否一致
+								if (!checkXmlFileToSqlToEnterprise(file, enterprise)) {
+									continue;
+								}
+								sqls = parseXmlFileToSqls(file, statement);
+								if (sqls == null) {
+									continue;
+								}
 
-									executeRes = JdbcUtil.executeSqls(connect, sqls);
+								executeRes = JdbcUtil.executeSqls(connect, sqls);
 
-									if (executeRes) {
-										if ("N_YITOA_LHCT-SF".equals(depot)) {
-											String s = file.getName().substring(0, file.getName().indexOf(".")) + ".xml";
-											Boolean rename = sftp.rename(ftpMap.get("downloadpath").toString()+"/"+s, "goodsreceipt/backup/"+s);
-											System.err.println(rename);
-										} else {
-											client.rename(file.getName(), "bak/" + file.getName()); //移动处理完的文件到bak文件夹下
-										}
+								if (executeRes) {
+									if ("N_YITOA_LHCT-SF".equals(depot)) {
+										String s = file.getName().substring(0, file.getName().indexOf(".")) + ".xml";
+										Boolean rename = sftp.rename(ftpMap.get("downloadpath").toString() + "/" + s, "goodsreceipt/backup/" + s);
+										System.err.println(rename);
+									} else {
+										//移动处理完的文件到bak文件夹下
+										client.rename(file.getName(), "bak/" + file.getName());
 									}
+								}
 								statement.close();
 							} catch (Exception e) {
 								e.printStackTrace();
 								BaseUtil.getLogger().error(e.toString());
 								continue;
 							}
+						}
+
+					}
+					if (!"".equals(fileName)) {
+						BaseUtil.logDownload(fileName.substring(1), ftpMap.get("ip").toString(), ftpMap.get("downloadpath").toString());
 					}
-				
 				}
-				if(!"".equals(fileName)){
-					BaseUtil.logDownload(fileName.substring(1),ftpMap.get("ip").toString(),ftpMap.get("downloadpath").toString());
-				}					
-			}			
+			}
     	} catch (Exception e) {
     		BaseUtil.getLogger().error(e.toString());
 			e.printStackTrace();

src/com/uas/main/Main.java

@@ -1,6 +1,5 @@
 package com.uas.main;
 import com.uas.util.BaseUtil;
-import com.uas.util.FtpUtil;
 import com.uas.util.JdbcUtil;
 
 import static com.uas.main.Upload.*;
@@ -33,7 +32,7 @@ public class Main {
 	public static  void a() {
 		run();
 		System.out.println("begin");
-		Download.run();	
+		Download.run();
 		
 		try{ //关闭数据库连接
 			if(JdbcUtil.connection!=null){

src/com/uas/main/Upload.java

@@ -90,10 +90,27 @@ public class Upload {
 	}
 	
 	public static void run() {
-		uploadBySob("N_HUASL"); //华商龙
-		uploadBySob("N_YITOA_LHCT");//联合创泰
-		uploadBySob("N_WILICHK"); //威尔电子
-		uploadBySob("N_BJKG"); //柏建控股
+        //华商龙
+		uploadBySob("N_HUASL");
+        //联合创泰
+		uploadBySob("N_YITOA_LHCT");
+        //威尔电子
+		uploadBySob("N_WILICHK");
+        //柏建控股
+		uploadBySob("N_BJKG");
+        //联合创泰香港
+		uploadBySob("N_YITOA_LHCT_HK");
+		//深圳华商龙
+		uploadBySob("N_HUASL_SZ");
+		//上海宇声
+		uploadBySob("N_E_SHINE_SH");
+		//青岛华商龙
+		uploadBySob("N_HUASL_QD");
+		//重庆华商龙
+		uploadBySob("HSL_CQ");
+		//北京华商龙
+		uploadBySob("HSL_BJ");
+
 		//uploadBySob("USOFT_MALL_HK"); //优软商城香港
 	}
 	

src/com/uas/util/FtpUtil.java

@@ -7,10 +7,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
 
 import com.jcraft.jsch.JSchException;
 import org.apache.commons.net.ftp.FTP;
@@ -166,13 +163,58 @@ public class FtpUtil {
 		try {
 			ftpClient.enterLocalPassiveMode();
 			FTPFile[] ftpFiles = ftpClient.listFiles();
+            if (ftpFiles != null && ftpFiles.length > 0) {
+                ArrayList<FTPFile> list = new ArrayList<FTPFile>(Arrays.asList(ftpFiles));
+                Collections.sort(list, new Comparator<FTPFile>() {
+                    @Override
+                    public int compare(FTPFile o1, FTPFile o2) {
+                        long time = o1.getTimestamp().getTime().getTime();
+                        long time1 = o2.getTimestamp().getTime().getTime();
+                        if (time > time1) {
+                            return 1;
+                        }
+                        if (time == time1) {
+                            return 0;
+                        }
+                        return -1;
+                    }
+                });
+                for (FTPFile file : list) {
+                    if (file.getName().toUpperCase().endsWith("." + fileType)) {
+                        File localFile = new File(System.getProperty("java.io.tmpdir") + File.separator + file.getName());
+                        OutputStream os = new FileOutputStream(localFile);
+                        ftpClient.retrieveFile(file.getName(), os);
+                        os.close();
+                        files.add(localFile);
+                    }
+                }
+            }
+		} catch (Exception e) {
+			BaseUtil.getLogger().error(e.toString());
+			e.printStackTrace();
+		}
+		return files;
+	}
+
+	/**
+	 *
+	 * @param ftpClient
+	 * fileType 需要下载的文件类型
+	 * @return 获取连接到的ftp站点下的指定文件夹所有文件
+	 */
+	public static List<File> downloadDirFileByType(FTPClient ftpClient,String fileType,String dir) {
+		List<File> files = new ArrayList<File>();
+		try {
+			ftpClient.enterLocalPassiveMode();
+			ftpClient.changeWorkingDirectory("/"+dir+"/");
+			FTPFile[] ftpFiles = ftpClient.listFiles("/"+dir+"/");
 			for (FTPFile file : ftpFiles) {
 				if(file.getName().toUpperCase().endsWith("." + fileType)){
 					File localFile = new File(System.getProperty("java.io.tmpdir") + File.separator + file.getName());
 					OutputStream os = new FileOutputStream(localFile);
 					ftpClient.retrieveFile(file.getName(), os);
 					os.close();
-					files.add(localFile);					
+					files.add(localFile);
 				}
 			}
 		} catch (Exception e) {
@@ -181,7 +223,9 @@ public class FtpUtil {
 		}
 		return files;
 	}
-	
+
+
+
 	/**
 	 * 关闭ftp连接
 	 * @param ftpClient

src/properties/dbconfig.properties

@@ -4,6 +4,31 @@
 		"user":"N_YITOA_LHCT",
 		"password":"select!#%*("
 	},
+	"N_YITOA_LHCT_HK":{
+		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
+		"user":"N_YITOA_LHCT_HK",
+		"password":"select!#%*("
+	},
+	"N_E_SHINE_SH":{
+		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
+		"user":"N_E_SHINE_SH",
+		"password":"select!#%*("
+	},
+	"HSL_BJ":{
+		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
+		"user":"HSL_BJ",
+		"password":"select!#%*("
+	},
+	"HSL_CQ":{
+		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
+		"user":"HSL_CQ",
+		"password":"select!#%*("
+	},
+	"N_HUASL_QD":{
+		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
+		"user":"N_HUASL_QD",
+		"password":"select!#%*("
+	},
     "t_n_huasl":{
 		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
 		"user":"t_n_huasl",
@@ -14,6 +39,11 @@
 		"user":"N_HUASL",
 		"password":"select!#%*("
 	},
+	"N_HUASL_SZ":{
+		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
+		"user":"N_HUASL_SZ",
+		"password":"select!#%*("
+	},
 	"N_WILICHK":{
 		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
 		"user":"N_WILICHK",

src/properties/ftpconfig.properties

@@ -4,9 +4,114 @@
 		"port":3022,
 		"user":"wms_ufct",
 		"password":"g9Y0Op7K",
-		"downloadpath":"goodsreceipt/data",		"in":"stockin/data",
+		"downloadpath":"goodsreceipt/data",
+  		"in":"stockin/data",
 		"file":""
 	},
+    "N_YITOA_LHCT-SLC":{
+        "ip":"210.5.145.196",
+        "port":21,
+        "user":"yitoa",
+        "password":"Slc%YiToa",
+        "downloadpath":"YITOA/chuangt_postback",
+        "in":"YITOA/chuangt_normal"
+    },
+    "N_YITOA_LHCT-ZSD":{
+        "ip":"47.106.234.187",
+        "port":21,
+        "user":"lhct",
+        "password":"bE!8M3#5y0",
+        "downloadpath":"LHCT/reply",
+        "in":"LHCT/appointment_in"
+    },
+	"N_YITOA_LHCT_HK-FS":{
+		"ip":"113.100.137.106",
+		"port":21,
+		"user":"b2b_ftp",
+		"password":"24g777sW",
+		"downloadpath":"yingtang_chuangt_hk_postback",
+		"in":"yingtang_chuangt_hk_normal"
+	},
+    "N_HUASL_SZ-DRD":{
+        "ip":"58.211.24.196",
+        "port":21,
+        "user":"yitoa",
+        "password":"yitoa@2020",
+        "downloadpath":"Ack/SZHSL",
+        "in":"Order/SZHSL"
+    },
+    "N_E_SHINE_SH-DRD":{
+        "ip":"58.211.24.196",
+        "port":21,
+        "user":"yitoa",
+        "password":"yitoa@2020",
+        "downloadpath":"Ack/SHYS",
+        "in":"Order/SHYS"
+    },
+    "N_HUASL_QD-DRD":{
+        "ip":"58.211.24.196",
+        "port":21,
+        "user":"yitoa",
+        "password":"yitoa@2020",
+        "downloadpath":"Ack/QDHSL",
+        "in":"Order/QDHSL"
+    },
+    "HSL_BJ-DRD":{
+        "ip":"58.211.24.196",
+        "port":21,
+        "user":"yitoa",
+        "password":"yitoa@2020",
+        "downloadpath":"Ack/BJHSL",
+        "in":"Order/BJHSL"
+    },
+    "HSL_CQ-DRD":{
+        "ip":"58.211.24.196",
+        "port":21,
+        "user":"yitoa",
+        "password":"yitoa@2020",
+        "downloadpath":"Ack/CQHSL",
+        "in":"Order/CQHSL"
+    },
+    "N_YITOA_LHCT-FS":{
+        "ip":"113.100.137.106",
+        "port":21,
+        "user":"b2b_ftp",
+        "password":"24g777sW",
+        "downloadpath":"chuangt_postback",
+        "in":"chuangt_normal"
+    },
+    "N_BJKG-FS":{
+        "ip":"113.100.137.106",
+        "port":21,
+        "user":"b2b_ftp",
+        "password":"24g777sW",
+        "downloadpath":"baij_postback",
+        "in":"baij_normal"
+    },
+    "N_WILICHK-FS":{
+        "ip":"113.100.137.106",
+        "port":21,
+        "user":"b2b_ftp",
+        "password":"24g777sW",
+        "downloadpath":"weier_postback",
+        "in":"weier_normal"
+    },
+    "N_HUASL-FS":{
+        "ip":"113.100.137.106",
+        "port":21,
+        "user":"b2b_ftp",
+        "password":"24g777sW",
+        "downloadpath":"postback",
+        "in":"normal"
+    },
+    "N_HUASL-XN":{
+        "ip":"218.4.62.135",
+        "port":21,
+        "user":"hsltoxn",
+        "password":"HtxN527%#",
+        "downloadpath":"From_XN",
+        "in":"To_XN"
+    },
 	"t_n_huasl-QF":{
 		"ip":"183.47.46.130",
 		"port":21,
@@ -24,14 +129,6 @@
 		"in":"TO_QF",
 		"file":""
 	},
-	"N_HUASL-FS":{
-		"ip":"113.100.137.106",
-		"port":21,
-		"user":"b2b_ftp",
-		"password":"24g777sW",
-		"downloadpath":"postback",
-		"in":"normal"
-	},
     "N_HUASL-QF":{
 		"ip":"omsftp.icorebuy.com",
 		"port":21,
@@ -55,13 +152,5 @@
 		"password":"Ytzh)@2018",
 		"downloadpath":"From_QF",
 		"in":"TO_QF"
-	},
-	"N_HUASL-XN":{
-		"ip":"218.4.62.135",
-		"port":21,
-		"user":"hsltoxn",
-		"password":"HtxN527%#",
-		"downloadpath":"From_XN",
-		"in":"To_XN"
 	}
 }