上一版本漏提交文件提交

This commit is contained in:
wule committed 2026-09-26 06:28:22 +08:00
1 parent d9c0749093
commit abb2759bdf
3 files changed
+31 -23

No files matched your search

+10 -4
View File
@@ -376,14 +376,20 @@ namespace AllBase.Model.DBModel
set
{
this.SetValue(x => x.SyncLogisticsList, value);
SyncWaybillId = SyncLogisticsList.FirstOrDefault()?.tracking_number;
RealSyncWaybillId = SyncLogisticsList.FirstOrDefault()?.tracking_number;
SyncWaybillIdInfo = SyncLogisticsList.FirstOrDefault()?.tracking_number;
SyncWaybillPickNo = SyncLogisticsList.FirstOrDefault()?.pickup_code;
}
}
public string SyncWaybillId
public string RealSyncWaybillId
{
get { return this.GetValue(x => x.SyncWaybillId); }
set { this.SetValue(x => x.SyncWaybillId, value); }
get { return this.GetValue(x => x.RealSyncWaybillId); }
set { this.SetValue(x => x.RealSyncWaybillId, value); }
}
public string SyncWaybillIdInfo
{
get { return this.GetValue(x => x.SyncWaybillIdInfo); }
set { this.SetValue(x => x.SyncWaybillIdInfo, value); }
}
public string SyncWaybillPickNo
{
@@ -923,9 +923,9 @@ namespace AllBase.Model.DBModel
this.SetValue(x => x.DirectPddBuyerOrder, value);
SyncLogisticsMsg = DirectPddBuyerOrder?.sync_logistics_msg;
// 有单号就不显示错误,否则单号字段显示错误信息
if (ItemOrder.SyncWaybillId.IsNullOrEmpty())
if (ItemOrder.SyncWaybillIdInfo.IsNullOrEmpty())
{
ItemOrder.SyncWaybillId = SyncLogisticsMsg;
ItemOrder.SyncWaybillIdInfo = SyncLogisticsMsg;
SyncLogisticsMsg = "";
}
else
+19 -17
View File
@@ -22,23 +22,23 @@ namespace AllBase.Model.Result
public static string GetPddToTransitWarehouseExpressCompanyCode(string expressCompanyName)
{
if (expressCompanyName == null || expressCompanyName == "") return "";
if (expressCompanyName.Contains("顺丰速运")) return "SF";
if (expressCompanyName.Contains("邮政快递包裹")) return "EMS";
if (expressCompanyName.Contains("邮政电商标快")) return "EMS";
if (expressCompanyName.Contains("邮政EMS")) return "EMS";
if (expressCompanyName.Contains("圆通快递")) return "YTO";
if (expressCompanyName.Contains("圆通速递")) return "YTO";
if (expressCompanyName.Contains("中通快递")) return "ZTO";
if (expressCompanyName.Contains("百世快递")) return "HTKY";
if (expressCompanyName.Contains("百世快运")) return "HTKY";
if (expressCompanyName.Contains("申通快递")) return "STO";
if (expressCompanyName.Contains("韵达快递")) return "YUNDA";
if (expressCompanyName.Contains("韵达速递")) return "YUNDA";
if (expressCompanyName.Contains("京东快递")) return "JDKD";
if (expressCompanyName.Contains("京东快运")) return "JDKD";
if (expressCompanyName.Contains("京东大件物流")) return "JDKD";
if (expressCompanyName.Contains("极兔速递")) return "JTSD";
if (expressCompanyName.Contains("极兔快递")) return "JTSD";
if (expressCompanyName.Contains("顺丰速运") || expressCompanyName == "SF") return "SF";
if (expressCompanyName.Contains("邮政快递包裹") || expressCompanyName == "EMS") return "EMS";
if (expressCompanyName.Contains("邮政电商标快") || expressCompanyName == "EMS") return "EMS";
if (expressCompanyName.Contains("邮政EMS") || expressCompanyName == "EMS") return "EMS";
if (expressCompanyName.Contains("圆通快递") || expressCompanyName == "YTO") return "YTO";
if (expressCompanyName.Contains("圆通速递") || expressCompanyName == "YTO") return "YTO";
if (expressCompanyName.Contains("中通快递") || expressCompanyName == "ZTO") return "ZTO";
if (expressCompanyName.Contains("百世快递") || expressCompanyName == "HTKY") return "HTKY";
if (expressCompanyName.Contains("百世快运") || expressCompanyName == "HTKY") return "HTKY";
if (expressCompanyName.Contains("申通快递") || expressCompanyName == "STO") return "STO";
if (expressCompanyName.Contains("韵达快递") || expressCompanyName == "YUNDA") return "YUNDA";
if (expressCompanyName.Contains("韵达速递") || expressCompanyName == "YUNDA") return "YUNDA";
if (expressCompanyName.Contains("京东快递") || expressCompanyName == "JDKD") return "JDKD";
if (expressCompanyName.Contains("京东快运") || expressCompanyName == "JDKD") return "JDKD";
if (expressCompanyName.Contains("京东大件物流") || expressCompanyName == "JDKD") return "JDKD";
if (expressCompanyName.Contains("极兔速递") || expressCompanyName == "JTSD") return "JTSD";
if (expressCompanyName.Contains("极兔快递") || expressCompanyName == "JTSD") return "JTSD";
return "OTHER";
//SF 顺丰 //EMS 邮政快递 //YTO 圆通 //ZTO 中通 //HTKY 百世 //STO 申通 //YUNDA 韵达 //JDKD 京东快递 //JTSD 极兔
}
@@ -442,6 +442,8 @@ namespace AllBase.Model.Result
if (outExpressCompanyMsg.Contains("京东快运")) return "京东快运";
if (outExpressCompanyMsg.Contains("京东大件物流")) return "京东大件物流";
if (outExpressCompanyMsg.Contains("其他快递")) return "其他快递";
if (outExpressCompanyMsg.Length < 10)
return outExpressCompanyMsg;
return "物流名称获取失败";
}
}