fix

AutoTurnOver.DB/daily.cs

@@ -1693,7 +1693,7 @@ left join dc_auto_forecast_fluctuation as t7 on t2.sku = t7.bailun_sku and t1.ta
                     sql += " left join dc_auto_config_sku_warehouse as t10 on t2.sku = t10.bailun_sku and t1.warehouse_code = t10.warehouse_code ";
                 }
 
-                sql += "  where t1.stateid !=5 and t2.deliverycount > t2.storagecount and t1.isdeleted=0 ";
+                sql += "  where t1.stateid !=5 and t2.deliverycount > t2.storagecount and t1.isdeleted=0 and t1.isexception=0  ";
             }
             else
             {
@@ -1748,7 +1748,7 @@ left join dc_lms_order_transfer_current_node as t8 on t1.dataid = t8.data_id and
                 {
                     sql += " left join dc_auto_config_sku_warehouse as t10 on t2.sku = t10.bailun_sku and t1.targetwareno = t10.warehouse_code ";
                 }
-                sql += " where   t1.stateid !=5 and t2.deliverycount > t2.storagecount and t1.isdeleted=0 ";
+                sql += " where   t1.stateid !=5 and t2.deliverycount > t2.storagecount and t1.isdeleted=0 and t1.isexception=0 ";
             }
 
 
@@ -1773,7 +1773,7 @@ left join dc_base_stock as t5 on t2.sku = t5.bailun_sku and t1.targetwareno = t5
                 countSql += " left join dc_auto_config_sku_warehouse as t10 on t2.sku = t10.bailun_sku and t1.warehouse_code = t10.warehouse_code ";
             }
 
-            countSql += " where t1.stateid !=5 and t2.deliverycount > t2.storagecount and t1.isdeleted=0 ";
+            countSql += " where t1.stateid !=5 and t2.deliverycount > t2.storagecount and t1.isdeleted=0 and t1.isexception=0 ";
 
 
 

AutoTurnOver.DB/report.cs

@@ -1513,7 +1513,11 @@ where t1.bailun_sku = t2.bailun_sku and t1.warehouse_code = t2.warehouse_code;
 
 ", commandTimeout: 0);
 
-
+                _connection.Execute(@"  update dc_base_stock as t1,
+ dc_base_sku as t2 
+ set t1.product_inner_code =t2.product_inner_code,t1.sku_title_cn=t2.sku_title_cn
+ where t1.bailun_sku =t2.bailun_sku
+  ", commandTimeout: 0);
             }
             catch (Exception ex)
             {

AutoTurnOver.Models/order_transfer_full_link_dto.cs

@@ -67,8 +67,33 @@ namespace AutoTurnOver.Models
         public string transfer_no { get; set; }
         public string box_id { get; set; }
         public DateTime? node_date { get; set; }
+        public string node_date_str
+        {
+            get
+            {
+                if (node_date == null || node_date.Value.Year <= 2018)
+                {
+                    return "";
+                }
+                else
+                {
+                    return node_date.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                }
+            }
+        }
         public string node_name { get; set; }
         public DateTime? expectarrivaltime { get; set; }
+        public string expectarrivaltime_str { get
+            {
+                if(expectarrivaltime==null || expectarrivaltime.Value.Year <= 2018)
+                {
+                    return "";
+                }
+                else
+                {
+                    return expectarrivaltime.Value.ToString("yyyy-MM-dd");
+                }
+            } }
         public decimal? surplus_node_days { get; set; }
         public DateTime? node_expectarrivaltime { get; set; }
         public string logistics_code { get; set; }