edit

SiteCore/Handler/sync.order.cs

@@ -58,7 +58,7 @@ namespace SiteCore.Handler
 
             string poscode = CurrentUser.UserPost.Post.Code;
             DataStruct dStruct = GetPostStruct();
-            //jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\扇子.xls");
+            //jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\uv特殊工艺价格(1).xls");
             //apiHelper.Api_SyncOrderByTime("598825");
             //apiHelper.API_GetWaybill("ZTO-CAINIAO-TZJK", "4233447147588233939");
             //apiHelper.Api_SyacOrder("2460143282114312263", "yujia");
@@ -3917,10 +3917,11 @@ namespace SiteCore.Handler
                 if (eid != "") entity = CeErpTradeCell.GetByCtid(eid);
                 if (entity != null)
                 {
-                    if (entity.IsHaveNewOrder == 2 && CurrentUser.UserPost.Post.Code != "SysAdmin")
+                    string message = "操作成功！";
+
+                    if (entity.OrderState == 6 || entity.IsHaveNewOrder == 2)
                     {
-                        returnErrorMsg("订单正在下载中无法退回！");
-                        return;
+                        message = "订单有被点击下载。请注意沟通是否已下载完！";
                     }
                     if (CurrentUser.UserPost.Post.Code != "Supplier")//不是供应商打回
                     {
@@ -3936,6 +3937,7 @@ namespace SiteCore.Handler
                     }
                     entity.IsVerifyToSupplier = false;
                     entity.IsReturn = 1;
+                    entity.IsHaveNewOrder = 0;
                     entity.ReturnTime = DateTime.Now;
                     entity.ReturnReason = reason;
                     if (entity.OrderState == 6)
@@ -3945,7 +3947,7 @@ namespace SiteCore.Handler
                     entity.Update();
                     CeErpSukuraData.createInfo(entity.ctid, 5);
                     LogHelper.addLog(entity.ctid, CurrentUser.UserID, "供应商退回下单：" + reason, entity.OrderState);
-                    returnSuccessMsg("操作成功！");
+                    returnSuccessMsg(message);
                     return;
                 }
                 returnErrorMsg("找不到订单记录");
@@ -10489,6 +10491,10 @@ namespace SiteCore.Handler
                 if (checkst.Length > 0) lw.Add(string.Format("MemoOpt={0}", checkst));
                 lw.Add(string.Format("(MemoOpt=3 or MemoOpt=4)"));
             }
+            if (CurrentUser.UserPost.Post.Code == "AfterSale")
+            {
+                lw.Add(string.Format("ShopId in ({0})", CurrentUser.User.pemShop));
+            }
 
             dStruct.Order = "MemoOpt, CheckOrderTime desc, pay_time desc";
             dStruct.MainWhere = string.Join(" and ", lw.ToArray());