增加新的仓库

src/com/uas/main/Upload.java

@@ -91,6 +91,8 @@ public class Upload {
 		String header = getHeader(template.toString());
 		String detailItem = getDetailItem(template.toString());
 		String currentDate = getCurrentdate("yyyyMMddHHmm");
+		/*System.err.println(datastr);
+		System.err.println(datastr.substring(5400,5450));*/
 		Map<String,Object> data = new ObjectMapper().readValue(datastr, HashMap.class);
 		data.put("FILENAME", type + "-" + data.get("FILENAME"));
 		data.put("CURRENTDATE", currentDate);
@@ -196,7 +198,6 @@ public class Upload {
 					}else{
 						BaseUtil.getLogger().info("warehouse ftpdepot is null");
 					}
-					JdbcUtil.clearXmlTemplate();						
 				}catch(Exception e){
 					e.printStackTrace();
 					BaseUtil.getLogger().error(e.toString());
@@ -208,6 +209,7 @@ public class Upload {
 				client = null;
 			}
 			try{
+				JdbcUtil.clearXmlTemplate();
 				con.close();
 			}catch(SQLException e){
 				e.printStackTrace();

src/properties/ftpconfig.properties

@@ -37,7 +37,7 @@
 		"remark":"上海仓库"
 	},
 	"4":{
-		"ip":"112.74.205.182",
+		"ip":"omsftp.icorebuy.com",
 		"port":21,
 		"user":"YHND04",
 		"password":"Yhnd#$%2019",
@@ -47,7 +47,7 @@
 		"remark":"旗丰"
 	},
 	"5":{
-		"ip":"112.74.205.182",
+		"ip":"omsftp.icorebuy.com",
 		"port":21,
 		"user":"YHND05",
 		"password":"Yhnd#$%2019",
@@ -57,7 +57,7 @@
 		"remark":"旗丰"
 	},
 	"6":{
-		"ip":"112.74.205.182",
+		"ip":"omsftp.icorebuy.com",
 		"port":21,
 		"user":"YHND03",
 		"password":"Yhnd@#$2018",
@@ -67,7 +67,7 @@
 		"remark":"\u65D7\u4E30-Megafone"
 	},
 	"7":{
-		"ip":"112.74.205.182",
+		"ip":"omsftp.icorebuy.com",
 		"port":21,
 		"user":"YHND02",
 		"password":"Yhnd*$@2017",
@@ -87,7 +87,7 @@
 		"remark":"YHND_LY"
 	},
 	"9":{
-		"ip":"112.74.205.182",
+		"ip":"omsftp.icorebuy.com",
 		"port":21,
 		"user":"YHND06",
 		"password":"Yhnd#$%2019",
@@ -97,7 +97,7 @@
 		"remark":"YHND_Hunan"
 	},
 	"10":{
-		"ip":"112.74.205.182",
+		"ip":"omsftp.icorebuy.com",
 		"port":21,
 		"user":"YHND07",
 		"password":"Yhnd#$%2019",
@@ -107,7 +107,7 @@
 		"remark":"YHND_Wingtech"
 	},
 	"11":{
-		"ip":"112.74.205.182",
+		"ip":"omsftp.icorebuy.com",
 		"port":21,
 		"user":"YTZX02",
 		"password":"Yhnd#$%2019",
@@ -116,24 +116,36 @@
 		"out":"distribute_in",
 		"remark":"YHND_Wingtech"
 	},
-    "12":{
-        "ip":"sz.hi-mantech.com",
-        "port":46688,
-        "user":"userHC",
-        "password":"user_123456",
-        "downloadpath":"PakingL",
-        "out":"RT",
-        "remark":"YHND_Wingtech"
-    },
-    "13":{
-        "ip":"112.74.205.182",
-        "port":21,
-        "user":"YHND08",
-        "password":"Yhnd#$%2019",
-        "downloadpath":"PakingL",
-        "out":"RT",
-        "remark":"YHND_Wingtech"
-    },
+	"12":{
+		"ip":"omsftp.icorebuy.com",
+		"port":21,
+		"user":"YHND09",
+		"password":"Yhnd#$%2019",
+		"downloadpath":"reply",
+		"in":"appointment_in",
+		"out":"distribute_in",
+		"remark":"YHND Tesla"
+	},
+	"13":{
+		"ip":"sz.hi-mantech.com",
+		"port":46688,
+		"user":"userDCL",
+		"password":"user_123456",
+		"downloadpath":"WMSANS",
+		"in":"WMSRECV",
+		"out":"WMSRELS",
+		"remark":"上海WGQ新仓库DCL"
+	},
+	"14":{
+		"ip":"120.197.180.245",
+		"port":33321,
+		"user":"YHNDTEST",
+		"password":"5pLf1SKV",
+		"downloadpath":"reply",
+		"in":"appointment_in",
+		"out":"distribute_in",
+		"remark":"测试仓库"
+	},
 	"2_old":{
 		"ip":"218.255.13.107",
 		"port":21,