|
@@ -63,7 +63,6 @@ namespace SiteCore.Handler
|
|
|
|
|
|
|
|
string poscode = CurrentUser.UserPost.Post.Code;
|
|
string poscode = CurrentUser.UserPost.Post.Code;
|
|
|
DataStruct dStruct = GetPostStruct();
|
|
DataStruct dStruct = GetPostStruct();
|
|
|
-
|
|
|
|
|
//string a = SecurityHelper.DecryptSymmetric("YDaPXIhsKgw=");
|
|
//string a = SecurityHelper.DecryptSymmetric("YDaPXIhsKgw=");
|
|
|
//jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\领淘文件名命名规范.xls");
|
|
//jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\领淘文件名命名规范.xls");
|
|
|
//apiHelper.Api_SyncOrderByTime("598825");
|
|
//apiHelper.Api_SyncOrderByTime("598825");
|
|
@@ -1199,7 +1198,29 @@ namespace SiteCore.Handler
|
|
|
entity.IsSF = 2;
|
|
entity.IsSF = 2;
|
|
|
sfTagMSg = "顺丰到付";
|
|
sfTagMSg = "顺丰到付";
|
|
|
}
|
|
}
|
|
|
|
|
+ if (entity.SupplierId == 19 && entity.OrderState == 6)
|
|
|
|
|
+ {
|
|
|
|
|
+ string deliveryWayName = "";
|
|
|
|
|
+ if (sfTagstr == "撤销顺丰")
|
|
|
|
|
+ {
|
|
|
|
|
+ sfTagstr = "普通快递";
|
|
|
|
|
+ }
|
|
|
|
|
+ if (sfTagstr == "顺丰寄付")
|
|
|
|
|
+ {
|
|
|
|
|
+ sfTagstr = "顺丰特快寄付";
|
|
|
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ if (sfTagstr == "顺丰到付")
|
|
|
|
|
+ {
|
|
|
|
|
+ sfTagstr = "顺丰特快到付";
|
|
|
|
|
+ }
|
|
|
|
|
+ string result = apichyHelper.updateExpressMark(entity.OrderSn, sfTagstr);
|
|
|
|
|
+ if ("修改失败".Equals(result))
|
|
|
|
|
+ {
|
|
|
|
|
+ returnErrorMsg("修改失败");
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
entity.Update();
|
|
entity.Update();
|
|
|
apiVo = new ApiVo();
|
|
apiVo = new ApiVo();
|
|
|
apiVo.orderNumber = entity.ctid;
|
|
apiVo.orderNumber = entity.ctid;
|
|
@@ -5275,7 +5296,7 @@ namespace SiteCore.Handler
|
|
|
commonHelper.UpdateRelationOrder(entity.ctid);
|
|
commonHelper.UpdateRelationOrder(entity.ctid);
|
|
|
commonHelper.insertToBuchaForDelivery(mainEn.tid, mainEn.posCode, dcomcode, outSid);
|
|
commonHelper.insertToBuchaForDelivery(mainEn.tid, mainEn.posCode, dcomcode, outSid);
|
|
|
CeErpSukuraData.createInfo(entity.ctid, 4);
|
|
CeErpSukuraData.createInfo(entity.ctid, 4);
|
|
|
- if (entity.SupplierId == 64 || entity.SupplierId == 80)
|
|
|
|
|
|
|
+ if (entity.SupplierId == 64 || entity.SupplierId == 80 || entity.SupplierId == 126)
|
|
|
{
|
|
{
|
|
|
commonHelper.sendCytExpress(exinfo);
|
|
commonHelper.sendCytExpress(exinfo);
|
|
|
}
|
|
}
|
|
@@ -6286,7 +6307,7 @@ namespace SiteCore.Handler
|
|
|
commonHelper.UpdateRelationOrder(entity.ctid);
|
|
commonHelper.UpdateRelationOrder(entity.ctid);
|
|
|
CeErpSukuraData.createInfo(ctid, 4);
|
|
CeErpSukuraData.createInfo(ctid, 4);
|
|
|
commonHelper.insertToBuchaForDelivery(mainEn.tid, mainEn.posCode, cpCode, curUseWayBillCode);
|
|
commonHelper.insertToBuchaForDelivery(mainEn.tid, mainEn.posCode, cpCode, curUseWayBillCode);
|
|
|
- if (entity.SupplierId == 64 || entity.SupplierId == 80)
|
|
|
|
|
|
|
+ if (entity.SupplierId == 64 || entity.SupplierId == 80 || entity.SupplierId == 126)
|
|
|
{
|
|
{
|
|
|
commonHelper.sendCytExpress(exinfo);
|
|
commonHelper.sendCytExpress(exinfo);
|
|
|
}
|
|
}
|
|
@@ -6326,7 +6347,7 @@ namespace SiteCore.Handler
|
|
|
exinfo.Create();
|
|
exinfo.Create();
|
|
|
commonHelper.UpdateRelationOrder(entity.ctid);
|
|
commonHelper.UpdateRelationOrder(entity.ctid);
|
|
|
CeErpSukuraData.createInfo(entity.ctid, 4);
|
|
CeErpSukuraData.createInfo(entity.ctid, 4);
|
|
|
- if (entity.SupplierId == 64 || entity.SupplierId == 80)
|
|
|
|
|
|
|
+ if (entity.SupplierId == 64 || entity.SupplierId == 80 || entity.SupplierId == 126)
|
|
|
{
|
|
{
|
|
|
commonHelper.sendCytExpress(exinfo);
|
|
commonHelper.sendCytExpress(exinfo);
|
|
|
}
|
|
}
|
|
@@ -6437,7 +6458,7 @@ namespace SiteCore.Handler
|
|
|
commonHelper.UpdateRelationOrder(ceErpTradeCell.ctid);
|
|
commonHelper.UpdateRelationOrder(ceErpTradeCell.ctid);
|
|
|
CeErpSukuraData.createInfo(ctid, 4);
|
|
CeErpSukuraData.createInfo(ctid, 4);
|
|
|
commonHelper.insertToBuchaForDelivery(ceErpTrade.tid, ceErpTrade.posCode, cpCode, curUseWayBillCode);
|
|
commonHelper.insertToBuchaForDelivery(ceErpTrade.tid, ceErpTrade.posCode, cpCode, curUseWayBillCode);
|
|
|
- if (ceErpTradeCell.SupplierId == 64 || ceErpTradeCell.SupplierId == 80)
|
|
|
|
|
|
|
+ if (ceErpTradeCell.SupplierId == 64 || ceErpTradeCell.SupplierId == 80 || entity.SupplierId == 126)
|
|
|
{
|
|
{
|
|
|
commonHelper.sendCytExpress(exinfo);
|
|
commonHelper.sendCytExpress(exinfo);
|
|
|
}
|
|
}
|
|
@@ -6545,7 +6566,7 @@ namespace SiteCore.Handler
|
|
|
exinfo.print_time = DateTime.Now;
|
|
exinfo.print_time = DateTime.Now;
|
|
|
exinfo.printUser = CurrentUser.UserName;
|
|
exinfo.printUser = CurrentUser.UserName;
|
|
|
exinfo.Create();
|
|
exinfo.Create();
|
|
|
- if (entity.SupplierId == 64 || entity.SupplierId == 80)
|
|
|
|
|
|
|
+ if (entity.SupplierId == 64 || entity.SupplierId == 80 || entity.SupplierId == 126)
|
|
|
{
|
|
{
|
|
|
commonHelper.sendCytExpress(exinfo);
|
|
commonHelper.sendCytExpress(exinfo);
|
|
|
}
|
|
}
|