新增点3额外发货，新增下单统计售后

SiteCore/Handler/noti.cs

@@ -86,7 +86,7 @@ namespace SiteCore.Handler
                     {
                         string dcomcode = commonHelper.GetD3ComCode(cpCode, cpCode);
 
-                        apires = apiHelper.API_LogisticsOnlineSend(mainEn.tid, mainEn.posCode, dcomcode, outsid);
+                        apires = apiHelper.API_LogisticsOnlineSend(mainEn.tid, mainEn.posCode, dcomcode, outsid, tbtid);
                     }
                     //string apires = apiHelper.API_LogisticsOnlineSend(entity.tid, mainEn.posCode, cpCode, codeObj.waybillCode);
                     //打单后发货
@@ -268,7 +268,7 @@ namespace SiteCore.Handler
                     {
                         string dcomcode = commonHelper.GetD3ComCode(cpCode, cpCode);
 
-                        apires = apiHelper.API_LogisticsOnlineSend(mainEn.tid, mainEn.posCode, dcomcode, outsid);
+                        apires = apiHelper.API_LogisticsOnlineSend(mainEn.tid, mainEn.posCode, dcomcode, outsid, tbtid);
                     }
                     //string apires = apiHelper.API_LogisticsOnlineSend(entity.tid, mainEn.posCode, cpCode, codeObj.waybillCode);
                     //打单后发货
@@ -369,7 +369,7 @@ namespace SiteCore.Handler
                     {
                         string dcomcode = commonHelper.GetD3ComCode(cpCode, cpCode);
 
-                        apires = apiHelper.API_LogisticsOnlineSend(mainEn.tid, mainEn.posCode, dcomcode, outsid);
+                        apires = apiHelper.API_LogisticsOnlineSend(mainEn.tid, mainEn.posCode, dcomcode, outsid, tbtid);
                     }
                     //string apires = apiHelper.API_LogisticsOnlineSend(entity.tid, mainEn.posCode, cpCode, codeObj.waybillCode);
                     //打单后发货
@@ -491,7 +491,7 @@ namespace SiteCore.Handler
                 if (apires.IndexOf("发货成功") == -1)
                 {
                     //XLog.SaveLog(0, "补差价单虚拟发货失败，" + tid + "," + posCode + "," + apires);
-                    string wures = apiHelper.API_LogisticsOnlineSend(tid, posCode, comCode, outsid);
+                    string wures = apiHelper.API_LogisticsOnlineSend(tid, posCode, comCode, outsid, tbtid);
                     if (wures.IndexOf("发货成功") == -1)
                     {
                         XLog.SaveLog(0, "chy补差价单实物发货失败，" + tid + "," + posCode + "," + wures);

SiteCore/Handler/sync.order.cs

@@ -5325,7 +5325,7 @@ namespace SiteCore.Handler
                     {
                         //string res = taobaoHelper.LogisticsOnlineSend(sessionkey,entity.tid,comCode,outSid);
 
-                        apires = apiHelper.API_LogisticsOnlineSend(mainEn.tid, mainEn.posCode, dcomcode, outSid);
+                        apires = apiHelper.API_LogisticsOnlineSend(mainEn.tid, mainEn.posCode, dcomcode, outSid, entity.ctid);
                     }
 
                     if ((apires.IndexOf("发货成功") != -1 && apires.IndexOf("true") != -1) || isInitOrderDeliv)
@@ -5434,7 +5434,7 @@ namespace SiteCore.Handler
                         else
                         {
                             string dcomcode = commonHelper.GetD3ComCode(expInfo.company_code, expInfo.company_name);
-                            string apires = apiHelper.API_LogisticsOnlineSend(dt.Rows[0]["tid"].ToString(), dt.Rows[0]["posCode"].ToString(), dcomcode, expInfo.out_sid);
+                            string apires = apiHelper.API_LogisticsOnlineSend(dt.Rows[0]["tid"].ToString(), dt.Rows[0]["posCode"].ToString(), dcomcode, expInfo.out_sid, ctid);
                             if (apires.IndexOf("发货成功") != -1 && apires.IndexOf("true") != -1 || isInitOrderDeliv)
                             {
                                 expInfo.delivery_memo = "发货成功";
@@ -6322,7 +6322,7 @@ namespace SiteCore.Handler
                         }
                         else
                         {
-                            apires = apiHelper.API_LogisticsOnlineSend(mainEn.tid, mainEn.posCode, cpCode, curUseWayBillCode);
+                            apires = apiHelper.API_LogisticsOnlineSend(mainEn.tid, mainEn.posCode, cpCode, curUseWayBillCode, entity.ctid);
                         }
                         //string apires = apiHelper.API_LogisticsOnlineSend(entity.tid, mainEn.posCode, cpCode, codeObj.waybillCode);
                         //打单后发货
@@ -6401,7 +6401,7 @@ namespace SiteCore.Handler
                                 entity.FinishDeliveryTime = DateTime.Now;
                                 btnType = "已发货";
                                 entity.Update();
-
+                                commonHelper.aftersaleSend(entity.ctid, cpCode, curUseWayBillCode);
                                 CeErpExpressInfo exinfo = new CeErpExpressInfo();
                                 exinfo.tid = entity.ctid;
                                 exinfo.out_sid = curUseWayBillCode;
@@ -6483,7 +6483,7 @@ namespace SiteCore.Handler
                             {
                                 if (!send_list.Contains(ceErpTrade.tid))
                                 {
-                                    apires = apiHelper.API_LogisticsOnlineSend(ceErpTrade.tid, ceErpTrade.posCode, cpCode, curUseWayBillCode);
+                                    apires = apiHelper.API_LogisticsOnlineSend(ceErpTrade.tid, ceErpTrade.posCode, cpCode, curUseWayBillCode, ctid);
                                 }
                                 else
                                 {
@@ -12754,10 +12754,14 @@ namespace SiteCore.Handler
                 endtime = dateTime.ToString("yyyy-MM-dd 00:00:00");
                 end = DateTime.Parse(endtime);
             }
-
-            string sql = string.Format("select SupplierId,ProductId,seller_memo,ProductCount,ProductName,payment,SupplierName,UnusualTime,FinishPlaceTime,OrderState,FinishDeliveryTime from view_ErpTradeCell where ( ( FinishPlaceTime BETWEEN '{0}' AND '{1}' ) OR ( OrderState = 6 AND UnusualTag = 5 AND IsRefund <= 1 ) )  AND IsSample = 0 and SupplierName is not null ", starttime, endtime);
+            string startMonthDate = commonHelper.FirstDayOfMonth(DateTime.Now).ToString("yyyy-MM-dd 00:00:00");
+            string endMonthDate = commonHelper.LastDayOfMonth(DateTime.Now).ToString("yyyy-MM-dd 23:59:59");
+            string sql = string.Format("select SupplierId,ProductId,seller_memo,ProductCount,ProductName,payment,SupplierName,UnusualTime,FinishPlaceTime,OrderState,FinishDeliveryTime,AfterSaleState=0,AfterSaleReason = '' from view_ErpTradeCell where ( ( FinishPlaceTime BETWEEN '{0}' AND '{1}' ) OR ( OrderState = 6 AND UnusualTag = 5 AND IsRefund <= 1 ) )  AND IsSample = 0 and SupplierName is not null ", starttime, endtime);
             DataTable data = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
 
+            sql = string.Format("SELECT SupplierId, ProductId, seller_memo, ProductCount, ProductName, payment, SupplierName, UnusualTime, FinishPlaceTime, OrderState, FinishDeliveryTime, AfterSaleState,AfterSaleReason  FROM view_ErpTradeCell  WHERE ( AfterSalePreTime BETWEEN '{0}' AND '{1}' )  AND IsSample = 0  AND SupplierId > 0  AND FinishPlaceTime IS NOT NULL", startMonthDate, endMonthDate);
+            DataTable afterSaleData = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
+            data.Merge(afterSaleData);
             //不干胶-----1,卡片-----29
             Dictionary<string, Dictionary<string, int>> other_map = new Dictionary<string, Dictionary<string, int>>();
             foreach (DataRow row in data.Rows)
@@ -12854,159 +12858,170 @@ namespace SiteCore.Handler
                     map.Add("payTotal", 0);//500以上
                     map.Add("today", 0);//当天出货数量
                     map.Add("unusua", 0);//异常数
+                    map.Add("aftersale", 0);//异常数
                     other_map.Add(map_key, map);
                     other_map.TryGetValue(map_key, out map);
                 }
-
-
-                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)
+                int afterSaleState = Convert.ToInt32(row["AfterSaleState"]);
+                if (afterSaleState == 0)
                 {
-                    map["dayTotal"]++;
-                    if (supplierId == 97)
+                    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)
                     {
-                        supplierId = 97;
+                        map["dayTotal"]++;
+                        if (supplierId == 97)
+                        {
+                            supplierId = 97;
 
+                        }
                     }
-                }
 
-                if (Convert.ToDecimal(row["payment"]) >= 500)
-                {
-                    map["payTotal"]++;
-                }
-                bool istoday = false;
-                if (row["FinishDeliveryTime"].ToString() != null && row["FinishDeliveryTime"].ToString().Length > 0)
-                {
-
-                    DateTime FinishDeliveryTime = DateTime.Parse(row["FinishDeliveryTime"].ToString());
-                    if (supplierId == 64 && "不干胶".Equals(type) && !seller_memo.Contains("牙签"))
+                    if (Convert.ToDecimal(row["payment"]) >= 500)
                     {
-                        if (DateTime.Compare(palceTimeStart, FinishDeliveryTime) < 0 && DateTime.Compare(palceTimeTwoEnd, FinishDeliveryTime) > 0)//当天发货
-                        {
-                            map["today"]++;
-                        }
+                        map["payTotal"]++;
                     }
-                    else
+                    bool istoday = false;
+                    if (row["FinishDeliveryTime"].ToString() != null && row["FinishDeliveryTime"].ToString().Length > 0)
                     {
-                        if (supplierId == 80)
+
+                        DateTime FinishDeliveryTime = DateTime.Parse(row["FinishDeliveryTime"].ToString());
+                        if (supplierId == 64 && "不干胶".Equals(type) && !seller_memo.Contains("牙签"))
                         {
                             if (DateTime.Compare(palceTimeStart, FinishDeliveryTime) < 0 && DateTime.Compare(palceTimeTwoEnd, FinishDeliveryTime) > 0)//当天发货
                             {
                                 map["today"]++;
                             }
                         }
-                        else if (DateTime.Compare(palceTimeStart, FinishDeliveryTime) < 0 && DateTime.Compare(palceTimeEnd, FinishDeliveryTime) > 0)//当天发货
+                        else
                         {
-                            map["today"]++;
-                            istoday = true;
+                            if (supplierId == 80)
+                            {
+                                if (DateTime.Compare(palceTimeStart, FinishDeliveryTime) < 0 && DateTime.Compare(palceTimeTwoEnd, FinishDeliveryTime) > 0)//当天发货
+                                {
+                                    map["today"]++;
+                                }
+                            }
+                            else if (DateTime.Compare(palceTimeStart, FinishDeliveryTime) < 0 && DateTime.Compare(palceTimeEnd, FinishDeliveryTime) > 0)//当天发货
+                            {
+                                map["today"]++;
+                                istoday = true;
+                            }
                         }
                     }
-                }
-                if (row["UnusualTime"].ToString() != null && row["UnusualTime"].ToString().Length > 0)
-                {
-                    map["unusua"]++;
+                    if (row["UnusualTime"].ToString() != null && row["UnusualTime"].ToString().Length > 0)
+                    {
+                        map["unusua"]++;
 
-                }
-                DateTime FinishPlaceTime = DateTime.Parse(row["FinishPlaceTime"].ToString());
-                //GD-CYT-----64
-                DateTime two = palceTimeStart.AddHours(14);
-                DateTime three = palceTimeStart.AddHours(15);
-                DateTime four = palceTimeStart.AddHours(16);
-                DateTime six = palceTimeStart.AddHours(18);
-                if (supplierId == 64 && "不干胶".Equals(type) && !seller_memo.Contains("牙签"))
-                {
-                    //下午四点前 500-1000
-                    string count = row["ProductCount"].ToString();
-                    if (count != null && count.Length > 0)
+                    }
+                    DateTime FinishPlaceTime = DateTime.Parse(row["FinishPlaceTime"].ToString());
+                    //GD-CYT-----64
+                    DateTime two = palceTimeStart.AddHours(14);
+                    DateTime three = palceTimeStart.AddHours(15);
+                    DateTime four = palceTimeStart.AddHours(16);
+                    DateTime six = palceTimeStart.AddHours(18);
+                    if (supplierId == 64 && "不干胶".Equals(type) && !seller_memo.Contains("牙签"))
                     {
-                        int productCount = commonHelper.getPlaceProductCount(count);
-                        if (productCount >= 500 && productCount <= 1000)
+                        //下午四点前 500-1000
+                        string count = row["ProductCount"].ToString();
+                        if (count != null && count.Length > 0)
                         {
-
-                            if (DateTime.Compare(FinishPlaceTime, four) < 0)
+                            int productCount = commonHelper.getPlaceProductCount(count);
+                            if (productCount >= 500 && productCount <= 1000)
                             {
-                                map["dayDev"]++;
 
+                                if (DateTime.Compare(FinishPlaceTime, four) < 0)
+                                {
+                                    map["dayDev"]++;
+
+                                }
                             }
-                        }
 
+                        }
                     }
-                }
-                //UV
-                else if ("uv".Equals(type))
-                {
+                    //UV
+                    else if ("uv".Equals(type))
+                    {
 
-                    //ZT----70
-                    //ZHX----3
+                        //ZT----70
+                        //ZHX----3
+
+                        if (DateTime.Compare(FinishPlaceTime, four) < 0 && (supplierId == 70 || supplierId == 3))
+                        {
+                            map["dayDev"]++;
+                        }
+                        //JK----97
+                        //HZX----105
+                        if (DateTime.Compare(FinishPlaceTime, two) < 0 && (supplierId == 97 || supplierId == 105))
+                        {
+                            map["dayDev"]++;
+                        }
+                        if (DateTime.Compare(FinishPlaceTime, six) < 0 && (supplierId == 126))
+                        {
+                            map["dayDev"]++;
+                        }
 
-                    if (DateTime.Compare(FinishPlaceTime, four) < 0 && (supplierId == 70 || supplierId == 3))
-                    {
-                        map["dayDev"]++;
-                    }
-                    //JK----97
-                    //HZX----105
-                    if (DateTime.Compare(FinishPlaceTime, two) < 0 && (supplierId == 97 || supplierId == 105))
-                    {
-                        map["dayDev"]++;
                     }
-                    if (DateTime.Compare(FinishPlaceTime, six) < 0 && (supplierId == 126))
+                    //帆布---52|条幅---27
+                    else if ("帆布".Equals(type) || "条幅".Equals(type))
                     {
-                        map["dayDev"]++;
+                        //LHCY-----98
+                        if (DateTime.Compare(FinishPlaceTime, three) < 0 && (supplierId == 98))
+                        {
+                            map["dayDev"]++;
+                        }
                     }
-
-                }
-                //帆布---52|条幅---27
-                else if ("帆布".Equals(type) || "条幅".Equals(type))
-                {
-                    //LHCY-----98
-                    if (DateTime.Compare(FinishPlaceTime, three) < 0 && (supplierId == 98))
+                    //条幅
+                    else if ("条幅".Equals(type))
                     {
-                        map["dayDev"]++;
+                        //XD-----90
+                        if (DateTime.Compare(FinishPlaceTime, two) < 0 && (supplierId == 90))
+                        {
+                            map["dayDev"]++;
+                        }
                     }
-                }
-                //条幅
-                else if ("条幅".Equals(type))
-                {
-                    //XD-----90
-                    if (DateTime.Compare(FinishPlaceTime, two) < 0 && (supplierId == 90))
+                    //桌布
+                    else if ("桌布".Equals(type))
                     {
-                        map["dayDev"]++;
+                        //XD-----90
+                        if (DateTime.Compare(FinishPlaceTime, three) < 0 && (supplierId == 90))
+                        {
+                            map["dayDev"]++;
+                        }
                     }
-                }
-                //桌布
-                else if ("桌布".Equals(type))
-                {
-                    //XD-----90
-                    if (DateTime.Compare(FinishPlaceTime, three) < 0 && (supplierId == 90))
+                    //DL---10
+                    //AYTW---119
+                    //FS-CYT-DY ----80
+                    //JK----97
+                    else if (supplierId == 10 || supplierId == 119 || supplierId == 80 || supplierId == 97)
                     {
-                        map["dayDev"]++;
+                        if (DateTime.Compare(FinishPlaceTime, three) < 0)
+                        {
+                            map["dayDev"]++;
+                            if (supplierId == 80 && istoday)
+                            {
+                                Debug.WriteLine(seller_memo);
+                            }
+                        }
                     }
-                }
-                //DL---10
-                //AYTW---119
-                //FS-CYT-DY ----80
-                //JK----97
-                else if (supplierId == 10 || supplierId == 119 || supplierId == 80 || supplierId == 97)
-                {
-                    if (DateTime.Compare(FinishPlaceTime, three) < 0)
+                    // QC---121
+                    else if (supplierId == 121)
                     {
-                        map["dayDev"]++;
-                        if (supplierId == 80 && istoday)
+                        if (DateTime.Compare(FinishPlaceTime, six) < 0)
                         {
-                            Debug.WriteLine(seller_memo);
+                            map["dayDev"]++;
                         }
                     }
                 }
-                // QC---121
-                else if (supplierId == 121)
+                else
                 {
-                    if (DateTime.Compare(FinishPlaceTime, six) < 0)
+                    if (row["AfterSaleReason"].ToString().Contains("车间责任"))
                     {
-                        map["dayDev"]++;
+                        map["aftersale"]++;
                     }
+
                 }
 
             }
@@ -13020,6 +13035,7 @@ namespace SiteCore.Handler
             dt.Columns.Add(new DataColumn("unusua", typeof(string)));
             dt.Columns.Add(new DataColumn("dayDev", typeof(string)));
             dt.Columns.Add(new DataColumn("dayRate", typeof(string)));
+            dt.Columns.Add(new DataColumn("aftersale", typeof(string)));
             other_map.Keys.ForEach(key =>
             {
                 DataRow dr = dt.NewRow();
@@ -13045,12 +13061,13 @@ namespace SiteCore.Handler
                     rate = Math.Round((Convert.ToDouble(map["today"]) / Convert.ToDouble(map["dayDev"])), 2);
                 }
                 dr[7] = rate.ToString();
+                dr[8] = map["aftersale"];
                 dt.Rows.Add(dr);
             });
 
             DataView dv = new DataView(dt);
             dv.Sort = "SupplierName";
-            //dv.Sort = "AllOrder desc";
+            //dv.Sort = "ProductName desc";
             DataTable dtNew = dv.ToTable();
             writeGridDataTableJson(dtNew.Rows.Count, dtNew);
         }

SiteCore/Handler/sync.orderReport.cs

@@ -1576,8 +1576,8 @@ namespace SiteCore.Handler
                 date1 = DateTime.Now.ToString();
                 date2 = DateTime.Now.ToString();
             }
-            //DateTime firstDay = commonHelper.FirstDayOfMonth(Convert.ToDateTime(date1));
-            //DateTime lastDay = commonHelper.LastDayOfMonth(Convert.ToDateTime(date1));
+            DateTime firstDay = commonHelper.FirstDayOfMonth(Convert.ToDateTime(date1));
+            DateTime lastDay = commonHelper.LastDayOfMonth(Convert.ToDateTime(date1));
             //if (date1.Length > 0 && DateTime.Now.ToShortDateString() != Convert.ToDateTime(date1).ToShortDateString())
             //{
             //    string orgStr = "";

SiteCore/taobao/apiCaiYingTong.cs

@@ -485,7 +485,6 @@ namespace SiteCore.Handler
                                 restype = 0,
                                 data = "获取面单失败2" + errMsgNeed
                             };
-                            string ro_jsonf = JsonConvert.SerializeObject(res_objf);
                             if (res.IndexOf("停发") != -1)
                             {
                                 entity.UnusualCon = "物流停发";
@@ -496,7 +495,7 @@ namespace SiteCore.Handler
                                     //string apires = apiHelper.API_TradeMemoUpdate(trade.tid, trade.posCode, "", trade.seller_memo + "-" + entity.UnusualCon);
                                 }
                             }
-                            returnSuccess(ro_jsonf);
+                            returnSuccess(res);
                             //returnErrorMsg("获取面单失败，" + emsg);
                             XLog.SaveLog(0, "获取面单失败2" + res);
                             return;
@@ -513,8 +512,7 @@ namespace SiteCore.Handler
                             restype = 0,
                             data = "生成fullObj发生错误" + ex.Message
                         };
-                        string ro_jsonf = JsonConvert.SerializeObject(res_objf);
-                        returnSuccess(ro_jsonf);
+                        returnSuccess(res);
                         return;
                     }
 
@@ -540,8 +538,7 @@ namespace SiteCore.Handler
                             restype = 0,
                             data = "生成fullObj找不到快递单号waybillCode"
                         };
-                        string ro_jsonf = JsonConvert.SerializeObject(res_objf);
-                        returnSuccess(ro_jsonf);
+                        returnSuccess(res);
                         return;
                     }
 

SiteCore/taobao/apiHelper.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using BizCom;
+using Newtonsoft.Json;
 using NHibernate.Type;
 using SiteCore.taoObj;
 using SQLData;
@@ -227,10 +228,8 @@ namespace SiteCore
         }
 
 
-        public static string API_LogisticsOnlineSend(string orderid, string pCode, string comCode, string out_Sid)
+        public static string API_LogisticsOnlineSend(string orderid, string pCode, string comCode, string out_Sid, string ctid)
         {
-
-
             List<string> postLst = new List<string>();
             var res_obj = new
             {
@@ -242,8 +241,15 @@ namespace SiteCore
                 }
             };
             string ro_json = JsonConvert.SerializeObject(res_obj);
-
-            string res = Base_Request(ro_json, "ds.omni.erp.third.order.send");
+            string sql = string.Format("SELECT tid FROM [dbo].[CE_ErpTradeCell] WHERE tid = '{0}' and OrderState > 6", orderid);
+            DataTable dt = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
+            string send_api = "ds.omni.erp.third.order.send";
+            if (dt != null && dt.Rows.Count > 0 && !ctid.Contains("S_"))
+            {
+                send_api = "ds.omni.erp.third.order.uploadExtraLogistics";//额外发货
+                XLog.SaveLog(0, "额外发货：" + orderid + "-" + comCode + "-" + out_Sid);
+            }
+            string res = Base_Request(ro_json, send_api);
             return res;
         }
 

SiteCore/taobao/apiShengda.cs

@@ -269,7 +269,7 @@ namespace SiteCore.Handler
                         }
                         else
                         {
-                            apires = apiHelper.API_LogisticsOnlineSend(mainEn.tid, mainEn.posCode, cpCode, expressNo);
+                            apires = apiHelper.API_LogisticsOnlineSend(mainEn.tid, mainEn.posCode, cpCode, expressNo, entity.ctid);
                         }
                         string userName = "盛大接口";
                         if (mainEn != null && entity.OrderState <= 6 && apires.IndexOf("发货成功") != -1)

SiteCore/taobao/commonHelper.cs

@@ -1237,7 +1237,7 @@ namespace SiteCore
                 if (apires.IndexOf("发货成功") == -1)
                 {
                     XLog.SaveLog(0, "补差价单虚拟发货失败，" + tid + "," + posCode + "," + apires);
-                    string wures = apiHelper.API_LogisticsOnlineSend(tid, posCode, comCode, outSid);
+                    string wures = apiHelper.API_LogisticsOnlineSend(tid, posCode, comCode, outSid, "");
                     if (wures.IndexOf("发货成功") == -1)
                     {
                         XLog.SaveLog(0, "补差价单实物发货失败，" + tid + "," + posCode + "," + wures);

Web/ECharts/PlaceGather.aspx

@@ -273,14 +273,15 @@
         <div id="supplier_grid" class="mini-datagrid" sortmode="client" style="width: 100%; height: 50%;" showemptytext="true" showpager="false" showsummaryrow="false" ondrawsummarycell="onDrawSummaryCell"
             emptytext="暂无记录" url="../handler/sync.ashx?t=get_place_order_data">
             <div property="columns">
-                <div field="ProductName" width="60" align="center" headeralign="center">品类</div>
-                <div field="SupplierName" width="60" align="center" headeralign="center">车间</div>
-                <div field="dayDev" width="60" align="center" headeralign="center">当天出货的下单数量</div>
-                <div field="dayTotal" width="60" align="center" headeralign="center">当天下单总数量</div>
-                <div field="payTotal" width="60" align="center" headeralign="center">金额5百以上单量</div>
-                <div field="today" width="60" align="center" headeralign="center">当天出货</div>
-                <div field="unusua" width="60" align="center" headeralign="center">异常单</div>
-                <div field="unusua_reson" width="60" visible="false" align="center" headeralign="center">异常原因</div>
+                <div field="ProductName" width="160" align="center" headeralign="center">品类</div>
+                <div field="SupplierName" width="160" align="center" headeralign="center">车间</div>
+                <div field="dayDev" width="160" align="center" headeralign="center">当天出货的下单数量</div>
+                <div field="dayTotal" width="160" align="center" headeralign="center">当天下单总数量</div>
+                <div field="payTotal" width="160" align="center" headeralign="center">金额5百以上单量</div>
+                <div field="today" width="160" align="center" headeralign="center">当天出货</div>
+                <div field="aftersale" width="160" align="center" headeralign="center">售后单</div>
+                <div field="unusua" width="160" align="center" headeralign="center">异常单</div>
+                <div field="unusua_reson" width="160" visible="false" align="center" headeralign="center">异常原因</div>
             </div>
         </div>
          <a class="mini-button mini-button-primary" iconcls="icon-folder" onclick="exportFn()">导出</a>

ecomServer/MainForm.cs

@@ -1058,6 +1058,7 @@ namespace ErpServer
                                                 if ("1".Equals(IsOldCustomer) && oldOrder == 0)
                                                 {
                                                     isOnline = false;
+                                                    helper.writeLog("自动派单:老客户单子上个设计师不支持老客户-" + dr["ctid"].ToString() + "-" + res);
                                                 }
 
                                                 if (onduty > 0 && designUserId > 0 && desingList.Contains(ProductId.ToString()) && shopList.Contains(shopId.ToString()) && isOnline)//设计师在线