Merge branch 'master' of http://git.ts.e57.cn/chfei/KJD_WebService

KJD_WebService/BLL/WXXD/WXOrderManage.cs

@@ -1111,6 +1111,15 @@ namespace KJD_Web.BLL.WXXD
 						retry_acquire_success = row["retry_acquire_success"].ParseToNullableInt(),
 						location_code = row["location_code"].ParseToNullableString(),
 						location_write_time = row["location_write_time"].ParseToNullableString().ParseToDateTimeNullable(),
+						has_return = row["has_return"].ParseToNullableInt(),
+						intercept_address_info = row["intercept_address_info"].ParseToNullableString(),
+						intercept_address_status = row["intercept_address_status"].ParseToNullableInt(),
+						intercept_address_time = row["intercept_address_time"].ParseToNullableString().ParseToDateTimeNullable(),
+						intercept_return_info = row["intercept_return_info"].ParseToNullableString(),
+						intercept_return_status = row["intercept_return_status"].ParseToNullableInt(),
+						intercept_return_time = row["intercept_address_time"].ParseToNullableString().ParseToDateTimeNullable(),
+						out_order_no = row["out_order_no"].ParseToNullableString(),
+						out_sku_id = row["out_sku_id"].ParseToNullableString(),
 					});
 				}
 				return oms_wei_transfer_extra_package_list;

KJD_WebService/Model/WxModel/oms_wei_transfer_extra_package.cs

@@ -49,6 +49,43 @@ namespace KJD_Web.Model.WxModel
 		/// 货架写入时间
 		/// </summary>
 		public DateTime? location_write_time { get; set; }
+
+		/// <summary>
+		/// 外采单号
+		/// </summary>
+		public string out_order_no { get; set; }
+		/// <summary>
+		/// 商品skuId
+		/// </summary>
+		public string out_sku_id { get; set; }
+		/// <summary>
+		/// 拦截退回状态：0未处理，1已退回成功，2退回失败（或其它业务码）
+		/// </summary>
+		public int? intercept_return_status { get; set; }
+		/// <summary>
+		/// 拦截退回时间
+		/// </summary>
+		public DateTime? intercept_return_time { get; set; }
+		/// <summary>
+		/// 拦截退回操作信息（回调/失败信息/备注等）
+		/// </summary>
+		public string intercept_return_info { get; set; }
+		/// <summary>
+		/// 拦截改地址状态：0未处理，1修改成功，2修改失败（或其它业务码）
+		/// </summary>
+		public int? intercept_address_status { get; set; }
+		/// <summary>
+		/// 拦截改地址时间
+		/// </summary>
+		public DateTime? intercept_address_time { get; set; }
+		/// <summary>
+		/// 拦截改地址操作信息（回调/失败信息/备注等）
+		/// </summary>
+		public string intercept_address_info { get; set; }
+		/// <summary>
+		/// 是否有退货：0 无退货，1 有退货
+		/// </summary>
+		public int? has_return { get; set; }
 	}
 
 }