新增当天发货品

SiteCore/Handler/sync.order.cs

@@ -68,7 +68,7 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
             //commonHelper.sendSpuData(CeErpTradeCell.GetByCtid("C1_2701711344045006369"),CeErpTradeCellExtend.getByTid("C1_2701711344045006369"));
             //commonHelper.setDeliveryUnusualOrder2();
-            //string a = SecurityHelper.DecryptSymmetric("kncY+n90QZs=");
+            //string a = SecurityHelper.DecryptSymmetric("NNM8SwEgcu/yE70NElUXSQ==");
             //apiHelper.API_GetWaybill("ZTO-CAINIAO-TZJK", "4233447147588233939");
             //apiHelper.API_LogisticsOnlineSend("2460807662231834875", "yujia", "YTO-GDCYT", "YT7524607355919");
             //banniuApiHelper.sendLogisticsInfo(null);
@@ -134,7 +134,7 @@ namespace SiteCore.Handler
             string tid = GetPostString("ctid");
             string date1 = GetPostString("date1");
             //12-1 修改
-            string urgent = GetPostString("urgent");
+            string urgent = GetPostString("urgent"); 
             string back = GetPostString("back");
             string offlineSearch = GetPostString("offlineSearch");
             int paramsCount = 0;

SiteCore/taobao/commonHelper.cs

@@ -262,6 +262,14 @@ namespace SiteCore
                     istoday = true;
                 }
             }
+            //XHY ---139
+            else if (supplierId == 139 && (seller_memo.Contains("铜版纸") || seller_memo.Contains("铜板纸")) && seller_memo.Contains("裁切"))
+            {
+                if (DateTime.Compare(FinishPlaceTime, three) < 0)
+                {
+                    istoday = true;
+                }
+            }
 
             return istoday;
         }

Web/EDelivery/js/AllPlaceList.js

@@ -234,7 +234,7 @@ function actionRenderer(e) {
     var id = record.ctid;
     var rowIndex = e.rowIndex;
     var html = "";
-    html += getGridBtn("notify1", "撤单", "urgencyFn('" + id + "')");
+    //html += getGridBtn("notify1", "撤单", "urgencyFn('" + id + "')");
     if (userPostCode != "Supplier") {
         html += getGridBtn("edit", "成本登记", "showPriceWin('" + record.ctid + "','" + record.payment_cyt + "','" + record.SupplierName + "')");
     }