edit

SiteCore/Handler/noti.cs

@@ -651,6 +651,14 @@ namespace SiteCore.Handler
 
                                         if (response.msg == "设计共创：成功")
                                         {
+                                            if (entity.ctid.IndexOf("S_") == -1)
+                                            {
+                                                int suid = commonHelper.autoDistributeToSupplier(entity); //自动分配供应商
+                                                entity.SupplierId = suid;
+                                                string suname = commonHelper.getSupplierNameById(entity.SupplierId);
+                                                LogHelper.addLog(entity.ctid, 0, "匹配供应商：" + suname, entity.OrderState);
+                                            }
+
                                             entity.OrderState = Convert.ToInt32(OrderState.待设计);
                                             entity.DesignUserId = 3542;
                                             entity.WaitDesignTime = DateTime.Now;

SiteCore/Handler/sync.order.cs

@@ -2351,7 +2351,7 @@ namespace SiteCore.Handler
                             return;
                         }
                         //157赖橙帆 159林晨
-                        if (entity.OrderState > 3 && entity.DispatchSort == 2 && userid != 3542 && CurrentUser.UserPost.Post.Code != "SysAdmin" && CurrentUser.UserPost.Post.Code != "Summarize" && CurrentUser.UserID != 157 && CurrentUser.UserID != 159)
+                        if (entity.OrderState > 3 && entity.DispatchSort == 2 && userid != 3542 && CurrentUser.UserPost.Post.Code != "SysAdmin" && CurrentUser.UserPost.Post.Code != "Summarize" && CurrentUser.UserID != 157 && CurrentUser.UserID != 159 && CurrentUser.UserID != 1479)
                         {
                             returnErrorMsg("指派设计共创无法再次指派！");
                             return;
@@ -4268,7 +4268,6 @@ namespace SiteCore.Handler
             }
 
             lw.Add(string.Format("OrderState = 6 and (CONVERT(VARCHAR,attachments) != '' and attachments is not null) "));
-            lw.Add(string.Format("type != 'PDD' "));
             lw.Add(string.Format("(IsXianHuo=0 or (IsXianHuo=1 and IsReturn=0)) "));
 
             dStruct.Order = "MemoOpt desc,IsSF desc, FinishPlaceTime desc, ctid desc";
@@ -7326,6 +7325,7 @@ namespace SiteCore.Handler
             var mainwhere = string.Join(" and ", lw.ToArray());
             string ro_json = "";
             string type = GetPostString("gather_type");
+            int number = 0;
             if (poscode == "AfterSale")
             {
                 //处理中
@@ -7337,12 +7337,13 @@ namespace SiteCore.Handler
                     try
                     {
                         dt = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
+                        number = Convert.ToInt32(dt.Rows[0]["number"]);
                     }
                     catch (Exception e)
                     {
                         dt = new DataTable();
                     }
-                    returnSuccess(JsonConvert.SerializeObject(new { Handling = dt.Rows[0]["number"] }));
+                    returnSuccess(JsonConvert.SerializeObject(new { Handling = number }));
                     return;
                 }
                 if (type == "Wait")
@@ -7353,12 +7354,13 @@ namespace SiteCore.Handler
                     try
                     {
                         dt1 = DbHelper.DbConn.ExecuteDataset(sql1).Tables[0];
+                        number = Convert.ToInt32(dt1.Rows[0]["number"]);
                     }
                     catch (Exception e)
                     {
                         dt1 = new DataTable();
                     }
-                    returnSuccess(JsonConvert.SerializeObject(new { Wait = dt1.Rows[0]["number"] }));
+                    returnSuccess(JsonConvert.SerializeObject(new { Wait = number }));
                     return;
                 }
                 if (type == "back")
@@ -7369,12 +7371,13 @@ namespace SiteCore.Handler
                     try
                     {
                         dt2 = DbHelper.DbConn.ExecuteDataset(sql2).Tables[0];
+                        number = Convert.ToInt32(dt2.Rows[0]["number"]);
                     }
                     catch (Exception e)
                     {
                         dt2 = new DataTable();
                     }
-                    returnSuccess(JsonConvert.SerializeObject(new { back = dt2.Rows[0]["number"] }));
+                    returnSuccess(JsonConvert.SerializeObject(new { back = number }));
                     return;
                 }
                 if (type == "preCompletion")
@@ -7385,12 +7388,13 @@ namespace SiteCore.Handler
                     try
                     {
                         dt3 = DbHelper.DbConn.ExecuteDataset(sql3).Tables[0];
+                        number = Convert.ToInt32(dt3.Rows[0]["number"]);
                     }
                     catch (Exception e)
                     {
                         dt3 = new DataTable();
                     }
-                    returnSuccess(JsonConvert.SerializeObject(new { preCompletion = dt3.Rows[0]["number"] }));
+                    returnSuccess(JsonConvert.SerializeObject(new { preCompletion = number }));
                     return;
                 }
                 if (type == "documentary")
@@ -7401,12 +7405,13 @@ namespace SiteCore.Handler
                     try
                     {
                         dt4 = DbHelper.DbConn.ExecuteDataset(sql4).Tables[0];
+                        number = Convert.ToInt32(dt4.Rows[0]["number"]);
                     }
                     catch (Exception e)
                     {
                         dt4 = new DataTable();
                     }
-                    returnSuccess(JsonConvert.SerializeObject(new { documentary = dt4.Rows[0]["number"] }));
+                    returnSuccess(JsonConvert.SerializeObject(new { documentary = number }));
                     return;
                 }
                 if (type == "reBack")
@@ -7417,12 +7422,13 @@ namespace SiteCore.Handler
                     try
                     {
                         dt1 = DbHelper.DbConn.ExecuteDataset(sql1).Tables[0];
+                        number = Convert.ToInt32(dt1.Rows[0]["number"]);
                     }
                     catch (Exception e)
                     {
                         dt1 = new DataTable();
                     }
-                    returnSuccess(JsonConvert.SerializeObject(new { reBack = dt1.Rows[0]["number"] }));
+                    returnSuccess(JsonConvert.SerializeObject(new { reBack = number }));
                     return;
                 }
             }
@@ -7436,12 +7442,13 @@ namespace SiteCore.Handler
                     try
                     {
                         dt = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
+                        number = Convert.ToInt32(dt.Rows[0]["number"]);
                     }
                     catch (Exception e)
                     {
                         dt = new DataTable();
                     }
-                    returnSuccess(JsonConvert.SerializeObject(new { puBack = dt.Rows[0]["number"] }));
+                    returnSuccess(JsonConvert.SerializeObject(new { puBack = number }));
                     return;
                 }
                 if (type == "reBack")
@@ -7452,12 +7459,13 @@ namespace SiteCore.Handler
                     try
                     {
                         dt1 = DbHelper.DbConn.ExecuteDataset(sql1).Tables[0];
+                        number = Convert.ToInt32(dt1.Rows[0]["number"]);
                     }
                     catch (Exception e)
                     {
                         dt1 = new DataTable();
                     }
-                    returnSuccess(JsonConvert.SerializeObject(new { reBack = dt1.Rows[0]["number"] }));
+                    returnSuccess(JsonConvert.SerializeObject(new { reBack = number }));
                     return;
                 }
                 if (type == "examEd")
@@ -7468,12 +7476,13 @@ namespace SiteCore.Handler
                     try
                     {
                         dt2 = DbHelper.DbConn.ExecuteDataset(sql2).Tables[0];
+                        number = Convert.ToInt32(dt2.Rows[0]["number"]);
                     }
                     catch (Exception e)
                     {
                         dt2 = new DataTable();
                     }
-                    returnSuccess(JsonConvert.SerializeObject(new { examEd = dt2.Rows[0]["number"] }));
+                    returnSuccess(JsonConvert.SerializeObject(new { examEd = number }));
                     return;
                 }
                 if (type == "waitExam")
@@ -7484,12 +7493,13 @@ namespace SiteCore.Handler
                     try
                     {
                         dt3 = DbHelper.DbConn.ExecuteDataset(sql3).Tables[0];
+                        number = Convert.ToInt32(dt3.Rows[0]["number"]);
                     }
                     catch (Exception e)
                     {
                         dt3 = new DataTable();
                     }
-                    returnSuccess(JsonConvert.SerializeObject(new { waitExam = dt3.Rows[0]["number"] }));
+                    returnSuccess(JsonConvert.SerializeObject(new { waitExam = number }));
                     return;
                 }
                 if (type == "Handling")
@@ -7500,12 +7510,13 @@ namespace SiteCore.Handler
                     try
                     {
                         dt4 = DbHelper.DbConn.ExecuteDataset(sql4).Tables[0];
+                        number = Convert.ToInt32(dt4.Rows[0]["number"]);
                     }
                     catch (Exception e)
                     {
                         dt4 = new DataTable();
                     }
-                    returnSuccess(JsonConvert.SerializeObject(new { Handling = dt4.Rows[0]["number"] }));
+                    returnSuccess(JsonConvert.SerializeObject(new { Handling = number }));
                     return;
                 }
                 if (type == "Wait")
@@ -7516,12 +7527,13 @@ namespace SiteCore.Handler
                     try
                     {
                         dt5 = DbHelper.DbConn.ExecuteDataset(sql5).Tables[0];
+                        number = Convert.ToInt32(dt5.Rows[0]["number"]);
                     }
                     catch (Exception e)
                     {
                         dt5 = new DataTable();
                     }
-                    returnSuccess(JsonConvert.SerializeObject(new { Wait = dt5.Rows[0]["number"] }));
+                    returnSuccess(JsonConvert.SerializeObject(new { Wait = number }));
                     return;
                 }
                 if (type == "documentary")
@@ -7532,12 +7544,13 @@ namespace SiteCore.Handler
                     try
                     {
                         dt6 = DbHelper.DbConn.ExecuteDataset(sql6).Tables[0];
+                        number = Convert.ToInt32(dt6.Rows[0]["number"]);
                     }
                     catch (Exception e)
                     {
                         dt6 = new DataTable();
                     }
-                    returnSuccess(JsonConvert.SerializeObject(new { documentary = dt6.Rows[0]["number"] }));
+                    returnSuccess(JsonConvert.SerializeObject(new { documentary = number }));
                     return;
                 }
             }

SiteCore/taobao/designHelper.cs

@@ -57,7 +57,7 @@ namespace SiteCore.Handler
                 }
             }
         }
-        static string pUrl = "http://47.122.60.212:8181/api/originalOrder/";
+        static string pUrl = "http://api.lingtao8.com/api/manager/";
         //static string pUrl = "http://47.122.40.91:9999/api/manager/";
 
         static HttpHelper tb_http = new HttpHelper();
@@ -68,8 +68,7 @@ namespace SiteCore.Handler
             {
                 return new designApiResponseVo(-1, "补差价订单不需要过设计系统");
             }
-            string post_url = pUrl + "add";
-            //string post_url = pUrl + "createOrder";
+            string post_url = pUrl + "createOrder";
             CeErpOrderFormData formData = null;
             if (post != "SysAdmin" && post != "Summarize")
             {