新增下单统计

SiteCore/Handler/sync.order.cs

@@ -2395,7 +2395,7 @@ namespace SiteCore.Handler
                         ceErpTradeCellExtend = new CeErpTradeCellExtend();
                         ceErpTradeCellExtend.ctid = entity.ctid;
                     }
-                    if (ceErpTradeCellExtend.CheckTime == null && DateTime.Compare(DateTime.Now.AddHours(-24), (DateTime)entity.CheckOrderTime) >= 0)
+                    if (ceErpTradeCellExtend.CheckTime != null && DateTime.Compare(DateTime.Now.AddHours(-24), (DateTime)entity.CheckOrderTime) >= 0)
                     {
                         ceErpTradeCellExtend.CheckOut += 1;
                     }
@@ -15150,7 +15150,7 @@ namespace SiteCore.Handler
                 //限制条件
                 if (!Convert.IsDBNull(row["filterText"]) && !string.IsNullOrEmpty(row["filterText"].ToString()))
                 {
-                    if (!Regex.IsMatch(entity.seller_memo, row["filterText"].ToString().Replace("/", "|")))
+                    if (Regex.IsMatch(entity.seller_memo, row["filterText"].ToString().Replace("/", "|")))
                     {
                         continue;
                     }

SiteCore/taobao/commonHelper.cs

@@ -82,7 +82,9 @@ namespace SiteCore
             //CYCY-----14
             {14, new Dictionary<string, string> {{"卡片", "卡片"}, {"宣传单", "宣传单"}, {"杯套", "杯套"}}},
             //THLZY----122
-            {122, new Dictionary<string, string> {{ "烫画", "烫画" }, { "冷转印", "冷转印" }}}
+            {122, new Dictionary<string, string> {{ "烫画", "烫画" }, { "冷转印", "冷转印" }}},
+            //DTY----138
+            {138, new Dictionary<string, string> {{ "烫画", "烫画" }}},
         };
 
         public static bool placeDataIsPeijian(string seller_memo)
@@ -150,9 +152,11 @@ namespace SiteCore
             DateTime two = palceTimeStart.AddHours(14);
             DateTime three = palceTimeStart.AddHours(15);
             DateTime four = palceTimeStart.AddHours(16);
+            DateTime five = palceTimeStart.AddHours(17);
             DateTime six = palceTimeStart.AddHours(18);
 
             string patterns = "牙签|烫金|电线胶|PVC不干胶覆哑膜|内部模切|牛皮纸不干胶";
+            string patterns_FSMC = " 雅柔|珠光|白卡|皙贝|溪雪|萱姿";
             if (supplierId == 64 && "不干胶".Equals(type) && !Regex.IsMatch(seller_memo, patterns))
             {
                 //下午四点前 500-1000
@@ -240,6 +244,24 @@ namespace SiteCore
                     istoday = true;
                 }
             }
+            else if (supplierId == 138 && "烫画".Equals(type))
+            {
+                if (DateTime.Compare(FinishPlaceTime, two) < 0)
+                {
+                    istoday = true;
+                }
+            }
+            else if (Regex.IsMatch(seller_memo, patterns_FSMC) && seller_memo.Contains("裁切"))
+            {
+                if (DateTime.Compare(FinishPlaceTime, five) < 0 && !seller_memo.Contains("顺丰"))
+                {
+                    istoday = true;
+                }
+                if (DateTime.Compare(FinishPlaceTime, four) < 0 && seller_memo.Contains("顺丰"))
+                {
+                    istoday = true;
+                }
+            }
 
             return istoday;
         }

SiteCore/taobao/tmcHelper.cs

@@ -2375,7 +2375,7 @@ namespace SiteCore
                     entity.OrderState = Convert.ToInt32(OrderState.设计完成);
                 }
             }
-            entity.ProductId = getProductIdByName(product);
+            entity.ProductId = 2716;
             if (entity.ProductId == 0)
             {
                 return;

Web/EOrder/OrderList.aspx

@@ -766,7 +766,7 @@
         </table>
     </div>
 
-    <div id="uploaderAddress_win" class="mini-window" title="上传文件地址" style="width: 1500px; height: 300px; position: relative; display: none">
+    <div id="uploaderAddress_win" class="mini-window" title="上传文件地址" style="width: 1500px; height: 500px; position: relative; display: none">
         <table class="win_tb" border="0" cellpadding="0" cellspacing="1">
             <tr>
                 <td class="td1">文件地址</td>