zhuyiyi 9 mesiacov pred
rodič
commit
cbfd6970c2

+ 5 - 3
SiteCore/Handler/sync.order.cs

@@ -7396,8 +7396,11 @@ namespace SiteCore.Handler
                         }
                         if (st != "下单员")
                         {
-                            designApiResponseVo response = designHelper.API_GetPrintData_CreateOrder(newentity);
-                            LogHelper.addLog(newentity.ctid, CurrentUser.UserID, "售后单生成指派:" + response.msg, newentity.OrderState, 1);
+                            if (entity.DispatchSort == 2)
+                            {
+                                designApiResponseVo response = designHelper.API_GetPrintData_CreateOrder(newentity);
+                                LogHelper.addLog(newentity.ctid, CurrentUser.UserID, "售后单生成指派:" + response.msg, newentity.OrderState, 1);
+                            }
                         }
                     }
 
@@ -11042,7 +11045,6 @@ namespace SiteCore.Handler
                         return;
                     }
                 }
-                ce.DispatchSort = 0;
                 ce.seller_memo = content;
                 ce.Update();
                 ceErpMessageTip.isVisit = true;

+ 3 - 3
SiteCore/taobao/commonHelper.cs

@@ -1874,7 +1874,7 @@ namespace SiteCore
 
                     if (cell != null)
                     {
-                        if (cell.DesignUserId == 0 || cell.DispatchSort == 2)
+                        if (cell.DesignUserId == 0 || cell.DispatchSort == 2 || cell.seller_memo.Contains("S_"))
                         {
                             designApiResponseVo result = checkOrderDesignInfo(cell, "", data);
                             check_info = result.msg;
@@ -1902,7 +1902,7 @@ namespace SiteCore
         }
         static List<int> products = new List<int>() { 29, 2489, 2517, 2518, 2519, 2520, 2533, 2534, 2558, 2576, 2577, 2578, 2579, 2580, 2581, 2582, 2583, 2584, 2587, 2588, 2589, 2590, 2591, 2592, 2593, 2594, 2595, 2596, 2597, 2598, 2599, 2600, 2601, 2602, 2603, 2604, 2605, 2606, 2607, 2608, 2609, 2610, 2611, 2612, 2613, 2614, 2615, 2616, 2617, 2618, 2619, 2620, 2621, 2622, 2634, 2644, 2645, 2646, 2648, 2649, 2650 };
         static List<int> shops = new List<int>() { 2, 77, 121, 122, 65, 87, 26, 45, 17, 21, 52, 54, 103, 107, 108, 109, 118, 63, 64, 66, 49, 67, 105, 35, 57, 29, 53, 62, 134 };
-        static List<int> no_design_shops = new List<int>() { 134 };
+        static List<int> no_design_shops = new List<int>() { 134, 63, 64, 66 };
         public static designApiResponseVo checkOrderDesignInfo(CeErpTradeCell ceErpTradeCell, string post = "", DataTable dt = null)
         {
 
@@ -1926,7 +1926,7 @@ namespace SiteCore
 
             if ((post != "SysAdmin" && post != "Summarize"))
             {
-                if (ceErpTradeCell.DesignUserId != 0 && ceErpTradeCell.DispatchSort != 2)
+                if (ceErpTradeCell.DesignUserId != 0 && (ceErpTradeCell.DispatchSort != 2 && !ceErpTradeCell.seller_memo.Contains("S_")))
                 {
                     return new designApiResponseVo(-1, "已有设计师无法指派");
                 }

+ 1 - 1
SiteCore/taobao/designHelper.cs

@@ -458,7 +458,7 @@ namespace SiteCore.Handler
 
         public static string API_CheckOrderTo(string orderNumber, string spuId, int shopId)
         {
-            List<int> shopIds = new List<int>() { 5, 6, 8, 10, 11, 12, 14, 15, 16, 17, 18, 21, 23, 24, 27, 28, 31, 32, 56, 61, 124, 126, 127, 128 };
+            List<int> shopIds = new List<int>() { 5, 6, 8, 10, 11, 12, 14, 15, 16, 17, 18, 21, 23, 24, 27, 28, 31, 32, 56, 61, 63, 64, 66, 124, 126, 127, 128 };
             string result = "无";
             if (!shopIds.Contains(shopId))
             {