edit

SiteCore/Handler/sync.order.cs

@@ -53,7 +53,6 @@ namespace SiteCore.Handler
 
             string poscode = CurrentUser.UserPost.Post.Code;
             DataStruct dStruct = GetPostStruct();
-
             //apiHelper.Api_SyncOrderByTime("598825");
             //apiHelper.API_GetWaybill("ZTO-CAINIAO-TZJK", "4233447147588233939");
             //apiHelper.Api_SyacOrder("2460143282114312263", "yujia");
@@ -274,13 +273,10 @@ namespace SiteCore.Handler
                             if (payment == refund_fees)
                             {
                                 dr["refund_fees"] = Math.Round(refund_fees, 2);
-                                continue; // 跳过当前迭代
                             }
                             else if (refund_fees == total_fee)
                             {
                                 dr["refund_fees"] = payment;
-                                continue; // 跳过当前迭代
-
                             }
                             else
                             {
@@ -5277,7 +5273,8 @@ namespace SiteCore.Handler
             string fdate2 = GetPostString("finishdate2");
             string fdw = GetDateMinuteWhere("print_time", fdate1, fdate2);
             if (fdw.Length > 0) lw.Add(fdw);
-
+            string supplierId = GetPostString("supplierId");
+            if (supplierId.Length > 0) lw.Add(string.Format("SupplierName = '{0}'", supplierId));
             if (listtype == 1)
             {
                 lw.Add(string.Format("importUserId !=0"));
@@ -7115,7 +7112,7 @@ namespace SiteCore.Handler
             List<string> lw = new List<string>();
             int st = GetInt("st");
             string tid = GetPostString("ctid");
-            if (tid.Length > 0) lw.Add(string.Format("(ctid = '{0}' or orderSn = '{0}')", tid));
+            if (tid.Length > 0) lw.Add(string.Format("(tid = '{0}' or ctid = '{0}' or orderSn = '{0}')", tid));
 
             string shopname = GetPostString("shopname");
             if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
@@ -11837,6 +11834,7 @@ namespace SiteCore.Handler
                 DateTime palceTime = DateTime.Parse(row["FinishPlaceTime"].ToString());
                 DateTime palceTimeStart = DateTime.Parse(palceTime.ToString("yyyy-MM-dd 00:00:00"));
                 DateTime palceTimeEnd = DateTime.Parse(palceTime.ToString("yyyy-MM-dd 23:59:59"));
+                DateTime palceTimeTwoEnd = DateTime.Parse(palceTime.ToString("yyyy-MM-dd 23:59:59")).AddHours(2);
                 if (DateTime.Compare(start, palceTime) < 0 && DateTime.Compare(end, palceTime) > 0)
                 {
                     map["dayTotal"]++;
@@ -11856,9 +11854,20 @@ namespace SiteCore.Handler
                 {
 
                     DateTime FinishDeliveryTime = DateTime.Parse(row["FinishDeliveryTime"].ToString());
-                    if (DateTime.Compare(palceTimeStart, FinishDeliveryTime) < 0 && DateTime.Compare(palceTimeEnd, FinishDeliveryTime) > 0)//当天发货
+                    if (supplierId == 64 && "不干胶".Equals(type) && !seller_memo.Contains("牙签"))
                     {
-                        map["today"]++;
+                        if (DateTime.Compare(palceTimeStart, FinishDeliveryTime) < 0 && DateTime.Compare(palceTimeEnd, FinishDeliveryTime) > 0)//当天发货
+                        {
+                            map["today"]++;
+                        }
+                    }
+                    else
+                    {
+
+                        if (DateTime.Compare(palceTimeStart, FinishDeliveryTime) < 0 && DateTime.Compare(palceTimeEnd, FinishDeliveryTime) > 0)//当天发货
+                        {
+                            map["today"]++;
+                        }
                     }
                 }
                 if (row["UnusualTime"].ToString() != null && row["UnusualTime"].ToString().Length > 0)
@@ -11883,6 +11892,7 @@ namespace SiteCore.Handler
                             if (DateTime.Compare(FinishPlaceTime, four) < 0)
                             {
                                 map["dayDev"]++;
+
                             }
                         }
 
@@ -11907,8 +11917,6 @@ namespace SiteCore.Handler
                         if (supplierId == 97)
                         {
                             supplierId = 97;
-                            Debug.WriteLine(map["dayTotal"].ToString() + "-" + map["dayDev"].ToString());
-
                         }
                     }
                 }

SiteCore/taobao/commonHelper.cs

@@ -1761,7 +1761,7 @@ namespace SiteCore
 
         public static void getuserId()
         {
-            string createtime = "2024-01-22 13:50:39.000";
+            string createtime = "2024-01-01 00:50:39.000";
             string textContent = "";
             int row_num = 100;
             Dictionary<string, List<string>> shop_userNick = new Dictionary<string, List<string>>();

SiteCore/taobao/dataHelper.cs

@@ -382,8 +382,8 @@ namespace SiteCore.Handler
 
         public static void api_orderBack(string orderNumber, string state, string content)
         {
-            //string post_url = "http://api.presales.lingtao8.com/open/order/orderProcessReturn";
-            string post_url = "http://admin.lingtao.zmht888.com/prod-api/open/order/orderProcessReturn";
+            string post_url = "http://api.presales.lingtao8.com/open/order/orderProcessReturn";
+            //string post_url = "http://admin.lingtao.zmht888.com/prod-api/open/order/orderProcessReturn";
             string remoteInfo = "";
             string param = JsonConvert.SerializeObject(new
             {

SiteCore/taobao/designHelper.cs

@@ -58,8 +58,8 @@ namespace SiteCore.Handler
             }
         }
 
-        //static string pUrl = "http://47.122.60.212:8181/api/originalOrder/";
-        static string pUrl = "http://47.122.40.91:8181/api/originalOrder/";
+        static string pUrl = "http://47.122.60.212:8181/api/originalOrder/";
+        //static string pUrl = "http://47.122.40.91:8181/api/originalOrder/";
 
         static HttpHelper tb_http = new HttpHelper();
 

SiteCore/taobao/preSalesHelper.cs

@@ -52,6 +52,7 @@ namespace SiteCore.Handler
                 }
                 catch (Exception ex)
                 {
+                    XLog.SaveLog(0, "preSalesHelper:" + ex);
                     conError("处理接口错误，服务器返回错误");
                 }
                 finally
@@ -452,7 +453,7 @@ namespace SiteCore.Handler
                         }
                         if (userid == 3542 && entity.seller_memo != "")
                         {
-                            designApiResponseVo response = designHelper.API_GetPrintData_CreateOrder(entity, CurrentUser.UserPost.Post.Code);
+                            designApiResponseVo response = designHelper.API_GetPrintData_CreateOrder(entity);
                             LogHelper.addLog(entity.ctid, 3542, "手动派单:" + response.msg, entity.OrderState);
                             if (response.msg != "设计共创：成功")
                             {

ecomServer/MainForm.cs

@@ -730,7 +730,23 @@ namespace ErpServer
                             WriteLog(string.Format("共创派单出错 | {0} | {1}", DateTime.Now.ToString(), dr["ctid"].ToString() + ex.Message.ToString()));
                         }
                     }
-                    if (selfTime.Hour >= 9 && selfTime.Hour <= 21 && !(selfTime.Hour == 9 && selfTime.Minute < 10))
+                    bool isStart = false;
+                    string syncType = "normal";
+                    if (selfTime.Hour > 6 && selfTime.Hour < 9 || (selfTime.Hour == 6 && selfTime.Minute >= 30))
+                    {
+                        DataTable dt = SqlHelper.ExecuteDataset("SELECT count(*) as number FROM [dbo].[view_ErpUser] WHERE ID in (33,36) and  OnDuty > 0 ").Tables[0];
+                        if (dt != null && dt.Rows.Count > 0 && Convert.ToInt32(dt.Rows[0]["number"]) > 0)
+                        {
+                            isStart = true;
+                            syncType = "wx";
+                        }
+                    }
+                    else if (selfTime.Hour >= 9 && selfTime.Hour <= 21 && !(selfTime.Hour == 9 && selfTime.Minute < 10))
+                    {
+                        isStart = true;
+                    }
+                    //开始派单状态
+                    if (isStart)
                     {
                         string sql = "select tid,ctid,IsOldCustomer,shopid,payment,ProductId,isDianziOrder from view_ErpTradeCell where orderstate=2 and productid<>0 and designuserid=0  and payment>0 and isrefund=0 order by IsUrgency desc,pay_time asc;";
                         DataTable dt = SqlHelper.ExecuteDataset(sql).Tables[0];
@@ -802,8 +818,11 @@ namespace ErpServer
                                                 addLog(dr["ctid"].ToString(), 0, "自动派单:" + result.msg, Convert.ToInt32(OrderState.待设计));
                                             }
                                         }
+                                        if ("normal".Equals(syncType))
+                                        {
+                                            SqlHelper.ExecuteNonQueryStoreWithTimeOut("sp_autodispatch_day", sqlParameter, 10);
+                                        }
 
-                                        SqlHelper.ExecuteNonQueryStoreWithTimeOut("sp_autodispatch_day", sqlParameter, 10);
                                     }
                                     else
                                     {
@@ -820,7 +839,14 @@ namespace ErpServer
                                                 addLog(dr["ctid"].ToString(), 0, "自动派单:" + result.msg, Convert.ToInt32(OrderState.待设计));
                                             }
                                         }
-                                        SqlHelper.ExecuteNonQueryStoreWithTimeOut("sp_autodispatch", sqlParameter, 10);
+                                        if ("normal".Equals(syncType))
+                                        {
+                                            SqlHelper.ExecuteNonQueryStoreWithTimeOut("sp_autodispatch", sqlParameter, 10);
+                                        }
+                                        if ("wx".Equals(syncType))
+                                        {
+                                            SqlHelper.ExecuteNonQueryStoreWithTimeOut("sp_autodispatch_wx", sqlParameter, 10);
+                                        }
                                     }
                                     res = sqlParameter[2].Value.ToString();
                                     helper.writeLog("自动派单:" + dr["ctid"].ToString() + "-" + res);