修改国际转运失败BUG

@@ -194,7 +194,7 @@ public class PreController {
 				mainfest.setFlightno(flightno);
 				mainfest.setFlightno(flightno);
 				mainfest.setFlightDate(flightdate);
 				mainfest.setFlightDate(flightdate);
 				mainfest.setPreCarrier(tflightno.substring(0,2));
 				mainfest.setPreCarrier(tflightno.substring(0,2));
-				mainfest.setPreFlightDate(tflightno.substring(2));
+				mainfest.setPreFlightno(tflightno.substring(2));
 				mainfest.setPreFlightDate(tflightdate);
 				mainfest.setPreFlightDate(tflightdate);
 				
 				
 			List<Originmanifestmaster> list = mainfestService.getList(mainfest);
 			List<Originmanifestmaster> list = mainfestService.getList(mainfest);

@@ -450,9 +450,6 @@ public class Originmanifestmaster {
         this.consigneePhone = consigneePhone == null ? null : consigneePhone.trim();
         this.consigneePhone = consigneePhone == null ? null : consigneePhone.trim();
     }
     }
 
 
-	public String getPreFlightno() {
-		return preFlightno;
-	}
 
 
 	public String getPreCarrier() {
 	public String getPreCarrier() {
 		return preCarrier;
 		return preCarrier;
@@ -469,6 +466,15 @@ public class Originmanifestmaster {
 	public void setPreFlightDate(String preFlightDate) {
 	public void setPreFlightDate(String preFlightDate) {
 		this.preFlightDate = preFlightDate;
 		this.preFlightDate = preFlightDate;
 	}
 	}
+
+	public String getPreFlightno() {
+		return preFlightno;
+	}
+
+	public void setPreFlightno(String preFlightno) {
+		this.preFlightno = preFlightno;
+	}
+
 }
 }
 
 

@@ -198,7 +198,7 @@
 		"ORIGINMANIFESTMASTER"."WAYBILLNOMASTER" AS ORIGINAL_BILLNO,
 		"ORIGINMANIFESTMASTER"."WAYBILLNOMASTER" AS ORIGINAL_BILLNO,
 		 #{preCarrier} AS PRE_CARRIER,
 		 #{preCarrier} AS PRE_CARRIER,
 		 #{preFlightno} AS PRE_FLIGHTNO,
 		 #{preFlightno} AS PRE_FLIGHTNO,
-		 #{preFlightDate} AS PRE_FLIGHTDATE,
+		 TO_DATE( #{preFlightDate}, 'yyyy-mm-dd') AS PRE_FLIGHTDATE,
 		"ORIGINMANIFESTMASTER"."WAYBILLNOMASTER" AS PRE_BILLNO,
 		"ORIGINMANIFESTMASTER"."WAYBILLNOMASTER" AS PRE_BILLNO,
 		"ORIGINMANIFESTMASTER"."TOTALPIECE" AS BILLPIECE,
 		"ORIGINMANIFESTMASTER"."TOTALPIECE" AS BILLPIECE,
 		"ORIGINMANIFESTMASTER"."TOTALWEIGHT" AS BILLWEIGHT,
 		"ORIGINMANIFESTMASTER"."TOTALWEIGHT" AS BILLWEIGHT,