物流排序

SiteCore/Handler/sync.getbase.cs

@@ -449,8 +449,26 @@ namespace SiteCore.Handler
         public void get_sel_mail()
         {
             string curPemExpress = CurrentUser.User.pemExpress;
-            string sql = "select id, name,cpCode from CE_ErpMailInfo  where id in (" + curPemExpress + ");";
+            string type = GetString("type");
+
+            string sql = "select id, name,cpCode from CE_ErpMailInfo  where id in (" + curPemExpress + ") ORDER BY name desc;";
             DataTable dt = DbHelper.DbConn.ExecuteDataset(sql).Tables[0];
+            if (!string.IsNullOrEmpty(type))
+            {
+                foreach (DataRow item in dt.Rows)
+                {
+                    string name = item["cpCode"].ToString();
+                    if ("CAINIAO".Equals(type) && name.Contains("PDD"))
+                    {
+                        item.Delete();
+                    }
+                    if ("PDD".Equals(type) && name.Contains("CAINIAO"))
+                    {
+                        item.Delete();
+                    }
+                }
+                dt.AcceptChanges();
+            }
             con.Response.Write(Utils.Serialization.JsonString.DataTable2MiniAjaxJson(dt));
         }
         public void get_sel_pddmail()

SiteCore/Handler/sync.order.cs

@@ -12602,6 +12602,8 @@ namespace SiteCore.Handler
             {97, new Dictionary<string, string> {{"uv", "uv"}}},
             //ZT----70
             {70, new Dictionary<string, string> {{"uv", "uv"}}},
+            //GD-CYTUV---126
+            {126, new Dictionary<string, string> {{"uv", "uv"}}},
              //LHCY-----98
             {98, new Dictionary<string, string> {{"条幅", "条幅"}, {"帆布", "帆布"}, { "贡缎布", "贡缎布" }, { "纱幔", "纱幔" }, { "班旗", "班旗" } }},
              //XD-----90
@@ -12814,6 +12816,7 @@ namespace SiteCore.Handler
                 if (row["UnusualTime"].ToString() != null && row["UnusualTime"].ToString().Length > 0)
                 {
                     map["unusua"]++;
+                    
                 }
                 DateTime FinishPlaceTime = DateTime.Parse(row["FinishPlaceTime"].ToString());
                 //GD-CYT-----64

SiteCore/taobao/commonHelper.cs

@@ -3192,9 +3192,10 @@ namespace SiteCore
             }
             int VipCustomer = 2;
             string last_tid = "";
+            string sql = "";
             if (ceErpTrade.payment > 20)
             {
-                string sql = string.Format("SELECT top 1 tid FROM [dbo].[view_ErpTradeCell] WITH(NOLOCK) WHERE (buyer_nick = '{0}' or buyer_id = '{1}' ) and status = 'COMPLETE' and seller_nick = '{2}' and tid <> '{3}' AND end_time < '{4}' and IsSample = 0 and payment >= 20 order by pay_time desc;", ceErpTrade.buyer_nick, ceErpTrade.buyer_id, ceErpTrade.seller_nick, ceErpTrade.tid, ceErpTrade.pay_time);
+                sql = string.Format("SELECT top 1 tid FROM [dbo].[view_ErpTradeCell] WITH(NOLOCK) WHERE (buyer_nick = '{0}' or buyer_id = '{1}' ) and status = 'COMPLETE' and seller_nick = '{2}' and tid <> '{3}' AND end_time < '{4}' and IsSample = 0 and payment >= 20 order by pay_time desc;", ceErpTrade.buyer_nick, ceErpTrade.buyer_id, ceErpTrade.seller_nick, ceErpTrade.tid, ceErpTrade.pay_time);
                 if (string.IsNullOrEmpty(ceErpTrade.buyer_nick))
                 {
                     sql = string.Format("SELECT tid FROM [dbo].[CE_ErpTrade] WITH(NOLOCK) WHERE (buyer_id = '{1}' ) and status = 'COMPLETE' and seller_nick = '{2}' and tid <> '{3}' AND end_time < '{4}' and payment >= 20", ceErpTrade.buyer_nick, ceErpTrade.buyer_id, ceErpTrade.seller_nick, ceErpTrade.tid, ceErpTrade.pay_time);
@@ -3213,6 +3214,7 @@ namespace SiteCore
             if (VipCustomer == 1)
             {
                 LogHelper.addLog(ceErpTrade.tid, 0, "老客户订单号:" + last_tid, Convert.ToInt32(OrderState.待设计));
+                XLog.SaveLog(0, sql);
             }
             DbHelper.DbConn.ExecuteNonQuery(string.Format("UPDATE [dbo].[CE_ErpTradeCell] set VipCustomer = {1} WHERE tid='{0}';", ceErpTrade.tid, VipCustomer));
 

Web/EDelivery/DeliveredList.aspx

@@ -69,7 +69,7 @@
             <tr>
                 <td class="td1">物流公司</td>
                 <td class="td2" colspan="3">
-                    <input id="txtComName" class="mini-combobox" style="width: 80%;" textfield="name" valuefield="cpCode" onvaluechanged="onBillComChanged" url="../handler/sync.ashx?t=get_sel_mail" />
+                    <input id="txtComName" class="mini-combobox" style="width: 80%;" textfield="name" valuefield="cpCode" onvaluechanged="onBillComChanged" url="../handler/sync.ashx?t=get_sel_mail&type=CAINIAO" />
                 </td>
             </tr>
             <tr>
@@ -93,7 +93,7 @@
             <tr>
                 <td class="td1">物流公司</td>
                 <td class="td2" colspan="3">
-                    <input id="txtBillCom" class="mini-combobox" style="width: 80%;" textfield="name" valuefield="cpCode" onvaluechanged="onBillComChanged" url="../handler/sync.ashx?t=get_sel_mail" />
+                    <input id="txtBillCom" class="mini-combobox" style="width: 80%;" textfield="name" valuefield="cpCode" onvaluechanged="onBillComChanged" url="../handler/sync.ashx?t=get_sel_mail&type=CAINIAO" />
                 </td>
             </tr>
             <%--<tr>

Web/EDelivery/PddDelivered.aspx

@@ -69,7 +69,7 @@
             <tr>
                 <td class="td1">物流公司</td>
                 <td class="td2" colspan="3">
-                    <input id="txtComName" class="mini-combobox" style="width: 80%;" textfield="name" valuefield="cpCode" onvaluechanged="onBillComChanged" url="../handler/sync.ashx?t=get_sel_mail" />
+                    <input id="txtComName" class="mini-combobox" style="width: 80%;" textfield="name" valuefield="cpCode" onvaluechanged="onBillComChanged" url="../handler/sync.ashx?t=get_sel_mail&type=PDD" />
                 </td>
             </tr>
             <tr>

Web/EDelivery/PddDelivering.aspx

@@ -82,7 +82,7 @@
             <tr>
                 <td class="td1">物流公司</td>
                 <td class="td2" colspan="3">
-                    <input id="txtComName" class="mini-combobox" style="width: 80%;" textfield="name" valuefield="cpCode" onvaluechanged="onBillComChanged" url="../handler/sync.ashx?t=get_sel_mail" />
+                    <input id="txtComName" class="mini-combobox" style="width: 80%;" textfield="name" valuefield="cpCode" onvaluechanged="onBillComChanged" url="../handler/sync.ashx?t=get_sel_mail&type=PDD" />
                 </td>
             </tr>
             <tr>

Web/EDelivery/WaitingDelivery.aspx

@@ -82,7 +82,7 @@
             <tr>
                 <td class="td1">物流公司</td>
                 <td class="td2" colspan="3">
-                    <input id="txtComName" class="mini-combobox" style="width: 80%;" textfield="name" valuefield="cpCode" onvaluechanged="onBillComChanged" url="../handler/sync.ashx?t=get_sel_mail" />
+                    <input id="txtComName" class="mini-combobox" style="width: 80%;" textfield="name" valuefield="cpCode" onvaluechanged="onBillComChanged" url="../handler/sync.ashx?t=get_sel_mail&type=CAINIAO" />
                 </td>
             </tr>
             <tr>
@@ -149,7 +149,7 @@
             <tr>
                 <td class="td1">物流公司</td>
                 <td class="td2" colspan="3">
-                    <input id="txtBillCom" class="mini-combobox" style="width: 80%;" textfield="name" valuefield="cpCode" onvaluechanged="onBillComChanged" url="../handler/sync.ashx?t=get_sel_mail" />
+                    <input id="txtBillCom" class="mini-combobox" style="width: 80%;" textfield="name" valuefield="cpCode" onvaluechanged="onBillComChanged" url="../handler/sync.ashx?t=get_sel_mail&type=CAINIAO" />
                 </td>
             </tr>
             <%--<tr>