增加联合创泰 顺丰 富森等

src/com/uas/main/Download.java

@@ -2,7 +2,6 @@ package com.uas.main;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.Connection;
@@ -11,21 +10,14 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.*;
 
-import com.jcraft.jsch.ChannelSftp;
 import com.jcraft.jsch.JSchException;
-import com.uas.util.SFTPUtil;
+import com.uas.util.*;
 import org.apache.commons.net.ftp.FTPClient;
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
 
-import com.uas.util.BaseUtil;
-import com.uas.util.FtpUtil;
-import com.uas.util.JdbcUtil;
-
 public class Download{
 
 	public static Boolean checkXmlFileToSqlToEnterprise(File file,String enterprise){
@@ -435,10 +427,11 @@ 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_HUASL-XN","N_HUASL","香港华商龙"); //华商龙-新宁
     	downloadByDepotAndSob("N_HUASL-QF","N_HUASL","香港华商龙");//华商龙-旗丰
     	downloadByDepotAndSob("N_WILICHK-QF","N_WILICHK","(华商龙)威尔电子");//威尔电子-旗丰
-    	downloadByDepotAndSob("N_BJKG-QF","N_BJKG","柏建控股");//柏建控股-旗丰    	
+    	downloadByDepotAndSob("N_BJKG-QF","N_BJKG","柏建控股");//柏建控股-旗丰
     	
     	
     	
@@ -490,26 +483,26 @@ public class Download{
 								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 {
+											client.rename(file.getName(), "bak/" + file.getName()); //移动处理完的文件到bak文件夹下
+										}
 									}
-								}
 								statement.close();
 							} catch (Exception e) {
 								e.printStackTrace();

src/com/uas/main/Main.java

@@ -8,23 +8,15 @@ import static com.uas.main.Upload.*;
 public class Main {
 	
 	public static void main(String[] args) {
-		/*boolean connect = false;
-		try {
-			connect = FtpUtil.connect("/TO_QF/", "112.74.205.182",
-					21, "YTZH02", "Ytzh)@2018");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		System.err.println(connect);*/
 		 
-	   final long timeInterval =5*60*1000;
+	  final long timeInterval =5*60*1000;
 	        Runnable runnable = new Runnable() {  
 	            public void run() {  
-	                while (true) {  
+	                while (true) {
 	                    // ------- code for task to run  
 	                    a();
 	                    // ------- ends here  
-	                    try {  
+	                    try {
 	                        Thread.sleep(timeInterval);  
 	                    } catch (InterruptedException e) {  
 	                        e.printStackTrace();  
@@ -34,17 +26,6 @@ public class Main {
 	        };  
 	        Thread thread = new Thread(runnable);  
 	        thread.start();
-/*
-        boolean connect = false;
-        try {
-            connect = FtpUtil.connect("/stockin/data/", "218.17.248.243",
-                    45301, "wms_ufct", "ZjJ05GFV");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        System.err.println(connect);*/
-	/*String sob = "N_YITOA_LHCT";
-	Upload.uploadBySob(sob);*/
     }
 	
 	

src/com/uas/main/Upload.java

@@ -86,7 +86,7 @@ public class Upload {
 	}
 	
 	public static ResultSet getXmlData(Statement statement) throws SQLException{
-		return statement.executeQuery("select xl_id,xl_data,xl_fileprefix,to_char(xl_date,'yyyymmddhh24miss') xl_date,xl_depot from xmldatalogtemp where xl_data is not null order by xl_depot desc");	
+		return statement.executeQuery("select xl_id,xl_data,xl_fileprefix,to_char(xl_date,'yyyymmddhh24miss') xl_date,xl_depot from xmldatalogtemp where xl_data is not null order by xl_depot desc");
 	}
 	
 	public static void run() {
@@ -94,7 +94,7 @@ public class Upload {
 		uploadBySob("N_YITOA_LHCT");//联合创泰
 		uploadBySob("N_WILICHK"); //威尔电子
 		uploadBySob("N_BJKG"); //柏建控股
-		uploadBySob("USOFT_MALL_HK"); //优软商城香港
+		//uploadBySob("USOFT_MALL_HK"); //优软商城香港
 	}
 	
 	@SuppressWarnings({ "unchecked"})

src/properties/dbconfig.properties

@@ -1,31 +1,31 @@
 {
 	"N_YITOA_LHCT":{
-		"url":"jdbc:oracle:thin:@183.60.22.166:1521:orcl",
+		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
 		"user":"N_YITOA_LHCT",
 		"password":"select!#%*("
 	},
     "t_n_huasl":{
-		"url":"jdbc:oracle:thin:@183.60.22.166:1521:orcl",
+		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
 		"user":"t_n_huasl",
 		"password":"select!#%*("
     },
 	"N_HUASL":{
-		"url":"jdbc:oracle:thin:@183.60.22.166:1521:orcl",
+		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
 		"user":"N_HUASL",
 		"password":"select!#%*("
 	},
 	"N_WILICHK":{
-		"url":"jdbc:oracle:thin:@183.60.22.166:1521:orcl",
+		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
 		"user":"N_WILICHK",
 		"password":"select!#%*("
 	},
 	"N_BJKG":{
-		"url":"jdbc:oracle:thin:@183.60.22.166:1521:orcl",
+		"url":"jdbc:oracle:thin:@10.10.100.39:1521:orcl",
 		"user":"N_BJKG",
 		"password":"select!#%*("
 	},
 	"USOFT_MALL_HK":{
-		"url":"jdbc:oracle:thin:@218.18.115.198:1523:orcl",
+		"url":"jdbc:oracle:thin:@10.1.1.168:1521:orcl",
 		"user":"USOFT_MALL_HK",
 		"password":"select!#%*("
 	},

src/properties/ftpconfig.properties

@@ -4,8 +4,8 @@
 		"port":3022,
 		"user":"wms_ufct",
 		"password":"g9Y0Op7K",
-		"downloadpath":"goodsreceipt/data",
-		"in":"stockin/data"
+		"downloadpath":"goodsreceipt/data",		"in":"stockin/data",
+		"file":""
 	},
 	"t_n_huasl-QF":{
 		"ip":"183.47.46.130",
@@ -16,15 +16,24 @@
 		"in":"TO_QF"
 	},
 	"N_YITOA_LHCT-QF":{
-		"ip":"112.74.205.182",
+		"ip":"omsftp.icorebuy.com",
 		"port":21,
 		"user":"YTZH02",
 		"password":"Ytzh)@2018",
 		"downloadpath":"From_QF",
-		"in":"TO_QF"
+		"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":"112.74.205.182",
+		"ip":"omsftp.icorebuy.com",
 		"port":21,
 		"user":"YTZH02",
 		"password":"Ytzh)@2018",
@@ -32,7 +41,7 @@
 		"in":"TO_QF"
 	},
 	"N_WILICHK-QF":{
-		"ip":"112.74.205.182",
+		"ip":"omsftp.icorebuy.com",
 		"port":21,
 		"user":"YTZH02",
 		"password":"Ytzh)@2018",
@@ -40,7 +49,7 @@
 		"in":"TO_QF"
 	},
 	"N_BJKG-QF":{
-		"ip":"112.74.205.182",
+		"ip":"omsftp.icorebuy.com",
 		"port":21,
 		"user":"YTZH02",
 		"password":"Ytzh)@2018",